Pārlūkot izejas kodu

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

Come 8 gadus atpakaļ
vecāks
revīzija
de2980e916

Binārs
tracim/tracim/i18n/fr/LC_MESSAGES/tracim.mo Parādīt failu


+ 14 - 0
tracim/tracim/i18n/fr/LC_MESSAGES/tracim.po Parādīt failu

1819
 "Vous consultez <b>une ancienne version</b> de la page courante. (la "
1819
 "Vous consultez <b>une ancienne version</b> de la page courante. (la "
1820
 "version affichée est la v{})."
1820
 "version affichée est la v{})."
1821
 
1821
 
1822
+#: tracim/templates/page/getone.mak:61
1823
+#: tracim/templates/folder/getone.mak:61
1824
+#: tracim/templates/thread/getone.mak:61
1825
+#: tracim/templates/file/getone.mak:61
1826
+msgid "You are viewing <b>an archived version</b> of the current page."
1827
+msgstr "Vous consultez <b>une version archivée</b> de la page courante."
1828
+
1829
+#: tracim/templates/page/getone.mak:61
1830
+#: tracim/templates/folder/getone.mak:61
1831
+#: tracim/templates/thread/getone.mak:61
1832
+#: tracim/templates/file/getone.mak:61
1833
+msgid "You are viewing <b>a deleted version</b> of the current page."
1834
+msgstr "Vous consultez <b>une version supprimée</b> de la page courante."
1835
+
1822
 #: tracim/templates/page/getone.mak:72 tracim/templates/thread/getone.mak:61
1836
 #: tracim/templates/page/getone.mak:72 tracim/templates/thread/getone.mak:61
1823
 msgid "<b>This information is deprecated</b>"
1837
 msgid "<b>This information is deprecated</b>"
1824
 msgstr "<b>Cette information est obsolète</b>"
1838
 msgstr "<b>Cette information est obsolète</b>"

+ 22 - 2
tracim/tracim/public/assets/css/dashboard.css Parādīt failu

397
 .folder__filter a.btn {
397
 .folder__filter a.btn {
398
   font-size: 14px;
398
   font-size: 14px;
399
 }
399
 }
400
-.folder__list__item__status {
400
+.folder__content__list {
401
+  cursor: pointer;
402
+}
403
+.folder__content__list__item__title {
404
+  color: #428BCA;
405
+}
406
+.folder__content__list__item.archived,
407
+.folder__content__list__item.archived .t-less-visible,
408
+.folder__content__list__item.archived .folder__content__list__item__title,
409
+.folder__content__list__item.archived .folder__content__list__item__title > i {
410
+  color: #999;
411
+}
412
+.folder__content__list__item.deleted,
413
+.folder__content__list__item.deleted .t-less-visible,
414
+.folder__content__list__item.deleted .folder__content__list__item__title,
415
+.folder__content__list__item.deleted .folder__content__list__item__title > i {
416
+  color: #ccc;
417
+}
418
+.folder__content__list__item__status {
401
   float: right;
419
   float: right;
402
   font-size: 13px;
420
   font-size: 13px;
403
-  color: #999;
421
+}
422
+.folder__content__list__item__status.deleted i {
423
+  font-size: 14px;
404
 }
424
 }

+ 2 - 2
tracim/tracim/templates/file/getone.mak Parādīt failu

62
     <div class="col-sm-7 col-sm-offset-3">
62
     <div class="col-sm-7 col-sm-offset-3">
63
         <p>
63
         <p>
64
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
64
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
65
-            Vous consultez <b>une version archivée</b> de la page courante.
65
+            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
66
         </p>
66
         </p>
67
     </div>
67
     </div>
68
 </div>
68
 </div>
71
     <div class="col-sm-7 col-sm-offset-3">
71
     <div class="col-sm-7 col-sm-offset-3">
72
         <p>
72
         <p>
73
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
73
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
74
-            Vous consultez <b>une version supprimée</b> de la page courante.
74
+            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
75
         </p>
75
         </p>
76
     </div>
76
     </div>
77
 </div>
77
 </div>

+ 4 - 4
tracim/tracim/templates/folder/getone.mak Parādīt failu

61
     <div class="col-sm-7 col-sm-offset-3">
61
     <div class="col-sm-7 col-sm-offset-3">
62
         <p>
62
         <p>
63
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
63
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
64
-            Vous consultez <b>une version archivée</b> de la page courante.
64
+            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
65
         </p>
65
         </p>
66
     </div>
66
     </div>
67
 </div>
67
 </div>
70
     <div class="col-sm-7 col-sm-offset-3">
70
     <div class="col-sm-7 col-sm-offset-3">
71
         <p>
71
         <p>
72
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
72
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
73
-            Vous consultez <b>une version supprimée</b> de la page courante.
73
+            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
74
         </p>
74
         </p>
75
     </div>
75
     </div>
76
 </div>
76
 </div>
146
             % if len(fake_api.sub_items) <= 0:
146
             % if len(fake_api.sub_items) <= 0:
147
                 ${P.EMPTY_CONTENT(_('This folder has not yet content.'))}
147
                 ${P.EMPTY_CONTENT(_('This folder has not yet content.'))}
148
             % else:
148
             % else:
149
-                <table class="table table-striped table-hover tablesorter" id="current-folder-content-list">
149
+                <table class="table table-striped table-hover tablesorter folder__content__list" id="current-folder-content-list">
150
                     <thead>
150
                     <thead>
151
                         <tr>
151
                         <tr>
152
-                            <th>${_('Type')}</th>
153
                             <th>${_('Title')}</th>
152
                             <th>${_('Title')}</th>
