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

Merge with master

Browse Source
This commit is contained in:
Romain Neutron
2012-01-06 13:30:56 +01:00
parent f7e301abf7 66f7efa392
commit 64ce815e81
6 changed files with 87 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
templates/web/prod/actions/edit_default.twig
View File

@@ -153,7 +153,7 @@
<div id="divS_wrapper" style="width:{{user.getPrefs('editing_right_box')}}">
<div id="divS">
{{_self.HTML_fieldlist(edit, user)}}
</div>
</div>
</div>
@@ -360,7 +360,7 @@
<br/>
<br>
<b>
<h4>{% trans 'prod::editing:indexation en cours' %}<f/h4>
<h4>{% trans 'prod::editing:indexation en cours' %}</h4>
</b>
<span id='saveeditPbarI'></span> / <span id='saveeditPbarN'></span>
<br/><br/><br/>

5
templates/web/prod/index.html
View File

@@ -1135,6 +1135,11 @@
<div id="modal_feed" title="{% trans 'action : publier' %}" style="display:none;">
</div>
<form id="push_form" style="display:none;" method="post" target="download" action="/prod/pushdoc.php">
<input name="lst" value=""/>
<input name="ACT" value="LOAD"/>
<input name="SSTTID" value="LOAD"/>
</form>
<div id="dialog_dwnl" title="{% trans 'action : exporter' %}" style="display:none;"></div>
<div title="{% trans 'Re-ordonner' %}" id="reorder_dialog" style="position:relative;overflow:hidden;">