summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-15 16:41:27 +0100
committerÉtienne Loks <etienne.loks@iggdrasil.net>2016-11-15 16:41:27 +0100
commit7b186199a323da1a4a8dbf4fe7b966383d3fe5ae (patch)
tree558b6908b0d868fe4d2b4caf921ba5088e84b558
parent4442f3d426464d42b364ec36f20ac21b1b7d58d7 (diff)
downloadIshtar-7b186199a323da1a4a8dbf4fe7b966383d3fe5ae.tar.bz2
Ishtar-7b186199a323da1a4a8dbf4fe7b966383d3fe5ae.zip
Shortcut menu: put research archaeological files in blue (refs #3346)
-rw-r--r--archaeological_files/models.py4
-rw-r--r--ishtar_common/static/media/style.css13
2 files changed, 15 insertions, 2 deletions
diff --git a/archaeological_files/models.py b/archaeological_files/models.py
index 330fe019a..638b19d18 100644
--- a/archaeological_files/models.py
+++ b/archaeological_files/models.py
@@ -352,7 +352,9 @@ class File(ClosedItem, BaseHistorizedItem, OwnPerms, ValueGetter,
cache_key, val = get_cache(self.__class__, [self.pk,
'short_class_name'])
cls = 'normal'
- if not self.has_adminact and self.reception_date:
+ if not self.file_type.txt_idx == 'preventive':
+ cls = "blue"
+ elif not self.has_adminact and self.reception_date:
delta = datetime.date.today() - self.reception_date
cls = 'red'
if self.saisine_type and self.saisine_type.delay:
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css
index 00fed380d..b1939eaf0 100644
--- a/ishtar_common/static/media/style.css
+++ b/ishtar_common/static/media/style.css
@@ -60,6 +60,10 @@ a.add-button,
color:#000;
}
+#context_menu .blue {
+ color:#00a8ff;
+}
+
.chosen-container,
#context_menu .green,
#context_menu .red,
@@ -272,7 +276,9 @@ button.ui-widget-header:hover {
.chosen-container-single .chosen-single{
background: none;
background-color: #fff;
- border-radius:4px;
+ border-radius: 0;
+ box-shadow: none;
+ border: 1px solid #fff;
}
textarea,
@@ -847,6 +853,11 @@ ul.form .help_text{
.autocomplete{
width:350px;
+ font-size: 13px;
+}
+
+#current_items .autocomplete{
+ width:400px;
}
.delete td{