hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 10:23:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1374 Enhance logo choice for statusbit

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

2
templates/web/admin/index.html.twig
View File

@@ -8,7 +8,7 @@
{% endblock %} {% endblock %}
{% block stylesheet %} {% 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 %} {% endblock %}

26
templates/web/admin/statusbit/edit.html.twig
View File

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