Browse Source

fixes #81, will be restored with bug 85

Damien ACCORSI 8 years ago
parent
commit
a053276123

+ 1 - 1
tracim/tracim/templates/file/toolbar.mak View File

@@ -30,7 +30,7 @@
30 30
         ## if the user can see the toolbar, it means he is the workspace manager.
31 31
         ## So now, we need to know if he alsa has right to delete workspaces
32 32
         <div class="btn-group btn-group-vertical">
33
-            <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>
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 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>
35 35
         </div>
36 36
     % endif

+ 1 - 1
tracim/tracim/templates/folder/toolbar.mak View File

@@ -48,7 +48,7 @@
48 48
         ## if the user can see the toolbar, it means he is the workspace manager.
49 49
         ## So now, we need to know if he alsa has right to delete workspaces
50 50
         <div class="btn-group btn-group-vertical">
51
-            <a title="${_('Archive thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/put_archive'.format(folder.workspace.id, folder.id))}"><i class="fa fa-archive fa-fw tracim-less-visible"></i> ${_('Archive')}</a>
51
+## SHOW_ARCHIVE_BUTTON__BUG_#81            <a title="${_('Archive thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/put_archive'.format(folder.workspace.id, folder.id))}"><i class="fa fa-archive fa-fw tracim-less-visible"></i> ${_('Archive')}</a>
52 52
             <a title="${_('Delete thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/put_delete'.format(folder.workspace.id, folder.id))}"><i class="fa fa-trash-o fa-fw tracim-less-visible"></i> ${_('Delete')}</a>
53 53
         </div>
54 54
         <p></p>

+ 5 - 4
tracim/tracim/templates/page/toolbar.mak View File

@@ -33,10 +33,11 @@
33 33
         ## if the user can see the toolbar, it means he is the workspace manager.
34 34
         ## So now, we need to know if he alsa has right to delete workspaces
35 35
         <div class="btn-group btn-group-vertical">
36
-            <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))}">
37
-                <i class="fa fa-archive fa-fw t-less-visible"></i>
38
-                ${_('Archive')}
39
-            </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>
40 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 42
                 <i class="fa fa-trash fa-fw t-less-visible"></i>
42 43
                 ${_('Delete')}

+ 5 - 4
tracim/tracim/templates/thread/toolbar.mak View File

@@ -25,10 +25,11 @@
25 25
         ## if the user can see the toolbar, it means he is the workspace manager.
26 26
         ## So now, we need to know if he alsa has right to delete workspaces
27 27
         <div class="btn-group btn-group-vertical">
28
-            <a title="${_('Archive thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/threads/{}/put_archive'.format(thread.workspace.id, thread.parent.id, thread.id))}">
29
-                ${ICON.FA_FW('t-less-visible fa fa-archive')}
30
-                ${_('Archive')}
31
-            </a>
28
+## SHOW_ARCHIVE_BUTTON__BUG_#81
29
+##             <a title="${_('Archive thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/threads/{}/put_archive'.format(thread.workspace.id, thread.parent.id, thread.id))}">
30
+##                 ${ICON.FA_FW('t-less-visible fa fa-archive')}
31
+##                 ${_('Archive')}
32
+##             </a>
32 33
             <a title="${_('Delete thread')}" class="btn btn-default ${delete_or_archive_disabled}" href="${tg.url('/workspaces/{}/folders/{}/threads/{}/put_delete'.format(thread.workspace.id, thread.parent.id, thread.id))}">
33 34
                 ${ICON.FA_FW('t-less-visible fa fa-trash')}
34 35
                 ${_('Delete')}