Issue #85: Restore Archive buttons and permet display of archives and deleted contents

tracim/tracim/controllers/__init__.py

@@ -73,7 +73,11 @@ class TIMRestPathContextSetup(object):
 
     @classmethod
     def current_folder(cls) -> Content:
-        content_api = ContentApi(tg.tmpl_context.current_user)
+        content_api = ContentApi(
+            tg.tmpl_context.current_user,
+            show_archived=True,
+            show_deleted=True,
+        )
         folder_id = int(tg.request.controller_state.routing_args.get('folder_id'))
         folder = content_api.get_one(folder_id, ContentType.Folder, tg.tmpl_context.workspace)
 
@@ -149,7 +153,11 @@ class TIMRestControllerWithBreadcrumb(TIMRestController):
         :param item_id: an item id (item may be normal content or folder
         :return:
         """
-        return ContentApi(tmpl_context.current_user).build_breadcrumb(tmpl_context.workspace, item_id)
+        return ContentApi(
+            tmpl_context.current_user,
+            show_archived=True,
+            show_deleted=True,
+        ).build_breadcrumb(tmpl_context.workspace, item_id)
 
     def _struct_new_serialized(self, workspace_id, parent_id):
         print('values are: ', workspace_id, parent_id)

tracim/tracim/controllers/content.py

@@ -174,13 +174,16 @@ class UserWorkspaceFolderFileRestController(TIMWorkspaceContentRestController):
         file_id = int(file_id)
         user = tmpl_context.current_user
         workspace = tmpl_context.workspace
-        workspace_id = tmpl_context.workspace_id
 
         current_user_content = Context(CTX.CURRENT_USER,
                                        current_user=user).toDict(user)
         current_user_content.roles.sort(key=lambda role: role.workspace.name)
 
-        content_api = ContentApi(user)
+        content_api = ContentApi(
+            user,
+            show_archived=True,
+            show_deleted=True,
+        )
         if revision_id:
             file = content_api.get_one_from_revision(file_id,  self._item_type, workspace, revision_id)
         else:
@@ -402,7 +405,11 @@ class UserWorkspaceFolderPageRestController(TIMWorkspaceContentRestController):
         current_user_content = Context(CTX.CURRENT_USER).toDict(user)
         current_user_content.roles.sort(key=lambda role: role.workspace.name)
 
-        content_api = ContentApi(user)
+        content_api = ContentApi(
+            user,
+            show_deleted=True,
+            show_archived=True,
+        )
         if revision_id:
             page = content_api.get_one_from_revision(page_id, ContentType.Page, workspace, revision_id)
         else:
@@ -587,7 +594,11 @@ class UserWorkspaceFolderThreadRestController(TIMWorkspaceContentRestController)
         current_user_content = Context(CTX.CURRENT_USER).toDict(user)
         current_user_content.roles.sort(key=lambda role: role.workspace.name)
 
-        content_api = ContentApi(user)
+        content_api = ContentApi(
+            user,
+            show_deleted=True,
+            show_archived=True,
+        )
         thread = content_api.get_one(thread_id, ContentType.Thread, workspace)
 
         fake_api_breadcrumb = self.get_breadcrumb(thread_id)
@@ -744,18 +755,35 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
 
     @tg.require(current_user_is_reader())
     @tg.expose('tracim.templates.folder.getone')
-    def get_one(self, folder_id):
+    def get_one(self, folder_id, **kwargs):
+        """
+        :param folder_id: Displayed folder id
+        :param kwargs:
+          * show_deleted: bool: Display deleted contents or hide them if False
+          * show_archived: bool: Display archived contents or hide them
+            if False
+        """
+        show_deleted = kwargs.get('show_deleted', False)
+        show_archived = kwargs.get('show_archived', False)
         folder_id = int(folder_id)
         user = tmpl_context.current_user
         workspace = tmpl_context.workspace
-        workspace_id = tmpl_context.workspace_id
 
         current_user_content = Context(CTX.CURRENT_USER,
                                        current_user=user).toDict(user)
         current_user_content.roles.sort(key=lambda role: role.workspace.name)
 
-        content_api = ContentApi(user)
-        folder = content_api.get_one(folder_id, ContentType.Folder, workspace)
+        content_api = ContentApi(
+            user,
+            show_deleted=show_deleted,
+            show_archived=show_archived,
+        )
+        with content_api.show(show_deleted=True, show_archived=True):
+            folder = content_api.get_one(
+                folder_id,
+                ContentType.Folder,
+                workspace,
+            )
 
         fake_api_breadcrumb = self.get_breadcrumb(folder_id)
         fake_api_subfolders = self.get_all_fake(workspace, folder.content_id).result
@@ -787,10 +815,16 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
         fake_api.sub_items = Context(CTX.FOLDER_CONTENT_LIST).toDict(sub_items)
 
         fake_api.content_types = Context(CTX.DEFAULT).toDict(
-            content_api.get_all_types())
+            content_api.get_all_types()
+        )
 
         dictified_folder = Context(CTX.FOLDER).toDict(folder, 'folder')
-        return DictLikeClass(result = dictified_folder, fake_api=fake_api)
+        return DictLikeClass(
+            result=dictified_folder,
+            fake_api=fake_api,
+            show_deleted=show_deleted,
+            show_archived=show_archived,
+        )
 
 
     def get_all_fake(self, context_workspace: Workspace, parent_id=None):
@@ -804,7 +838,8 @@ class UserWorkspaceFolderRestController(TIMRestControllerWithBreadcrumb):
         """
         workspace = context_workspace
         content_api = ContentApi(tmpl_context.current_user)
-        parent_folder = content_api.get_one(parent_id, ContentType.Folder)
+        with content_api.show(show_deleted=True, show_archived=True):
+            parent_folder = content_api.get_one(parent_id, ContentType.Folder)
         folders = content_api.get_child_folders(parent_folder, workspace)
 
         folders = Context(CTX.FOLDERS).toDict(folders)

tracim/tracim/controllers/workspace.py

@@ -42,7 +42,16 @@ class UserWorkspaceRestController(TIMRestController):
         tg.redirect(tg.url('/home'))
 
     @tg.expose('tracim.templates.workspace.getone')
-    def get_one(self, workspace_id):
+    def get_one(self, workspace_id, **kwargs):
+        """
+        :param workspace_id: Displayed workspace id
+        :param kwargs:
+          * show_deleted: bool: Display deleted contents or hide them if False
+          * show_archived: bool: Display archived contents or hide them
+            if False
+        """
+        show_deleted = kwargs.get('show_deleted', False)
+        show_archived = kwargs.get('show_archived', False)
         user = tmpl_context.current_user
 
         current_user_content = Context(CTX.CURRENT_USER).toDict(user)
@@ -61,7 +70,11 @@ class UserWorkspaceRestController(TIMRestController):
 
         fake_api.sub_items = Context(CTX.FOLDER_CONTENT_LIST).toDict(
             # TODO BS 20161209: Is the correct way to grab folders? No use API?
-            workspace.get_valid_children(ContentApi.DISPLAYABLE_CONTENTS)
+            workspace.get_valid_children(
+                ContentApi.DISPLAYABLE_CONTENTS,
+                show_deleted=show_deleted,
+                show_archived=show_archived,
+            )
         )
 
         dictified_workspace = Context(CTX.WORKSPACE).toDict(workspace, 'workspace')
@@ -71,6 +84,8 @@ class UserWorkspaceRestController(TIMRestController):
             result=dictified_workspace,
             fake_api=fake_api,
             webdav_url=webdav_url,
+            show_deleted=show_deleted,
+            show_archived=show_archived,
         )
 
     @tg.expose('json')

