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

adressed @romainneutron's comments

Browse Source
This commit is contained in:
Nicolas Le Goff
2013-08-05 15:56:03 +02:00
parent 4c59c755ff
commit b8144fea91
5 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
templates/web/admin/collection/collection.html.twig
View File

@@ -156,7 +156,7 @@
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_logo', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newLogo" type="file" accept="image/*" />
</span>
</form>
@@ -181,7 +181,7 @@
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_watermark', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newWm" type="file" accept="image/*" />
</span>
</form>
@@ -206,7 +206,7 @@
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_stamp', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newStamp" type="file" accept="image/*" />
</span>
</form>
@@ -231,7 +231,7 @@
<form class="fileupload no-ajax" enctype="multipart/form-data" method="post" action="{{ path('admin_collection_submit_banner', { 'bas_id' : bas_id }) }}" style="margin:0;">
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<span>{% trans %}Select files...{% endtrans %}</span>
<input name="newBanner" type="file" accept="image/*" />
</span>
</form>
@@ -309,7 +309,6 @@
},
success: function(datas) {
if(datas.success) {
alert(datas.msg);
if(submitLink.hasClass('reload')) {
reloadTree('base:{{ collection.get_sbas_id() }}', true);
} else if(submitLink.hasClass('reload-tree')) {

1
templates/web/admin/databox/databox.html.twig
View File

@@ -350,7 +350,6 @@
},
success: function(datas) {
if(datas.success) {
alert(datas.msg);
if(submitLink.hasClass('reload')) {
reloadTree('base:{{ databox.get_sbas_id() }}', true);
} else if(submitLink.hasClass('reload-tree')) {

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

@@ -52,7 +52,7 @@
<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>
<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;'>
@@ -116,7 +116,7 @@
<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>
<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'>

2
templates/web/admin/user/import/file.html.twig
View File

@@ -40,7 +40,7 @@
</div>
<span class="btn btn-success fileinput-button">
<i class="icon-plus icon-white"></i>
<span>{% trans %}Select files{% endtrans %}...</span>
<span>{% trans %}Select files...{% endtrans %}</span>
<input id="fileupload" type="file" name="files" data-url="/admin/users/import/file/" accept="text/csv, text/rtf">
</span>
<a href="{{ path('admin_users_search') }}" class="btn ajax">{% trans 'boutton::retour' %}</a>

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

@@ -136,7 +136,7 @@
{{usr.get_login()}}
</td>
<td>
{{usr.get_firstname()}} {{usr.get_lastname()}}
{{usr.get_firstname()}} {{usr.get_lastname()}}
</td>
<td>
{{usr.get_company()}}