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

Add feedback availability from basket + User icons

Browse Source
This commit is contained in:
Romain Neutron
2012-03-05 16:08:49 +01:00
parent d8ba8b954a
commit 1426b9a6f9
6 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Alchemy/Phrasea/Helper/User/Edit.php
View File

@@ -131,10 +131,7 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
sum(remain_dwnld) as remain_dwnld, sum(remain_dwnld) as remain_dwnld,
sum(month_dwnld_max) as month_dwnld_max, sum(month_dwnld_max) as month_dwnld_max,
mask_xor as maskxordec, sum(mask_and + mask_xor) as masks
bin(mask_xor) as maskxorbin,
mask_and as maskanddec,
bin(mask_and) as maskandbin
FROM (usr u, bas b, sbas s) FROM (usr u, bas b, sbas s)
LEFT JOIN (basusr bu) LEFT JOIN (basusr bu)
@@ -206,8 +203,6 @@ class Edit extends \Alchemy\Phrasea\Helper\Helper
{ {
$this->base_id = (int) $this->request->get('base_id'); $this->base_id = (int) $this->request->get('base_id');
// $this->base_id = (int) $parm['base_id'];
$sql = "SELECT u.usr_id, restrict_dwnld, remain_dwnld, month_dwnld_max $sql = "SELECT u.usr_id, restrict_dwnld, remain_dwnld, month_dwnld_max
FROM (usr u INNER JOIN basusr bu ON u.usr_id = bu.usr_id) FROM (usr u INNER JOIN basusr bu ON u.usr_id = bu.usr_id)
WHERE u.usr_id = " . implode(' OR u.usr_id = ', $this->users) . " WHERE u.usr_id = " . implode(' OR u.usr_id = ', $this->users) . "

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

@@ -377,19 +377,31 @@
</td> </td>
<td class="users_col case_right_quota"> <td class="users_col case_right_quota">
<div class="quota_trigger quota_{{rights['base_id']}}"> <div class="quota_trigger quota_{{rights['base_id']}}">
<img src="/skins/icons/buttoninfo2.gif" /> {% if rights['restrict_dwnld'] > 0 %}
<img src="/skins/icons/user_details_on.png" />
{% else %}
<img src="/skins/icons/user_details_off.png" />
{% endif %}
<input type="hidden" name="quota_base_id" value="{{rights['base_id']}}"/> <input type="hidden" name="quota_base_id" value="{{rights['base_id']}}"/>
</div> </div>
</td> </td>
<td class="users_col case_right_time"> <td class="users_col case_right_time">
<div class="time_trigger time_{{rights['base_id']}}"> <div class="time_trigger time_{{rights['base_id']}}">
<img src="/skins/icons/buttoninfo2.gif" /> {% if rights['time_limited'] > 0 %}
<img src="/skins/icons/user_details_on.png" />
{% else %}
<img src="/skins/icons/user_details_off.png" />
{% endif %}
<input type="hidden" name="time_base_id" value="{{rights['base_id']}}"/> <input type="hidden" name="time_base_id" value="{{rights['base_id']}}"/>
</div> </div>
</td> </td>
<td class="users_col case_right_masks"> <td class="users_col case_right_masks">
<div class="masks_trigger quotatime_{{rights['base_id']}}"> <div class="masks_trigger quotatime_{{rights['base_id']}}">
<img src="/skins/icons/buttoninfo2.gif" /> {% if rights['masks'] > 0 %}
<img src="/skins/icons/user_details_on.png" />
{% else %}
<img src="/skins/icons/user_details_off.png" />
{% endif %}
<input type="hidden" name="masks_base_id" value="{{rights['base_id']}}"/> <input type="hidden" name="masks_base_id" value="{{rights['base_id']}}"/>
</div> </div>
</td> </td>

3
templates/web/prod/Story/Create.html.twig
View File

@@ -10,9 +10,6 @@
<label>{% trans 'Story name' %}</label> <label>{% trans 'Story name' %}</label>
<input name="name" value="" type="text"/> <input name="name" value="" type="text"/>
<label>{% trans 'Story description' %}</label>
<textarea name="description"></textarea>
<label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label> <label for="add_sel">{% trans 'Ajouter ma selection courrante' %}</label>
<input type="checkbox" name="lst" value=""/> <input type="checkbox" name="lst" value=""/>

6
templates/web/prod/WorkZone/Basket.html.twig
View File

@@ -33,6 +33,12 @@
<img src="/skins/icons/push16.png"/> <img src="/skins/icons/push16.png"/>
</button> </button>
{% endif %} {% endif %}
{% if user.ACL().has_right('push') %}
<button class="ui-corner-all TOOL_feedback_btn basket_window" title="{% trans 'Feedback' %}">
<img src="/skins/icons/feedback16.png"/>
</button>
{% endif %}
{% if user.ACL().has_right('bas_chupub') %} {% if user.ACL().has_right('bas_chupub') %}
<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{% trans 'action : bridge' %}"> <button class="ui-corner-all TOOL_bridge_btn basket_window" title="{% trans 'action : bridge' %}">
<img src="/skins/icons/door.png"/> <img src="/skins/icons/door.png"/>

6
templates/web/prod/WorkZone/Story.html.twig
View File

@@ -32,6 +32,12 @@
<img src="/skins/icons/push16.png"/> <img src="/skins/icons/push16.png"/>
</button> </button>
{% endif %} {% endif %}
{% if user.ACL().has_right('push') %}
<button class="ui-corner-all TOOL_feedback_btn basket_window" title="{% trans 'Feedback' %}">
<img src="/skins/icons/feedback16.png"/>
</button>
{% endif %}
{% if user.ACL().has_right('bas_chupub') %} {% if user.ACL().has_right('bas_chupub') %}
<button class="ui-corner-all TOOL_bridge_btn story_window" title="{% trans 'action : bridge' %}"> <button class="ui-corner-all TOOL_bridge_btn story_window" title="{% trans 'action : bridge' %}">
<img src="/skins/icons/door.png"/> <img src="/skins/icons/door.png"/>

4
www/prod/page0.js
View File

@@ -2252,9 +2252,9 @@ function activeIcons()
} }
} }
} }
if(value !== '' || sstt_id !== '') if(value !== '' || sstt_id !== '' || story !== '')
{ {
feedbackThis(sstt_id, value); feedbackThis(sstt_id, value, story);
} }
else else
{ {