[closes #85] added design for archived and deleted content

tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po

@@ -1819,6 +1819,20 @@ msgstr ""
 "Vous consultez <b>une ancienne version</b> de la page courante. (la "
 "version affichée est la v{})."
 
+#: tracim/templates/page/getone.mak:61
+#: tracim/templates/folder/getone.mak:61
+#: tracim/templates/thread/getone.mak:61
+#: tracim/templates/file/getone.mak:61
+msgid "You are viewing <b>an archived version</b> of the current page."
+msgstr "Vous consultez <b>une version archivée</b> de la page courante."
+
+#: tracim/templates/page/getone.mak:61
+#: tracim/templates/folder/getone.mak:61
+#: tracim/templates/thread/getone.mak:61
+#: tracim/templates/file/getone.mak:61
+msgid "You are viewing <b>a deleted version</b> of the current page."
+msgstr "Vous consultez <b>une version supprimée</b> de la page courante."
+
 #: tracim/templates/page/getone.mak:72 tracim/templates/thread/getone.mak:61
 msgid "<b>This information is deprecated</b>"
 msgstr "<b>Cette information est obsolète</b>"

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

@@ -397,8 +397,28 @@ span.info.readonly {
 .folder__filter a.btn {
   font-size: 14px;
 }
-.folder__list__item__status {
+.folder__content__list {
+  cursor: pointer;
+}
+.folder__content__list__item__title {
+  color: #428BCA;
+}
+.folder__content__list__item.archived,
+.folder__content__list__item.archived .t-less-visible,
+.folder__content__list__item.archived .folder__content__list__item__title,
+.folder__content__list__item.archived .folder__content__list__item__title > i {
+  color: #999;
+}
+.folder__content__list__item.deleted,
+.folder__content__list__item.deleted .t-less-visible,
+.folder__content__list__item.deleted .folder__content__list__item__title,
+.folder__content__list__item.deleted .folder__content__list__item__title > i {
+  color: #ccc;
+}
+.folder__content__list__item__status {
   float: right;
   font-size: 13px;
-  color: #999;
+}
+.folder__content__list__item__status.deleted i {
+  font-size: 14px;
 }

tracim/tracim/templates/file/getone.mak

@@ -62,7 +62,7 @@
     <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.
+            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
         </p>
     </div>
 </div>
@@ -71,7 +71,7 @@
     <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.
+            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
         </p>
     </div>
 </div>

tracim/tracim/templates/folder/getone.mak

@@ -61,7 +61,7 @@
     <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.
+            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
         </p>
     </div>
 </div>
@@ -70,7 +70,7 @@
     <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.
+            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
         </p>
     </div>
 </div>
@@ -146,13 +146,13 @@
             % if len(fake_api.sub_items) <= 0:
                 ${P.EMPTY_CONTENT(_('This folder has not yet content.'))}
             % else:
-                <table class="table table-striped table-hover tablesorter" id="current-folder-content-list">
+                <table class="table table-striped table-hover tablesorter folder__content__list" id="current-folder-content-list">
                     <thead>
                         <tr>
-                            <th>${_('Type')}</th>
                             <th>${_('Title')}</th>
                             <th>${_('Status')}</th>
                             <th>${_('Notes')}</th>
+                            <th>${_('Type')}</th>
                         </tr>
                     </thead>
                     <tbody>

tracim/tracim/templates/page/getone.mak

@@ -60,7 +60,7 @@
     <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.
+            ${_('You are viewing <b>an archived version</b> of the current page.')|n}
         </p>
     </div>
 </div>
@@ -69,7 +69,7 @@
     <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.
+            ${_('You are viewing <b>a deleted version</b> of the current page.')|n}
         </p>
     </div>
 </div>

tracim/tracim/templates/thread/getone.mak

@@ -62,7 +62,7 @@
     <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.
+            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
         </p>
     </div>
 </div>
@@ -71,7 +71,7 @@
     <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.
+            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
         </p>
     </div>
 </div>

tracim/tracim/templates/widgets/table_row.mak

@@ -55,10 +55,15 @@
 </%def>
 
 <%def name="CONTENT(content)">
-    <tr class="t-table-row-${content.type.type}">
-        <td>
+    <tr class="t-table-row-${content.type.type} folder__content__list__item ${'archived' if content.is_archived else ''} ${'deleted' if content.is_deleted else ''}"
+        onclick="document.location = '${content.url}'"> <!-- <a /> does not work on <tr /> -->
+
+        <td class="folder__content__list__item__title">
+            <i class="fa-fw ${content.type.icon} ${content.type.color}"></i> ${content.label}
+        </td>
+
+        <!--td class="folder__content__list__type">
             <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) :
@@ -68,8 +73,8 @@
             </span>
 
             ## <span class="tracim-less-visible"><i class="fa fa-file-text-o fa-tw"></i> ${content}</span>
-        </td>
-        <td><a href="${content.url}">${content.label}</a></td>
+        </td-->
+
         % if 'folder' == content.type.id:
             <td class="text-center t-less-visible">-</td>
         % else:
@@ -86,16 +91,20 @@
                     <i class="fa fa-fw fa-close"></i>
                 % endif
 
-                <span class="t-less-visible">${content.status.label}</span>
-
+                <span class="t-less-visible">
+                  ${content.status.label}
+                  % if (content.is_archived) :
+                      - Archivé
+                  % elif (content.is_deleted) :
+                      - Supprimé
+                  % endif
+                </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>
+
+        <td>${content.type.label}</td>
     </tr>
 </%def>