added design for deleted/archived content in content list + added msg for deleted/archived element in content page + design filter on content list

tracim/tracim/public/assets/css/dashboard.css

@@ -390,3 +390,15 @@ span.info.readonly {
 .threads-history-reverse > i {
   font-size: 12px;
 }
+
+.folder__filter {
+  font-size: 14px;
+}
+.folder__filter a.btn {
+  font-size: 14px;
+}
+.folder__list__item__status {
+  float: right;
+  font-size: 13px;
+  color: #999;
+}

tracim/tracim/templates/file/getone.mak

@@ -57,6 +57,26 @@
     </div>
 </div>
 
+% if (result.file.is_archived) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version archivée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% elif (result.file.is_deleted) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version supprimée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% endif
+
 % if result.file.selected_revision!='latest':
     <div class="row alert alert-warning" role="alert">
         <div class="col-sm-7 col-sm-offset-3">
@@ -145,7 +165,7 @@
                 ${WIDGETS.SECURED_SECTION_TITLE(fake_api.current_user, result.file.workspace, 'file-revisions', _('File revisions'))}
                 <p>${_('This file contains {} revision(s)').format(sum(1 for revision in result.file.revisions if revision.action.id=='revision'))}</p>
             % else:
-                % if h.user_role(fake_api.current_user, result.file.workspace)>1:
+                % if (h.user_role(fake_api.current_user, result.file.workspace)>1 and not result.file.is_archived and not result.file.is_deleted):
                     ${BUTTON.DATA_TARGET_AS_TEXT('new-file-revision', _('upload a new revision and/or comment...'), 'btn btn-success t-spacer-below')}
                     ${FORMS.NEW_FILE_REVISION_WITH_COMMENT_FORM('new-file-revision', result.file.workspace.id, result.file.parent.id, result.file.id)}
                 % endif

tracim/tracim/templates/folder/getone.mak

@@ -56,6 +56,26 @@
     </div>
 </div>
 
+% if (result.folder.is_archived) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version archivée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% elif (result.folder.is_deleted) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version supprimée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% endif
+
 <div class="row">
     <div class="col-sm-7 col-sm-offset-3">
 
@@ -64,10 +84,12 @@
         <div class="t-spacer-above">
             % if user_role > 1:
                 <div class="btn-group" role="group">
-                    <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
-                        <i class="fa fa-plus"></i> ${_('New ...')}
-                        <span class="caret"></span>
-                    </button>
+                    % if (not result.folder.is_archived and not result.folder.is_deleted) :
+                        <button type="button" class="btn btn-success dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                            <i class="fa fa-plus"></i> ${_('New ...')}
+                            <span class="caret"></span>
+                        </button>
+                    % endif
                     <ul class="dropdown-menu" role="menu">
                         % for content_type in result.folder.allowed_content_types:
                             % if content_type.id != 'folder' or user_role > 2:
@@ -183,4 +205,4 @@
     });
 </script>
 
-</div>
+</div>

tracim/tracim/templates/page/getone.mak

@@ -55,6 +55,26 @@
     </div>
 </div>
 
+% if (result.page.is_archived) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version archivée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% elif (result.page.is_deleted) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version supprimée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% endif
+
 % if result.page.selected_revision!='latest':
     <div class="row alert alert-warning" role="alert">
         <div class="col-sm-7 col-sm-offset-3">

tracim/tracim/templates/thread/getone.mak

@@ -57,6 +57,26 @@
     </div>
 </div>
 
+% if (result.thread.is_archived) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version archivée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% elif (result.thread.is_deleted) :
+<div class="row alert alert-info" role="alert">
+    <div class="col-sm-7 col-sm-offset-3">
+        <p>
+            <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
+            Vous consultez <b>une version supprimée</b> de la page courante.
+        </p>
+    </div>
+</div>
+% endif
+
 % if result.thread.status.id=='closed-deprecated':
     <div class="row alert alert-warning" role="alert">
         <div class="col-sm-7 col-sm-offset-3">
@@ -106,10 +126,12 @@
             % if result.thread.status.id!='open':
                 <p class="tracim-less-visible">${_('<b>Note</b>: In case you\'d like to post a reply, you must first open again the thread')|n}</p>
             % else:
-                <p class="t-half-spacer-below">
-                    ${BUTTON.DATA_TARGET_AS_TEXT('new-comment', _('Post a reply...'), 'btn btn-link')}
-                    ${FORMS.NEW_COMMENT_IN_THREAD('new-comment', result.thread.workspace.id, result.thread.parent.id, result.thread.id)}
-                </p>
+                % if (not result.thread.is_archived and not result.thread.is_deleted) :
+                    <p class="t-half-spacer-below">
+                        ${BUTTON.DATA_TARGET_AS_TEXT('new-comment', _('Post a reply...'), 'btn btn-link')}
+                        ${FORMS.NEW_COMMENT_IN_THREAD('new-comment', result.thread.workspace.id, result.thread.parent.id, result.thread.id)}
+                    </p>
+                % endif
             % endif
         % endif
     </div>
@@ -129,4 +151,4 @@
 ## % endfor
 ##
 
-</div>
+</div>

tracim/tracim/templates/widgets/table_row.mak

@@ -55,9 +55,17 @@
 </%def>
 
 <%def name="CONTENT(content)">
-    <tr class="t-table-row-${content.type.type} ${'archived' if content.is_archived else ''} ${'deleted' if content.is_deleted else ''}">
+    <tr class="t-table-row-${content.type.type}">
         <td>
-            <span class="${content.type.color}"><i class="fa-fw ${content.type.icon}"></i> ${content.type.label}</span>
+            <span class="${content.type.color}">
+                <i class="fa-fw ${content.type.icon}"></i>
+                % if (content.is_archived) :
+                    <i class="fa fa-archive fa-fw tracim-less-visible" title="Archivé"></i>
+                % elif (content.is_deleted) :
+                    <i class="fa fa-trash-o fa-fw tracim-less-visible" title="Supprimé"></i>
+                % endif
+                ${content.type.label}
+            </span>
 
             ## <span class="tracim-less-visible"><i class="fa fa-file-text-o fa-tw"></i> ${content}</span>
         </td>
@@ -77,7 +85,15 @@
                 % else:
                     <i class="fa fa-fw fa-close"></i>
                 % endif
+
                 <span class="t-less-visible">${content.status.label}</span>
+
+
+                % if (content.is_archived) :
+                    <div class="folder__list__item__status archived">Archivé</div>
+                % elif (content.is_deleted) :
+                    <div class="folder__list__item__status deleted">Supprimé</div>
+                % endif
             </td>
         % endif
         <td><span class="t-less-visible">${content.notes|n}</span></td>

tracim/tracim/templates/widgets/ui.mak

@@ -1,7 +1,7 @@
 <%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="...">
+    <div class="btn-group folder__filter" role="group" aria-label="...">
         ${BUTTON.TEXT('', 'btn btn-default disabled', _('display...'))}
 
         <% show_deleted_param = 1 %>