diff options
| author | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-07 20:36:40 +0200 |
|---|---|---|
| committer | Étienne Loks <etienne.loks@iggdrasil.net> | 2016-07-07 20:36:40 +0200 |
| commit | c3db809cebde54a3b96960334471d392d16710cf (patch) | |
| tree | a7362048d8a53b683fc19c1208374d363f4d85b2 /ishtar_common/templates/base.html | |
| parent | 131a0ff3b009a879ebc0119396b8ee5e8e38a807 (diff) | |
| parent | f0481117c66e4151eeee5fa53fbe43e0d59fd50c (diff) | |
| download | Ishtar-c3db809cebde54a3b96960334471d392d16710cf.tar.bz2 Ishtar-c3db809cebde54a3b96960334471d392d16710cf.zip | |
Merge branch 'master' into master-WIP-treatments
Diffstat (limited to 'ishtar_common/templates/base.html')
| -rw-r--r-- | ishtar_common/templates/base.html | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/ishtar_common/templates/base.html b/ishtar_common/templates/base.html index 8cd3c7793..b325be2fb 100644 --- a/ishtar_common/templates/base.html +++ b/ishtar_common/templates/base.html @@ -20,6 +20,7 @@ <script language="javascript" type="text/javascript" src="{{STATIC_URL}}js/grid.tbltogrid.js"></script> <script language="javascript" type="text/javascript" src="{{STATIC_URL}}/js/ishtar.js"></script> <link type="text/css" href="{{JQUERY_UI_URL}}jquery-ui.css" rel="stylesheet" /> + <link rel="stylesheet" href="{{STATIC_URL}}/font-awesome/css/font-awesome.min.css" /> <link rel="stylesheet" href="{{STATIC_URL}}/js/prettyPhoto/css/prettyPhoto.css" /> <link rel="stylesheet" href="{{STATIC_URL}}media/ui.jqgrid.css" /> <link rel="stylesheet" href="{{STATIC_URL}}/media/style.css" /> @@ -54,10 +55,10 @@ {% endblock %} </div> <div class="nav-button ui-state-default ui-corner-all" id="to_bottom_arrow"> - <span class="ui-icon ui-icon-circle-arrow-s"></span> + <i class="fa fa-arrow-circle-down" aria-hidden="true"></i> </div> <div class="nav-button ui-state-default ui-corner-all" id="to_top_arrow"> - <span class="ui-icon ui-icon-circle-arrow-n"></span> + <i class="fa fa-arrow-circle-up" aria-hidden="true"></i> </div> <div id="window"></div> <div id="logo"> @@ -75,10 +76,10 @@ <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%}>{{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 %}{{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'>{% trans "Details" %}</a></td> + <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> {% endwith %} </tr> {% endfor %} |