[closes #96] change order of elements in topbar

tracim/tracim/templates/master_authenticated.mak

@@ -111,10 +111,10 @@
                 % if request.identity:
                     <ul class="nav navbar-nav navbar-left">
                         <li class="active"><a href="${tg.url('/home')}">${TIM.FA('fa-home fa-lg')} ${_('My Home')}</a></li>
+                        <li class=""><a href="${tg.url('/calendar')}">${TIM.FA('fa-calendar')} ${_('Calendar')}</a></li>
                         % if fake_api.current_user.profile.id>2:
                             ${NAVBAR_MENU.ADMIN_ITEMS()}
                         % endif
-                        <li class=""><a href="${tg.url('/calendar')}">${TIM.FA('fa-calendar')} ${_('Calendar')}</a></li>
                     </ul>
                 % endif
 

tracim/tracim/templates/widgets/navbar_menu.mak

@@ -2,13 +2,13 @@
 
 <%def name="ADMIN_ITEMS()">
     <li class="">
-        <a href="${tg.url('/admin/users')}">
-            ${ICON.FA('fa-user fa-fw')} ${_('Users')}
+        <a href="${tg.url('/admin/workspaces')}">
+            ${ICON.FA('fa-bank fa-fw')} ${_('Workspaces')}
         </a>
     </li>
     <li class="">
-        <a href="${tg.url('/admin/workspaces')}">
-            ${ICON.FA('fa-bank fa-fw')} ${_('Workspaces')}
+        <a href="${tg.url('/admin/users')}">
+            ${ICON.FA('fa-user fa-fw')} ${_('Users')}
         </a>
     </li>
 </%def>