Merge branch 'master' of github.com:tracim/tracim

tracim/tracim/templates/file/toolbar.mak

@@ -30,8 +30,13 @@
         ## if the user can see the toolbar, it means he is the workspace manager.
         ## So now, we need to know if he alsa has right to delete workspaces
         <div class="btn-group btn-group-vertical">
-## SHOW_ARCHIVE_BUTTON__BUG_#81            <a title="${_('Archive file')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_archive'.format(file.workspace.id, file.parent.id, file.id))}">${ICON.FA_FW('fa fa-archive t-less-visible')} ${_('Archive')}</a>
-            <a title="${_('Delete file')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_delete'.format(file.workspace.id, file.parent.id, file.id))}">${ICON.FA_FW('fa fa-trash t-less-visible')} ${_('Delete')}</a>
+            ## SHOW_ARCHIVE_BUTTON__BUG_#81
+            <a title="${_('Archive file')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_archive'.format(file.workspace.id, file.parent.id, file.id))}">
+                ${ICON.FA_FW('fa fa-archive t-less-visible')} ${_('Archive')}test
+            </a>
+            <a title="${_('Delete file')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_delete'.format(file.workspace.id, file.parent.id, file.id))}">
+                ${ICON.FA_FW('fa fa-trash t-less-visible')} ${_('Delete')}
+            </a>
         </div>
     % endif
 </%def>

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 fa-lg')} ${_('Calendar')}</a></li>
                     </ul>
                 % endif
 

tracim/tracim/templates/page/toolbar.mak

@@ -26,18 +26,18 @@
         </a>
     </div>
     <p></p>
-    
+
 ## TODO - D.A - 2014-09-16
 ## Hide the delete button if the user is not a TIM Manager
     % if user.profile.id>=2 or h.user_role(user, workspace)>2:
         ## if the user can see the toolbar, it means he is the workspace manager.
         ## So now, we need to know if he alsa has right to delete workspaces
         <div class="btn-group btn-group-vertical">
-## SHOW_ARCHIVE_BUTTON__BUG_#81
-#             <a title="${_('Archive page')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/pages/{}/put_archive'.format(page.workspace.id, page.parent.id, page.id))}">
-#                 <i class="fa fa-archive fa-fw t-less-visible"></i>
-#                 ${_('Archive')}
-#             </a>
+            ## SHOW_ARCHIVE_BUTTON__BUG_#81
+            <a title="${_('Archive page')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/pages/{}/put_archive'.format(page.workspace.id, page.parent.id, page.id))}">
+                <i class="fa fa-archive fa-fw t-less-visible"></i>
+                ${_('Archive')}
+            </a>
             <a title="${_('Delete page')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/pages/{}/put_delete'.format(page.workspace.id, page.parent.id, page.id))}">
                 <i class="fa fa-trash fa-fw t-less-visible"></i>
                 ${_('Delete')}

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>