Browse Source

fixed color and font awesome icons

Skylsmoi 7 years ago
parent
commit
6f2cdfbfb6
2 changed files with 20 additions and 20 deletions
  1. 8 8
      tracim/models/contents.py
  2. 12 12
      tracim/models/data.py

+ 8 - 8
tracim/models/contents.py View File

38
     slug='open',
38
     slug='open',
39
     global_status=GlobalStatus.OPEN.value,
39
     global_status=GlobalStatus.OPEN.value,
40
     label='Open',
40
     label='Open',
41
-    fa_icon='fa-square-o',
42
-    hexcolor='#000FF',
41
+    fa_icon='square-o',
42
+    hexcolor='#3f52e3',
43
 )
43
 )
44
 
44
 
45
 closed_validated_status = NewContentStatus(
45
 closed_validated_status = NewContentStatus(
46
     slug='closed-validated',
46
     slug='closed-validated',
47
     global_status=GlobalStatus.CLOSED.value,
47
     global_status=GlobalStatus.CLOSED.value,
48
     label='Validated',
48
     label='Validated',
49
-    fa_icon='fa-check-square-o',
50
-    hexcolor='#000FF',
49
+    fa_icon='check-square-o',
50
+    hexcolor='#008000',
51
 )
51
 )
52
 
52
 
53
 closed_unvalidated_status = NewContentStatus(
53
 closed_unvalidated_status = NewContentStatus(
54
     slug='closed-unvalidated',
54
     slug='closed-unvalidated',
55
     global_status=GlobalStatus.CLOSED.value,
55
     global_status=GlobalStatus.CLOSED.value,
56
     label='Cancelled',
56
     label='Cancelled',
57
-    fa_icon='fa-close',
58
-    hexcolor='#000FF',
57
+    fa_icon='close',
58
+    hexcolor='#f63434',
59
 )
59
 )
60
 
60
 
61
 closed_deprecated_status = NewContentStatus(
61
 closed_deprecated_status = NewContentStatus(
62
     slug='closed-deprecated',
62
     slug='closed-deprecated',
63
     global_status=GlobalStatus.CLOSED.value,
63
     global_status=GlobalStatus.CLOSED.value,
64
     label='Deprecated',
64
     label='Deprecated',
65
-    fa_icon='fa-warning',
66
-    hexcolor='#000FF',
65
+    fa_icon='warning',
66
+    hexcolor='#ababab',
67
 )
67
 )
68
 
68
 
69
 
69
 

+ 12 - 12
tracim/models/data.py View File

235
 
235
 
236
     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
236
     # TODO - G.M - 10-04-2018 - [Cleanup] Drop this
237
     _ICONS = {
237
     _ICONS = {
238
-        'archiving': 'fa fa-archive',
239
-        'content-comment': 'fa-comment-o',
240
-        'creation': 'fa-magic',
241
-        'deletion': 'fa-trash',
242
-        'edition': 'fa-edit',
243
-        'revision': 'fa-history',
244
-        'status-update': 'fa-random',
245
-        'unarchiving': 'fa-file-archive-o',
246
-        'undeletion': 'fa-trash-o',
247
-        'move': 'fa-arrows',
248
-        'copy': 'fa-files-o',
238
+        'archiving': 'archive',
239
+        'content-comment': 'comment-o',
240
+        'creation': 'magic',
241
+        'deletion': 'trash',
242
+        'edition': 'edit',
243
+        'revision': 'history',
244
+        'status-update': 'random',
245
+        'unarchiving': 'file-archive-o',
246
+        'undeletion': 'trash-o',
247
+        'move': 'arrows',
248
+        'copy': 'files-o',
249
     }
249
     }
250
     #
250
     #
251
     # _LABELS = {
251
     # _LABELS = {
1488
             delta_from_datetime = datetime.utcnow()
1488
             delta_from_datetime = datetime.utcnow()
1489
 
1489
 
1490
         delta = delta_from_datetime - self.created
1490
         delta = delta_from_datetime - self.created
1491
-        
1491
+
1492
         if delta.days > 0:
1492
         if delta.days > 0:
1493
             if delta.days >= 365:
1493
             if delta.days >= 365:
1494
                 aff = '%d year%s ago' % (delta.days/365, 's' if delta.days/365>=2 else '')
1494
                 aff = '%d year%s ago' % (delta.days/365, 's' if delta.days/365>=2 else '')