Fix #1374 Enhance logo choice for statusbit

This commit is contained in:
Nicolas Le Goff
2013-07-30 20:15:55 +02:00
committed by Romain Neutron
parent eb8eb4f06a
commit ca57a3848b
2 changed files with 19 additions and 9 deletions

View File

@@ -8,7 +8,7 @@
{% endblock %}
{% block stylesheet %}
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-treeview/jquery.treeview.css,include/jslibs/jquery.contextmenu.css,skins/common/main.css,skins/admin/css/Main.css,skins/admin/css/Bases.css,skins/admin/css/Tables.css,skins/admin/css/fields.css,skins/geonames/geonames.css' }) }}" />
<link type="text/css" rel="stylesheet" href="{{ path('minifier', { 'f' : 'include/jslibs/jquery-treeview/jquery.treeview.css,include/jslibs/jquery.contextmenu.css,skins/common/main.css,skins/admin/css/Main.css,skins/admin/css/Bases.css,skins/admin/css/Tables.css,skins/admin/css/fields.css,skins/geonames/geonames.css,assets/jquery-file-upload/css/jquery.fileupload-ui.css' }) }}" />
{% endblock %}

View File

@@ -44,13 +44,18 @@
{% endfor %}
</div>
</div>
<br />
<div class="row-fluid">
<label class="control-label" for="image_off">
{% trans'admin::status: symboliser par'%}
{% trans %}Symbolized by{% endtrans %}
</label>
<div class="controls">
<input type="file" name="image_off" accept="image/*"/>
<div class='thumbnail' style='height:20px;width:20px'>
<div class="controls clearfix">
<span class="btn btn-success fileinput-button pull-left">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<input type="file" name="image_off" accept="image/*"/>
</span>
<div class='thumbnail pull-left' style='height:20px;width:20px;margin-left:10px;'>
{% if status['img_off'] is defined and status['img_off'] %}
<img src="{{ status['img_off'] }}" />
{% endif %}
@@ -103,13 +108,18 @@
{% endfor %}
</div>
</div>
<br />
<div class="row-fluid">
<label class="control-label" for="image_on">
{% trans'admin::status: symboliser par'%}
{% trans %}Symbolized by{% endtrans %}
</label>
<div class="controls">
<input type="file" name="image_on" accept="image/*"/>
<div class='thumbnail' style='height:20px;width:20px'>
<div class="controls clearfix">
<span class="btn btn-success fileinput-button pull-left">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<input type="file" name="image_on" accept="image/*"/>
</span>
<div class='thumbnail pull-left' style='height:20px;width:20px;margin-left:10px'>
{% if status['img_on'] is defined and status['img_on'] %}
<img src="{{ status['img_on'] }}" />
{% endif %}