Browse Source

nettoyage et organisation du fichier html de base

julpec 8 years ago
parent
commit
391dde1339
1 changed files with 16 additions and 11 deletions
  1. 16 11
      panorama/templates/panorama/base.html

+ 16 - 11
panorama/templates/panorama/base.html

@@ -5,7 +5,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="fr" lang="fr">
   <head>
     <meta http-equiv="Content-type" content="text/html; charset=UTF-8"/>
-    <title>{% block title %}Celutz, a panorama viewer{% endblock title %}</title>
+    <title>{% block title %}{% endblock title %}</title>
 
     <link type="image/x-icon" rel="shortcut icon" href="{% static "panorama/img/tsf.png" %}"/>
 
@@ -13,7 +13,7 @@
     <link href="{% static "panorama/css/sb-admin.css" %}" rel="stylesheet" media="screen">
     <link href="{% static "panorama/css/plugins/morris.css" %}" rel="stylesheet" media="screen">
     <link href="{% static "panorama/font-awesome/css/font-awesome.min.css" %}" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" media="screen" href="{% static "panorama/css/celutz.css" %}" />
+    <link href="{% static "panorama/css/celutz.css" %}" rel="stylesheet" media="screen">
     {% block css %}{% endblock css %}
 
     <script src="https://oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
@@ -23,7 +23,7 @@
   <body>
     {# Add base structure here, menu, etc... #}
 
-   <div id="wrapper">
+   <div id="wrapper" {% block wrapper-style %}{% endblock wrapper-style %}>
         <!-- Navigation -->
         <nav class="navbar navbar-inverse navbar-fixed-top" role="navigation">
             <!-- Brand and toggle get grouped for better mobile display -->
@@ -37,29 +37,34 @@
                 {% block top-menu-title %}
                 {% endblock top-menu-title %}
             </div>
+            <ul class="nav navbar-right top-nav">
             {% block top-menu-items %}
             {% endblock top-menu-items %}
+            </ul>
             {% block sidebar %}
             {% endblock sidebar %}
-            <!-- /.navbar-collapse -->
         </nav>
+        {% block pano %}{% endblock pano %}
         <div id="page-wrapper">
-            <link rel="stylesheet" href="http://cdn.leafletjs.com/leaflet/v0.7.7/leaflet.css" />
-            <style>
-            body{overflow : scroll;}
-            </style>
-          {% block content %}{% endblock content %}
+        {% block content %}{% endblock content %}
         </div>
         <!-- /#page-wrapper -->
     </div>
     <!-- /#wrapper -->
 
-    {% block js %}{% endblock js %}
+    {% block js %}
+    {% endblock js %}
 
-{% block pano %}{% endblock pano %}
 
     <script src="{% static "panorama/js/jquery.js" %}"></script>
     <script src="{% static "panorama/js/bootstrap.min.js" %}"></script>
+<!--
+<script>
+$( document ).ready(function() {
+    $("#wrapper").css("padding-left","0px");
+});
+</script>
+-->
 
   </body>
 </html>