graph user dropdown similar to main navbar template

92e9c417 · Romain Loth · e11b5077 · 92e9c417 · 92e9c417
Commit 92e9c417 authored May 04, 2016 by Romain Loth
Hide whitespace changes
Inline Side-by-side

Showing with 21 additions and 11 deletions

menu.css static/css/gargantext/menu.css +1 -1

explorer.html templates/graphExplorer/explorer.html +20 -10

No files found.
--- a/static/css/gargantext/menu.css
+++ b/static/css/gargantext/menu.css
 /* styles for menu.html template (navbar etc) */
-#dafixedtop .navbar-text {
+#dafixedtop .navbar-text, #graphsfixedtop .navbar-text {
    margin: 0 ;
    padding-top: 15px;
    padding-bottom: 15px;

--- a/templates/graphExplorer/explorer.html
+++ b/templates/graphExplorer/explorer.html
@@ -3,12 +3,15 @@
    {% load staticfiles %}
    <link rel="stylesheet" href="{% static "css/bootstrap.css" %}">
    <link rel="stylesheet" href="{% static "css/bootstrap-theme.min.css" %}">
+    <!-- TODO rationaliser les chemins sous libs -->
    <link rel="stylesheet" href="{% static "js/libs/jquery/jquery-ui.css" %}" media="screen">
    <!-- <link rel="stylesheet" href="{% static "js/libs/bootstrap/css/bootstrap.css" %}" media="screen"> -->
    <link rel="stylesheet" href="{% static "js/libs/css2/freshslider.css" %}" media="screen">
    <link rel="stylesheet" href="{% static "js/libs/css2/custom.css" %}" media="screen">
    <link rel="stylesheet" href="{% static "js/libs/css2/sidebar.css" %}" media="screen">
+    <link rel="stylesheet" type="text/css" href="{% static "css/gargantext/menu.css"%}"/>
    <style>
      #leftcolumn {
@@ -45,7 +48,7 @@
  <body>
-    <div class="navbar navbar-inverse" role="navigation">
+    <div id="graphsfixedtop" class="navbar navbar-inverse" role="navigation">
        <div class="container">
            <div class="navbar-inner">
              <button  class="navbar-toggle" data-toggle="collapse" data-target=".navbar-collapse">
@@ -85,20 +88,27 @@
              <ul class="nav pull-right">
                  <li class="dropdown">
-                      <a href="#" role="button" class="dropdown-toggle" data-toggle="dropdown" title="That is your login"><i class="icon-user"></i>
+                      <a href="#" role="button" class="dropdown-toggle navbar-text" data-toggle="dropdown" title="That is your username">
-                            <span class="glyphicon glyphicon-user" aria-hidden="true"></span>
+                          <i class="icon-user"></i>
-                            {{ user.username }}
+                          <span class="glyphicon glyphicon-user" aria-hidden="true" style="color:white"></span>
+                          {{ user.username | truncatechars:15}}
                          <i class="caret"></i>
                      </a>
                      <ul class="dropdown-menu">
-                          <li><a tabindex="-1" href="http://www.iscpif.fr/tiki-index.php?page=gargantext_feedback" title="Send us a message (bug, thanks, congrats...)">Report Feedback</a></li>
+                          <li><a tabindex="-1" href="http://www.iscpif.fr/tiki-index.php?page=gargantext_feedback" title="Send us a message (bug, thanks, congrats...)">
+                                  <span class="glyphicon glyphicon-bullhorn" aria-hidden="true"></span>
+                                  Report Feedback</a></li>
                          <li class="divider"></li>
-                      {% if user.is_authenticated %}
+                          {% if user.is_authenticated %}
-                          <li><a tabindex="-1" href="/auth/logout" title="Click here to logout especially on public devices">Logout</a></li>
+                          <li>
+                              <a tabindex="-1" href="/auth/logout"
+                                  title="Click here to logout especially on public devices">
+                                  <span class="glyphicon glyphicon-log-out" aria-hidden="true"></span>
+                                  Logout
+                              </a></li>
                          {% else %}
-                          <li><a tabindex="-1" href="/auth/">Login</a></li>
+                          <li><a tabindex="-1" href="/auth/login">Login</a></li>
-                      {% endif %}
+                          {% endif %}
                      </ul>
                  </li>
              </ul>