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 3.5.7

Browse Source
This commit is contained in:
Romain Neutron
2012-01-03 15:26:07 +01:00
parent 60588e4c69 b6899e6d3f
commit af9330b17e
28 changed files with 43087 additions and 42105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
templates/web/admin/editusers.twig
View File

@@ -106,35 +106,55 @@
</script>
<div>
<div class="tabs PNB10" style="bottom:40px;">
<div class="tabs PNB" style="bottom:40px;">
<ul>
<li>
<a href="#rights_tab">Droits</a>
<a href="#rights_tab">{% trans 'Rights' %}</a>
</li>
{% if main_user is not empty and main_user.is_template is empty %}
{% if main_user is not empty and main_user.is_template is empty and main_user.is_special is empty %}
<li>
<a href="#user_infos_tab">Fiche</a>
<a href="#user_infos_tab">{% trans 'Infos' %}</a>
</li>
{% endif %}
</ul>
<div id="rights_tab" class="PNB" style="top:40px;">
<div class="PNB10" style="height:30px;bottom:auto;">
<h1>
{% if main_user is not empty %}
{% set display_name = main_user.get_display_name() %}
{% trans %}
Edition des droits de {{ display_name }}
{% endtrans %}
{% else %}
{% set number = users|length %}
{% trans %}
Edition des droits de {{ number }} utilisateurs
{% endtrans %}
{% endif %}
</h1>
</div>
<form id="users_rights_form" method="post" action="/admin/users/rights/apply/">
<input type="hidden" name="users" value="{{users_serial}}"/>
<table style="width:100%;" cellspacing="0" cellpadding="0" border="0">
<tr>
<td>
{% if main_user is not empty %}
{% if main_user.is_special is not empty %}
{% if main_user.get_login() == 'invite' %}
{% trans 'Reglages:: reglages d acces guest' %}
{% elseif main_user.get_login() == 'autoregister' %}
{% trans 'Reglages:: reglages d inscitpition automatisee' %}
{% endif %}
{% else %}
{% set display_name = main_user.get_display_name() %}
{% trans %}
Edition des droits de {{ display_name }}
{% endtrans %}
{% endif %}
{% else %}
{% set number = users|length %}
{% trans %}
Edition des droits de {{ number }} utilisateurs
{% endtrans %}
{% endif %}
</td>
<td style="text-align:right;">
{% trans 'Apply a template' %}
<select name="template">
<option value="">{% trans 'boutton::choisir' %}</option>
{% for template in templates %}
<option value="{{ template.get_id() }}">{{ template.get_display_name() }}</option>
{% endfor %}
</select>
</td>
</tr>
</table>
<table cellspacing="0" cellpadding="0" border="0" style="table-layout: auto;width:820px;height:67px;bottom:auto;top:50px;" class="PNB10">
<thead>
<tr>
@@ -402,7 +422,7 @@
</form>
</div>
{% if main_user is not empty and main_user.is_template is empty %}
{% if main_user is not empty and main_user.is_template is empty and main_user.is_special is empty %}
<div id="user_infos_tab" class="PNB" style="top:40px;">
<form id="user_infos_form">
<table>
@@ -521,6 +541,7 @@
{% endif %}
</div>
<div class="PNB10" style="top:auto;height:20px;">
<button class="users_rights_valid">{% trans 'boutton::valider' %}</button>
<button class="users_rights_valid">{% trans 'boutton::valider' %}</button>
<a href="/admin/users/search/" class="users_rights_cancel">{% trans 'boutton::retour' %}</a>
</div>
</div>

7
templates/web/admin/users.html
View File

@@ -34,6 +34,13 @@
</span>
</a>
<input type="hidden" value="{{invite_user.get_id()}}" name="invite_user_id"/>
<a class="autoregister_modifier" href="#">
<span>
{% trans 'Reglages:: reglages d inscitpition automatisee' %}
</span>
</a>
<input type="hidden" value="{{autoregister_user.get_id()}}" name="autoregister_user_id"/>
</p>
<form id="users_page_search" method="post" action="/admin/users/search/" target="_self">
<p class="admin_head_opts">

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

@@ -620,9 +620,7 @@
<button class="default_action">
<img src="/skins/icons/ccoch0.gif"/>&nbsp;
</button>
<button class="trigger">
oui
</button>
<button class="trigger">{% trans 'Select' %}</button>
</span>
<div class="submenu">
<button class="answer_selector all_selector">
@@ -651,7 +649,7 @@
<button class="default_action TOOL_disktt_btn results_window">
<img src="/skins/prod/000000/images/disktt_history.gif"/> {% trans 'action : exporter' %}
</button>
<button class="trigger">Select an action</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu">
<button class="TOOL_print_btn results_window">
@@ -692,7 +690,7 @@
</button>
{% endif %}
{% endfor %}
<button class="trigger">Operations</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu" >
{% for action in actions %}
@@ -721,7 +719,7 @@
<img src="/skins/prod/000000/images/pushdoc_history.gif"/>
{% trans 'action : push' %}
</button>
<button class="trigger">Select an action</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu">
<button class="TOOL_bridge_btn results_window">
@@ -748,7 +746,7 @@
<img src="/skins/icons/door.png"/>
{% trans 'action : bridge' %}
</button>
<button class="trigger">Select an action</button>
<button class="trigger">{% trans 'Select an action' %}</button>
</span>
<div class="submenu">
<button class="TOOL_publish_btn results_window">