154
                             <th>${_('Status')}</th>
153
                             <th>${_('Status')}</th>
155
                             <th>${_('Notes')}</th>
154
                             <th>${_('Notes')}</th>
155
+                            <th>${_('Type')}</th>
156
                         </tr>
156
                         </tr>
157
                     </thead>
157
                     </thead>
158
                     <tbody>
158
                     <tbody>

+ 2 - 2
tracim/tracim/templates/page/getone.mak Parādīt failu

60
     <div class="col-sm-7 col-sm-offset-3">
60
     <div class="col-sm-7 col-sm-offset-3">
61
         <p>
61
         <p>
62
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
62
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
63
-            Vous consultez <b>une version archivée</b> de la page courante.
63
+            ${_('You are viewing <b>an archived version</b> of the current page.')|n}
64
         </p>
64
         </p>
65
     </div>
65
     </div>
66
 </div>
66
 </div>
69
     <div class="col-sm-7 col-sm-offset-3">
69
     <div class="col-sm-7 col-sm-offset-3">
70
         <p>
70
         <p>
71
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
71
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
72
-            Vous consultez <b>une version supprimée</b> de la page courante.
72
+            ${_('You are viewing <b>a deleted version</b> of the current page.')|n}
73
         </p>
73
         </p>
74
     </div>
74
     </div>
75
 </div>
75
 </div>

+ 2 - 2
tracim/tracim/templates/thread/getone.mak Parādīt failu

62
     <div class="col-sm-7 col-sm-offset-3">
62
     <div class="col-sm-7 col-sm-offset-3">
63
         <p>
63
         <p>
64
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
64
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
65
-            Vous consultez <b>une version archivée</b> de la page courante.
65
+            ${_('Vous consultez <b>une version archivée</b> de la page courante.')|n}
66
         </p>
66
         </p>
67
     </div>
67
     </div>
68
 </div>
68
 </div>
71
     <div class="col-sm-7 col-sm-offset-3">
71
     <div class="col-sm-7 col-sm-offset-3">
72
         <p>
72
         <p>
73
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
73
             <span class="pull-left"><i class="fa fa-fw fa-2x fa-warning" alt="" title=""></i></span>
74
-            Vous consultez <b>une version supprimée</b> de la page courante.
74
+            ${_('Vous consultez <b>une version supprimée</b> de la page courante.')|n}
75
         </p>
75
         </p>
76
     </div>
76
     </div>
77
 </div>
77
 </div>

+ 21 - 12
tracim/tracim/templates/widgets/table_row.mak Parādīt failu

55
 </%def>
55
 </%def>
56
 
56
 
57
 <%def name="CONTENT(content)">
57
 <%def name="CONTENT(content)">
58
-    <tr class="t-table-row-${content.type.type}">
59
-        <td>
58
+    <tr class="t-table-row-${content.type.type} folder__content__list__item ${'archived' if content.is_archived else ''} ${'deleted' if content.is_deleted else ''}"
59
+        onclick="document.location = '${content.url}'"> <!-- <a /> does not work on <tr /> -->
60
+
61
+        <td class="folder__content__list__item__title">
62
+            <i class="fa-fw ${content.type.icon} ${content.type.color}"></i> ${content.label}
63
+        </td>
64
+
65
+        <!--td class="folder__content__list__type">
60
             <span class="${content.type.color}">
66
             <span class="${content.type.color}">
61
-                <i class="fa-fw ${content.type.icon}"></i>
62
                 % if (content.is_archived) :
67
                 % if (content.is_archived) :
63
                     <i class="fa fa-archive fa-fw tracim-less-visible" title="Archivé"></i>
68
                     <i class="fa fa-archive fa-fw tracim-less-visible" title="Archivé"></i>
64
                 % elif (content.is_deleted) :
69
                 % elif (content.is_deleted) :
68
             </span>
73
             </span>
69
 
74
 
70
             ## <span class="tracim-less-visible"><i class="fa fa-file-text-o fa-tw"></i> ${content}</span>
75
             ## <span class="tracim-less-visible"><i class="fa fa-file-text-o fa-tw"></i> ${content}</span>
71
-        </td>
72
-        <td><a href="${content.url}">${content.label}</a></td>
76
+        </td-->
77
+
73
         % if 'folder' == content.type.id:
78
         % if 'folder' == content.type.id:
74
             <td class="text-center t-less-visible">-</td>
79
             <td class="text-center t-less-visible">-</td>
75
         % else:
80
         % else:
86
                     <i class="fa fa-fw fa-close"></i>
91
                     <i class="fa fa-fw fa-close"></i>
87
                 % endif
92
                 % endif
88
 
93
 
89
-                <span class="t-less-visible">${content.status.label}</span>
90
-
94
+                <span class="t-less-visible">
95
+                  ${content.status.label}
96
+                  % if (content.is_archived) :
97
+                      - Archivé
98
+                  % elif (content.is_deleted) :
99
+                      - Supprimé
100
+                  % endif
101
+                </span>
91
 
102
 
92
-                % if (content.is_archived) :
93
-                    <div class="folder__list__item__status archived">Archivé</div>
94
-                % elif (content.is_deleted) :
95
-                    <div class="folder__list__item__status deleted">Supprimé</div>
96
-                % endif
97
             </td>
103
             </td>
98
         % endif
104
         % endif
105
+
99
         <td><span class="t-less-visible">${content.notes|n}</span></td>
106
         <td><span class="t-less-visible">${content.notes|n}</span></td>
107
+
108
+        <td>${content.type.label}</td>
100
     </tr>
109
     </tr>
101
 </%def>
110
 </%def>