diff options
author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-11 19:51:38 +0200 |
---|---|---|
committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-11 19:51:38 +0200 |
commit | 88ee16e9ae56b8b2b58e37c2925ad96a177115cc (patch) | |
tree | a75d7056dedd0aef80f4bd6401e4360c1e49255b | |
parent | 89a89e9c1dcc072d2d435d57d4eb1761b94099c7 (diff) | |
download | Ishtar-88ee16e9ae56b8b2b58e37c2925ad96a177115cc.tar.bz2 Ishtar-88ee16e9ae56b8b2b58e37c2925ad96a177115cc.zip |
Warning icon in context menu
-rw-r--r-- | ishtar_common/static/media/style.css | 4 | ||||
-rw-r--r-- | ishtar_common/templates/base.html | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/ishtar_common/static/media/style.css b/ishtar_common/static/media/style.css index 51b9de79d..8916dce0b 100644 --- a/ishtar_common/static/media/style.css +++ b/ishtar_common/static/media/style.css @@ -47,6 +47,10 @@ a.add-button, #context_menu .normal{ color:#000; } + +#context_menu .green, +#context_menu .red, +#context_menu .orange, #context_menu .basket{ font-family: 'FontAwesome', Arial, Helvetica, sans-serif; } diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index b325be2fb..8fd563baa 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -76,7 +76,7 @@ <td> <select class='{{main_cls}}' id='current_{{model_name}}'> <option class='normal' value=''>--</option> - {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{% endif %}>{% ifequal cls 'basket' %} {% endifequal %}{{label}}</option> + {% for val, label, selected, cls in items %}<option{% if cls %} class='{{cls}}'{% endif %} value='{{val}}'{% if selected %} selected="selected"{% endif %}>{% ifequal cls 'basket' %} {% endifequal %}{% ifequal cls 'green' %} {% endifequal %}{% ifequal cls 'orange' %} {% endifequal %}{% ifequal cls 'red' %} {% endifequal %}{{label}}</option> {% endfor %}</select> </td>{% with 'show-'|add:model_name as model_url%} <td><a href='#' onclick='load_current_window("{% url model_url 0 %}", "{{model_name}}");' class='display_details'><i class="fa fa-info-circle" aria-hidden="true"></i></a></td> |