Browse Source

removed '#' in the 'archiver' btn

Come 8 years ago
parent
commit
299300d2f2

+ 7 - 2
tracim/tracim/templates/file/toolbar.mak View File

30
         ## if the user can see the toolbar, it means he is the workspace manager.
30
         ## if the user can see the toolbar, it means he is the workspace manager.
31
         ## So now, we need to know if he alsa has right to delete workspaces
31
         ## So now, we need to know if he alsa has right to delete workspaces
32
         <div class="btn-group btn-group-vertical">
32
         <div class="btn-group btn-group-vertical">
33
-## 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>
34
-            <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>
33
+            ## SHOW_ARCHIVE_BUTTON__BUG_#81
34
+            <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))}">
35
+                ${ICON.FA_FW('fa fa-archive t-less-visible')} ${_('Archive')}test
36
+            </a>
37
+            <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))}">
38
+                ${ICON.FA_FW('fa fa-trash t-less-visible')} ${_('Delete')}
39
+            </a>
35
         </div>
40
         </div>
36
     % endif
41
     % endif
37
 </%def>
42
 </%def>

+ 6 - 6
tracim/tracim/templates/page/toolbar.mak View File

26
         </a>
26
         </a>
27
     </div>
27
     </div>
28
     <p></p>
28
     <p></p>
29
-    
29
+
30
 ## TODO - D.A - 2014-09-16
30
 ## TODO - D.A - 2014-09-16
31
 ## Hide the delete button if the user is not a TIM Manager
31
 ## Hide the delete button if the user is not a TIM Manager
32
     % if user.profile.id>=2 or h.user_role(user, workspace)>2:
32
     % if user.profile.id>=2 or h.user_role(user, workspace)>2:
33
         ## if the user can see the toolbar, it means he is the workspace manager.
33
         ## if the user can see the toolbar, it means he is the workspace manager.
34
         ## So now, we need to know if he alsa has right to delete workspaces
34
         ## So now, we need to know if he alsa has right to delete workspaces
35
         <div class="btn-group btn-group-vertical">
35
         <div class="btn-group btn-group-vertical">
36
-## SHOW_ARCHIVE_BUTTON__BUG_#81
37
-#             <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))}">
38
-#                 <i class="fa fa-archive fa-fw t-less-visible"></i>
39
-#                 ${_('Archive')}
40
-#             </a>
36
+            ## SHOW_ARCHIVE_BUTTON__BUG_#81
37
+            <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))}">
38
+                <i class="fa fa-archive fa-fw t-less-visible"></i>
39
+                ${_('Archive')}
40
+            </a>
41
             <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))}">
41
             <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))}">
42
                 <i class="fa fa-trash fa-fw t-less-visible"></i>
42
                 <i class="fa fa-trash fa-fw t-less-visible"></i>
43
                 ${_('Delete')}
43
                 ${_('Delete')}