tracim/tracim/lib/content.py

@@ -1,4 +1,6 @@
 # -*- coding: utf-8 -*-
+from contextlib import contextmanager
+
 import os
 
 from operator import itemgetter
@@ -100,6 +102,34 @@ class ContentApi(object):
         self._force_show_all_types = force_show_all_types
         self._disable_user_workspaces_filter = disable_user_workspaces_filter
 
+    @contextmanager
+    def show(
+            self,
+            show_archived: bool=False,
+            show_deleted: bool=False,
+            show_temporary: bool=False,
+    ):
+        """
+        Use this method as context manager to update show_archived,
+        show_deleted and show_temporary properties during context.
+        :param show_archived: show archived contents
+        :param show_deleted:  show deleted contents
+        :param show_temporary:  show temporary contents
+        """
+        previous_show_archived = self._show_archived
+        previous_show_deleted = self._show_deleted
+        previous_show_temporary = self._show_temporary
+
+        try:
+            self._show_archived = show_archived
+            self._show_deleted = show_deleted
+            self._show_temporary = show_temporary
+            yield self
+        finally:
+            self._show_archived = previous_show_archived
+            self._show_deleted = previous_show_deleted
+            self._show_temporary = previous_show_temporary
+
     @classmethod
     def get_revision_join(cls):
         """

tracim/tracim/lib/helpers.py

@@ -167,7 +167,11 @@ def convert_id_into_instances(id: str) -> (Workspace, Content):
     try:
         content_data = content_str.split(CST.TREEVIEW_MENU.ID_SEPARATOR)
         content_id = int(content_data[1])
-        content = ContentApi(tg.tmpl_context.current_user).get_one(content_id, ContentType.Any)
+        content = ContentApi(
+            tg.tmpl_context.current_user,
+            show_archived=True,
+            show_deleted=True,
+        ).get_one(content_id, ContentType.Any)
     except (IndexError, ValueError) as e:
         content = None
 

tracim/tracim/model/data.py

@@ -97,12 +97,17 @@ class Workspace(DeclarativeBase):
         # @see Content.get_allowed_content_types()
         return [ContentType('folder')]
 
-    def get_valid_children(self, content_types: list=None):
+    def get_valid_children(
+            self,
+            content_types: list=None,
+            show_deleted: bool=False,
+            show_archived: bool=False,
+    ):
         for child in self.contents:
             # we search only direct children
             if not child.parent \
-                    and not child.is_deleted \
-                    and not child.is_archived:
+                    and (show_deleted or not child.is_deleted) \
+                    and (show_archived or not child.is_archived):
                 if not content_types or child.type in content_types:
                     yield child
 
@@ -1032,6 +1037,10 @@ class Content(DeclarativeBase):
     def revision(self) -> ContentRevisionRO:
         return self.get_current_revision()
 
+    @property
+    def is_editable(self) -> bool:
+        return not self.is_archived and not self.is_deleted
+
     def get_current_revision(self) -> ContentRevisionRO:
         if not self.revisions:
             return self.new_revision()

tracim/tracim/model/serializers.py

@@ -265,7 +265,7 @@ def serialize_version_for_page_or_file(version: ContentRevisionRO, context: Cont
         label = version.label,
         owner = context.toDict(version.owner),
         created = version.created,
-        action = context.toDict(version.get_last_action())
+        action = context.toDict(version.get_last_action()),
     )
 
 
@@ -389,6 +389,9 @@ def serialize_node_for_page(content: Content, context: Context):
             revisions=context.toDict(sorted(content.revisions, key=lambda v: v.created, reverse=True)),
             selected_revision='latest' if content.revision_to_serialize<=0 else content.revision_to_serialize,
             history=Context(CTX.CONTENT_HISTORY).toDict(content.get_history()),
+            is_editable=content.is_editable,
+            is_deleted=content.is_deleted,
+            is_archived=content.is_archived,
             urls = context.toDict({
                 'mark_read': context.url(Content.format_path('/workspaces/{wid}/folders/{fid}/{ctype}s/{cid}/put_read', content)),
                 'mark_unread': context.url(Content.format_path('/workspaces/{wid}/folders/{fid}/{ctype}s/{cid}/put_unread', content))
@@ -458,6 +461,9 @@ def serialize_node_for_page(item: Content, context: Context):
             comments = reversed(context.toDict(item.get_comments())),
             is_new=item.has_new_information_for(context.get_user()),
             history = Context(CTX.CONTENT_HISTORY).toDict(item.get_history()),
+            is_editable=item.is_editable,
+            is_deleted=item.is_deleted,
+            is_archived=item.is_archived,
             urls = context.toDict({
                 'mark_read': context.url(Content.format_path('/workspaces/{wid}/folders/{fid}/{ctype}s/{cid}/put_read', item)),
                 'mark_unread': context.url(Content.format_path('/workspaces/{wid}/folders/{fid}/{ctype}s/{cid}/put_unread', item))
@@ -547,7 +553,8 @@ def serialize_content_for_workspace(content: Content, context: Context):
                 all = page_nb_all,
                 open = page_nb_open,
             ),
-            content_nb = DictLikeClass(all = content_nb_all)
+            content_nb = DictLikeClass(all = content_nb_all),
+            is_editable=content.is_editable,
         )
 
     return result
@@ -595,7 +602,10 @@ def serialize_content_for_workspace_and_folder(content: Content, context: Contex
                                     open=folder_nb_open),
             page_nb=DictLikeClass(all=page_nb_all,
                                   open=page_nb_open),
-            content_nb=DictLikeClass(all = content_nb_all)
+            content_nb=DictLikeClass(all = content_nb_all),
+            is_archived=content.is_archived,
+            is_deleted=content.is_deleted,
+            is_editable=content.is_editable,
         )
 
     elif content.type==ContentType.Page:
@@ -635,6 +645,9 @@ def serialize_content_for_general_list(content: Content, context: Context):
         url=ContentType.fill_url(content),
         type=DictLikeClass(content_type.toDict()),
         status=context.toDict(content.get_status()),
+        is_deleted=content.is_deleted,
+        is_archived=content.is_archived,
+        is_editable=content.is_editable,
         last_activity = DictLikeClass({'date': last_activity_date,
                                        'label': last_activity_date_formatted,
                                        'delta': last_activity_label})
@@ -706,6 +719,10 @@ def serialize_content_for_folder_content_list(content: Content, context: Context
         item = Context(CTX.CONTENT_LIST).toDict(content)
         item.notes = ''
 
+    item.is_deleted = content.is_deleted
+    item.is_archived = content.is_archived
+    item.is_editable = content.is_editable
+
     return item
 
 

tracim/tracim/templates/file/getone.mak

@@ -36,6 +36,9 @@
 ##
 ############################################################################
 
+<div class="content-container ${'not-editable' if not result.file.is_editable else ''}">
+<!--# TODO BS 20161213: Indent content-->
+
 <div class="row t-page-header-row">
     <div class="col-sm-7 col-sm-offset-3 main">
         <h1 class="page-header t-file-color-border">
@@ -167,3 +170,4 @@
     </div>
 <div/>
 
+</div>

tracim/tracim/templates/file/toolbar.mak

@@ -3,16 +3,19 @@
 <%namespace name="BUTTON" file="tracim.templates.widgets.button"/>
 
 <%def name="SECURED_FILE(user, workspace, file)">
-    <div class="btn-group btn-group-vertical text-center">
-        ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, file)}
-    </div>
-    <hr class="t-toolbar-btn-group-separator"/>
-    <p></p>
+
+    % if file.is_editable:
+        <div class="btn-group btn-group-vertical text-center">
+            ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, file)}
+        </div>
+        <hr class="t-toolbar-btn-group-separator"/>
+        <p></p>
+    % endif
 
     <% download_url = tg.url('/workspaces/{}/folders/{}/files/{}/download?revision_id={}'.format(result.file.workspace.id, result.file.parent.id,result.file.id,result.file.selected_revision)) %>
     <% edit_disabled = ('', 'disabled')[file.selected_revision!='latest' or file.status.id[:6]=='closed'] %>
     <% delete_or_archive_disabled = ('', 'disabled')[file.selected_revision!='latest'] %>
-    % if h.user_role(user, workspace)>1:
+    % if h.user_role(user, workspace)>1 and file.is_editable:
         <div class="btn-group btn-group-vertical">
             <a title="${_('Edit current file')}" class="btn btn-default ${edit_disabled}" data-toggle="modal" data-target="#file-edit-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/files/{}/edit'.format(file.workspace.id, file.parent.id, file.id))}" >${ICON.FA_FW('fa fa-edit t-less-visible')} ${_('Edit')}</a>
         </div>
@@ -26,11 +29,10 @@
     </div>
     <p></p>
 
-    % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+    % if user.profile.id>=3 or h.user_role(user, workspace)>=4 and file.is_editable:
         ## 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>
@@ -39,5 +41,28 @@
             </a>
         </div>
     % endif
+
+    % if file.is_deleted or file.is_archived:
+        <div class="btn-group btn-group-vertical">
+            % if file.is_archived:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_archive_undo'.format(file.workspace.id, file.parent.id, file.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+            % if file.is_deleted:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/files/{}/put_delete_undo'.format(file.workspace.id, file.parent.id, file.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+        </div>
+        <p></p>
+    % endif
+
 </%def>
 

tracim/tracim/templates/folder/getone.mak

@@ -9,6 +9,7 @@
 <%namespace name="TABLE_ROW" file="tracim.templates.widgets.table_row"/>
 <%namespace name="ICON" file="tracim.templates.widgets.icon"/>
 <%namespace name="P" file="tracim.templates.widgets.paragraph"/>
+<%namespace name="UI" file="tracim.templates.widgets.ui"/>
 
 <%def name="title()">${result.folder.label}</%def>
 
@@ -38,6 +39,9 @@
 ##
 ############################################################################
 
+<div class="folder-container ${'not-editable' if not result.folder.is_editable else ''}">
+<!--# TODO BS 20161213: Indent content-->
+
 <div class="row t-page-header-row">
     <div class="col-sm-7 col-sm-offset-3 main">
         <h1 class="page-header t-folder-color-border">
@@ -115,6 +119,8 @@
                 % endif
             % endif
 
+            ${UI.GENERIC_DISPLAY_VIEW_BUTTONS_CONTAINER(tg.url('/workspaces/{}/folders/{}'.format(result.folder.workspace.id, result.folder.id)))}
+
             % if len(fake_api.sub_items) <= 0:
                 ${P.EMPTY_CONTENT(_('This folder has not yet content.'))}
             % else:
@@ -176,3 +182,5 @@
         });
     });
 </script>
+
+</div>

tracim/tracim/templates/folder/toolbar.mak

@@ -28,7 +28,7 @@
     %>
     
     <% delete_or_archive_disabled = ('', 'disabled')[folder.selected_revision!='latest'] %> 
-    % if h.user_role(user, workspace)>2:
+    % if h.user_role(user, workspace)>2 and folder.is_editable:
         <div class="btn-group btn-group-vertical">
             ## This action is allowed for content managers only
             <a title="${_('Edit current folder')}" class="btn btn-default ${edit_disabled}" data-toggle="modal" data-target="#folder-edit-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/edit'.format(folder.workspace.id, folder.id))}" ><i class="fa fa-edit fa-fw tracim-less-visible"></i> ${_('Edit')}</a>
@@ -36,7 +36,7 @@
         <p></p>
     % endif
     
-    % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+    % if user.profile.id>=3 or h.user_role(user, workspace)>=4 and folder.is_editable:
         <div class="btn-group btn-group-vertical">
             ## This action is allowed for content managers only
             <a title="${_('Move current folder')}" class="btn btn-default ${move_disabled}" data-toggle="modal" data-target="#folder-move-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/location/{}/edit'.format(folder.workspace.id, folder.id, folder.id))}" ><i class="fa fa-arrows fa-fw tracim-less-visible"></i> ${_('Move')}</a>
@@ -44,15 +44,36 @@
         <p></p>
     % endif
 
-    % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+    % if user.profile.id>=3 or h.user_role(user, workspace)>=4 and folder.is_editable:
         ## 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 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>
+            <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>
             <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>
         </div>
         <p></p>
     % endif
 
-</%def>
+    % if folder.is_deleted or folder.is_archived:
+        <div class="btn-group btn-group-vertical">
+            % if folder.is_archived:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/put_archive_undo'.format(folder.workspace.id, folder.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+            % if folder.is_deleted:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/put_delete_undo'.format(folder.workspace.id, folder.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+        </div>
+        <p></p>
+    % endif
 
+</%def>

tracim/tracim/templates/page/getone.mak

@@ -34,6 +34,8 @@
 ##
 ############################################################################
 
+<div class="content-container ${'not-editable' if not result.page.is_editable else ''}">
+<!--# TODO BS 20161213: Indent content-->
 
 <div class="row t-page-header-row">
     <div class="col-sm-7 col-sm-offset-3 main">
@@ -111,3 +113,4 @@
     </div>
 <div/>
 
+</div>

tracim/tracim/templates/page/toolbar.mak

@@ -2,15 +2,18 @@
 <%namespace name="BUTTON" file="tracim.templates.widgets.button"/>
 
 <%def name="SECURED_PAGE(user, workspace, page)">
-    <div class="btn-group btn-group-vertical">
-        ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, page)}
-    </div>
-    <hr class="t-toolbar-btn-group-separator"/>
-    <p></p>
+
+    % if page.is_editable:
+        <div class="btn-group btn-group-vertical">
+            ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, page)}
+        </div>
+        <hr class="t-toolbar-btn-group-separator"/>
+        <p></p>
+    % endif
 
     <% edit_disabled = ('', 'disabled')[page.selected_revision!='latest' or page.status.id[:6]=='closed'] %>
     <% delete_or_archive_disabled = ('', 'disabled')[page.selected_revision!='latest'] %> 
-    % if h.user_role(user, workspace)>1:
+    % if h.user_role(user, workspace)>1 and page.is_editable:
         <div class="btn-group btn-group-vertical">
             <a title="${_('Edit')}" class="btn btn-default ${edit_disabled}" data-toggle="modal" data-target="#page-edit-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/pages/{}/edit'.format(page.workspace.id, page.parent.id, page.id))}" >
                 <i class="fa fa-edit fa-fw t-less-visible"></i> ${_('Edit')}
@@ -29,11 +32,10 @@
 
 ## 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 (user.profile.id>=2 or h.user_role(user, workspace)>2) and page.is_editable:
         ## 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')}
@@ -45,5 +47,28 @@
 
         </div>
     % endif
+
+    % if page.is_deleted or page.is_archived:
+        <div class="btn-group btn-group-vertical">
+            % if page.is_archived:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/pages/{}/put_archive_undo'.format(page.workspace.id, page.parent.id, page.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+            % if page.is_deleted:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/pages/{}/put_delete_undo'.format(page.workspace.id, page.parent.id, page.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+        </div>
+        <p></p>
+    % endif
+
 </%def>
 

tracim/tracim/templates/thread/getone.mak

@@ -36,6 +36,9 @@
 ##
 ############################################################################
 
+<div class="content-container ${'not-editable' if not result.thread.is_editable else ''}">
+<!--# TODO BS 20161213: Indent content-->
+
 <div class="row t-page-header-row">
     <div class="col-sm-7 col-sm-offset-3 main">
         <h1 class="page-header t-thread-color-border">
@@ -125,3 +128,5 @@
 ##     ${WIDGETS.SECURED_TIMELINE_ITEM(fake_api.current_user, comment)}
 ## % endfor
 ##
+
+</div>

tracim/tracim/templates/thread/toolbar.mak

@@ -3,15 +3,18 @@
 <%namespace name="BUTTON" file="tracim.templates.widgets.button"/>
 
 <%def name="SECURED_THREAD(user, workspace, thread)">
-    <div class="btn-group btn-group-vertical">
-        ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, thread)}
-    </div>
-    <hr class="t-toolbar-btn-group-separator"/>
-    <p></p>
+
+    % if thread.is_editable:
+        <div class="btn-group btn-group-vertical">
+            ${BUTTON.MARK_CONTENT_READ_OR_UNREAD(user, workspace, thread)}
+        </div>
+        <hr class="t-toolbar-btn-group-separator"/>
+        <p></p>
+    % endif
 
     <% edit_disabled = ('', 'disabled')[thread.selected_revision!='latest' or thread.status.id[:6]=='closed'] %>
     <% delete_or_archive_disabled = ('', 'disabled')[thread.selected_revision!='latest'] %> 
-    % if h.user_role(user, workspace)>1:
+    % if h.user_role(user, workspace)>1 and thread.is_editable:
         <div class="btn-group btn-group-vertical">
             <a title="${_('Edit current thread')}" class="btn btn-default ${edit_disabled}" data-toggle="modal" data-target="#thread-edit-modal-dialog" data-remote="${tg.url('/workspaces/{}/folders/{}/threads/{}/edit'.format(thread.workspace.id, thread.parent.id, thread.id))}" >
                 ${ICON.FA_FW('t-less-visible fa fa-edit')}
@@ -21,20 +24,42 @@
         <p></p>
     % endif
     
-    % if user.profile.id>=3 or h.user_role(user, workspace)>=4:
+    % if (user.profile.id>=3 or h.user_role(user, workspace)>=4) and thread.is_editable:
         ## 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 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))}">
-##                 ${ICON.FA_FW('t-less-visible fa fa-archive')}
-##                 ${_('Archive')}
-##             </a>
+            <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))}">
+                ${ICON.FA_FW('t-less-visible fa fa-archive')}
+                ${_('Archive')}
+            </a>
             <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))}">
                 ${ICON.FA_FW('t-less-visible fa fa-trash')}
                 ${_('Delete')}
             </a>
         </div>
     % endif
+
+    % if thread.is_deleted or thread.is_archived:
+        <div class="btn-group btn-group-vertical">
+            % if thread.is_archived:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/threads/{}/put_archive_undo'.format(thread.workspace.id, thread.parent.id, thread.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+            % if thread.is_deleted:
+                <a title="${_('Restore')}"
+                   class="btn btn-default"
+                   href="${tg.url('/workspaces/{}/folders/{}/threads/{}/put_delete_undo'.format(thread.workspace.id, thread.parent.id, thread.id))}">
+                    <i class="fa fa-archive fa-fw tracim-less-visible"></i>
+                    ${_('Restore')}
+                </a>
+            % endif
+        </div>
+        <p></p>
+    % endif
+
 </%def>
 

tracim/tracim/templates/widgets/table_row.mak

@@ -55,7 +55,7 @@
 </%def>
 
 <%def name="CONTENT(content)">
-    <tr class="t-table-row-${content.type.type}">
+    <tr class="t-table-row-${content.type.type} ${'archived' if content.is_archived else ''} ${'deleted' if content.is_deleted else ''}">
         <td>
             <span class="${content.type.color}"><i class="fa-fw ${content.type.icon}"></i> ${content.type.label}</span>
 

tracim/tracim/templates/widgets/ui.mak

@@ -0,0 +1,32 @@
+<%namespace name="BUTTON" file="tracim.templates.widgets.button"/>
+
+<%def name="GENERIC_DISPLAY_VIEW_BUTTONS_CONTAINER(base_url)">
+    <div class="btn-group" role="group" aria-label="...">
+        ${BUTTON.TEXT('', 'btn btn-default disabled', _('display...'))}
+        <a href="${base_url}"
+           class="btn btn-default disabled-has-priority ${'t-inactive-color' if show_deleted or show_archived else ''}"
+        >
+            ${_('normal view')}
+        </a>
+
+        % if show_deleted:
+        <a href="${base_url}"
+           % else:
+        <a href="${base_url}?show_deleted=1"
+           % endif
+           class="btn btn-default disabled-has-priority ${'t-inactive-color' if not show_deleted else ''}"
+        >
+            ${_('deleted')}
+        </a>
+
+        % if show_archived:
+        <a href="${base_url}"
+           % else:
+        <a href="${base_url}?show_archived=1"
+           % endif
+           class="btn btn-default disabled-has-priority ${'t-inactive-color' if not show_archived else ''}"
+        >
+            ${_('archived')}
+        </a>
+    </div>
+</%def>

tracim/tracim/templates/workspace/getone.mak

@@ -10,6 +10,7 @@
 <%namespace name="P" file="tracim.templates.widgets.paragraph"/>
 <%namespace name="TITLE" file="tracim.templates.widgets.title"/>
 <%namespace name="TABLE_ROW" file="tracim.templates.widgets.table_row"/>
+<%namespace name="UI" file="tracim.templates.widgets.ui"/>
 
 <%def name="title()">${result.workspace.label}</%def>
 
@@ -192,6 +193,8 @@
                 </div>
             % endif
 
+            ${UI.GENERIC_DISPLAY_VIEW_BUTTONS_CONTAINER(tg.url('/workspaces/{}'.format(result.workspace.id)))}
+
         </div>
         <div class="t-spacer-above">