Merge branch 'master' of github.com:interlegis/sapl

sapl/templates/base.html

@@ -42,6 +42,8 @@
           </div>
           <div id="navbar" class="navbar-collapse collapse">
             <ul class="nav navbar-nav">
+              <li><a href="/" role="button" aria-haspopup="true" aria-expanded="false">Inicio<span class="caret"></span></a></li>
+
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Institucional <span class="caret"></span></a>
                   <ul class="dropdown-menu">
@@ -135,11 +137,10 @@
                 <li><a href="{% url 'sapl.base:login' %}"><img src="{% static 'img/user.png' %}"></a></li>
               {% else %}
                 <li class="dropdown">
-                  <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false"><img height="30" width="30" src="{% static 'img/authenticated.png' %}"><span class="caret"></span></a>
-                      {{ user.username }}
-                    <span class="caret"></span>
                   </a>
                   <ul class="dropdown-menu">
+                    <li><a>{{user.username}}</a></li>
                     <li><a href="{% url 'sapl.base:logout' %}">Sair</a></li>
                   </ul>
                 </li>
@@ -252,7 +253,7 @@
               <address>
                 <small>
                   <strong>
-                    <span class="org">{{ nome }}</span>                    
+                    <span class="org">{{ nome }}</span> 
                   </strong>
                   <br>
                   <span class="street-address">{{ endereco }}</span>