Merge branch 'rezine-style' of https://code.ffdn.org/FFDN/celutz into rezine-style

panorama/static/panorama/css/celutz.css

@@ -278,3 +278,14 @@ fieldset#adding {
     margin: 2px;
     right: 0;
 }
+
+/* menu items on pano viewer */
+@media (min-width: 768px) {
+  .navbar-left {
+    float: left !important;
+  }
+  .navbar-pano {
+    float: left !important;
+    margin: 0px auto;
+  }
+}

panorama/templates/panorama/base.html

@@ -37,9 +37,24 @@
                 {% block top-menu-title %}
                 {% endblock top-menu-title %}
             </div>
+            <ul class="nav navbar-pano top-nav">
+                {% block top-menu-pano-items %}
+                {% endblock top-menu-pano-items %}
+            </ul>
             <ul class="nav navbar-right top-nav">
-            {% block top-menu-items %}
-            {% endblock top-menu-items %}
+
+                <li>
+                    <a href="/admin"><i class="fa fa-pencil-square-o"></i>  {% trans "Admin" %}</a>
+                </li>
+                <li class="dropdown">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  {% trans "About" %}<b class="caret"></b></a>
+                    <ul class="dropdown-menu">
+                        <li>
+                           <p>{% blocktrans %}Celutz is a tool for managing and referencing panoramic photos{% endblocktrans %}.
+                           <a href="https://code.ffdn.org/FFDN/celutz/">{% trans "Project homepage" %}</a>
+                        </li>
+                    </ul>
+                </li>
             </ul>
             {% block sidebar %}
             {% endblock sidebar %}

panorama/templates/panorama/main.html

@@ -10,17 +10,6 @@
 {% endblock %}
 
 {% block top-menu-items %}
-<ul class="nav navbar-right top-nav">
-    <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  {% trans "About" %}<b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li>
-               <p>{% blocktrans %}Celutz is a tool for managing and referencing panoramic photos{% endblocktrans %}.
-               <a href="https://code.ffdn.org/FFDN/celutz/">{% trans "Project homepage" %}</a>
-            </li>
-        </ul>
-    </li>
-</ul>
 {% endblock %}
 
 {% block sidebar %}

panorama/templates/panorama/view.html

@@ -86,7 +86,7 @@
     <a class="navbar-brand" href="">{{panorama.name}}</a>
 {% endblock %}
 
-{% block top-menu-items %}
+{% block top-menu-pano-items %}
     <li class="dropdown">
         <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-question-circle"></i>  {% trans "Parameters" %}<b class="caret"></b></a>
         <ul class="dropdown-menu">
@@ -126,15 +126,6 @@
             </li>
         </ul>
     </li>
-    <li class="dropdown">
-        <a href="#" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-info-circle"></i>  {% trans "About" %}<b class="caret"></b></a>
-        <ul class="dropdown-menu">
-            <li>
-               <p>{% blocktrans %}Celutz is a tool for managing and referencing panoramic photos{% endblocktrans %}.
-               <a href="https://code.ffdn.org/FFDN/celutz/">{% trans "Project homepage" %}</a>
-            </li>
-        </ul>
-    </li>
 {% endblock %}
 
 {% block sidebar %}