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

Refactor asket_adapter

Browse Source
This commit is contained in:
Romain Neutron
2011-12-28 20:04:39 +01:00
parent bfa8e851c6
commit 646db61ca7
39 changed files with 749 additions and 3623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
templates/web/lightbox/IE6/agreement_box.twig
View File

@@ -17,7 +17,7 @@
{{ basket.getValidation().getValidationString(user) }}
</div>
<ul style="margin:10px 0 0 20px;width:200px;">
{% for validation_data in basket_element.getValidationData() %}
{% for validation_data in basket_element.getValidationDatas() %}
{% if validation_data.getAgreement() == true %}
{% set classuser = 'agree' %}
{% elseif validation_data.getAgreement() == false %}
@@ -38,12 +38,12 @@
<table cellspacing="0" cellpadding="0" style="width:230px;">
<tr>
<td>
<div style="width:70px;margin:0px auto 0;" class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if basket_element.getValidationData().getParticipant(user).getAgreement() != true %}not_decided{% endif %}">
<div style="width:70px;margin:0px auto 0;" class="ui-corner-all big_box agree_{{basket_element.getId()}} agree {% if basket_element.getValidationDatas().getParticipant(user).getAgreement() != true %}not_decided{% endif %}">
<img src="/skins/lightbox/agree-bigie6.gif" style="vertical-align:middle;"/><span>{% trans 'validation:: OUI' %}</span>
</div>
</td>
<td>
<div style="width:70px;margin:0px auto;" class="ui-corner-all big_box disagree_{{basket_element.get_sselcont_id()}} disagree {% if basket_element.getValidationData().getParticipant(user).getAgreement() != false %}not_decided{% endif %}">
<div style="width:70px;margin:0px auto;" class="ui-corner-all big_box disagree_{{basket_element.getId()}} disagree {% if basket_element.getValidationDatas().getParticipant(user).getAgreement() != false %}not_decided{% endif %}">
<img src="/skins/lightbox/disagree-bigie6.gif" style="vertical-align:middle;"/><span>{% trans 'validation:: NON' %}</span>
</div>
</td>

28
templates/web/lightbox/IE6/feed.twig
View File

@@ -112,27 +112,19 @@
<td>
<select id="navigation">
<optgroup label="{% trans 'Validations'%}">
{% for key,baskets in baskets_collection.get_baskets() %}
{% if key == 'baskets' %}
{% for item in baskets %}
{% if item.is_valid() %}
<option {% if basket.get_ssel_id() == item.get_ssel_id() %} selected="selected" {% endif %}
value="{{item.get_ssel_id()}}">{{item.get_name()}}</option>
{% endif %}
{% endfor %}
{% endif %}
{% for item in baskets() %}
{% if item.getValidation() %}
<option {% if item.getId() == basket.getId() %} selected="selected" {% endif %}
value="{{basket.getId()}}">{{basket.getName()}}</option>
{% endif %}
{% endfor %}
</optgroup>
<optgroup label="{% trans 'Paniers'%}">
{% for key,baskets in baskets_collection.get_baskets() %}
{% if key == 'baskets' or key == 'recept' %}
{% for item in baskets %}
{% if item.is_valid() == false %}
<option {% if basket.get_ssel_id() == item.get_ssel_id() %} selected="selected" {% endif %}
value="{{item.get_ssel_id()}}">{{item.get_name()}}</option>
{% endif %}
{% endfor %}
{% endif %}
{% for item in baskets() %}
{% if item.getValidation() is empty %}
<option {% if item.getId() == basket.getId() %} selected="selected" {% endif %}
value="{{item.getId()}}">{{item.getName()}}</option>
{% endif %}
{% endfor %}
</optgroup>
</select>

2
templates/web/lightbox/IE6/index.twig
View File

@@ -30,7 +30,7 @@
</tr>
</thead>
<tbody>
{% for basket in baskets_collection.get_baskets() %}
{% for basket in baskets_collection %}
{% if basket.getValidation() %}
{% set basket_length = basket.getElements().count() %}
<tr>

20
templates/web/lightbox/sc_container.twig
View File

@@ -1,24 +1,24 @@
{% block basket %}
<div id="sc_container">
{% for element in basket.get_elements() %}
{% for element in basket.getElements() %}
<div class="basket_element_wrapper">
<a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{element.get_sselcont_id()}}/">
<div id="scid_{{element.get_sselcont_id()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.get_sselcont_id() == element.get_sselcont_id() %}selected{% endif %}">
<div class="display_id">{{element.get_record().get_number()}}</div>
{% if basket.is_valid() %}
<a href="/lightbox/ajax/LOAD_BASKET_ELEMENT/{{element.getId()}}/">
<div id="scid_{{element.getId()}}" class="basket_element ui-corner-all {% if basket_element and basket_element.getId() == element.getId() %}selected{% endif %}">
<div class="display_id">{{element.getRecord().get_number()}}</div>
{% if basket.getValidation() %}
<div class="agreement">
<img src="/skins/lightbox/agree.png"
class="agree_button {%if element.get_my_agreement() != 1 %}not_decided{%endif%} agree_{{element.get_sselcont_id()}}" />
class="agree_button {%if element.getUserValidationDatas(user) != true %}not_decided{%endif%} agree_{{element.getId()}}" />
<img src="/skins/lightbox/disagree.png"
class="disagree_button {%if element.get_my_agreement() != -1 %}not_decided{%endif%} disagree_{{element.get_sselcont_id()}}" />
class="disagree_button {%if element.getUserValidationDatas(user) != false %}not_decided{%endif%} disagree_{{element.getId()}}" />
</div>
{% endif %}
{{thumbnail.format(element.get_record().get_thumbnail,114,85, '', session, true)}}
{{thumbnail.format(element.getRecord().get_thumbnail,114,85, '', session, true)}}
<form name="download_form" class="download_form" style="display:none;">
<input type="hidden" name="basrec" value="{{element.get_record().get_serialize_key()}}"/>
<input type="hidden" name="basrec" value="{{element.getRecord().get_serialize_key()}}"/>
</form>
<div tooltipsrc="/prod/tooltip/preview/{{element.get_record().get_sbas_id()}}/{{element.get_record().get_record_id()}}/" class="previewTips"></div>
<div tooltipsrc="/prod/tooltip/preview/{{element.getRecord().get_sbas_id()}}/{{element.getRecord().get_record_id()}}/" class="previewTips"></div>
</div>
</a>
</div>

4
templates/web/lightbox/sc_note.twig
View File

@@ -18,12 +18,12 @@
{% endfor %}
<form>
<textarea>{{basket_element.get_my_note()}}</textarea>
<textarea>{{basket_element.getUserValidationDatas(user).getNote()}}</textarea>
<div class="buttons">
<button class="note_closer ui-corner-all">
{% trans 'boutton::fermer' %}
</button>
<button class="note_saver ui-corner-all" id="note_saver_{{basket_element.get_sselcont_id()}}">
<button class="note_saver ui-corner-all" id="note_saver_{{basket_element.getId()}}">
{% trans 'boutton::enregistrer' %}
</button>
</div>

4
templates/web/lightbox/validate.twig
View File

@@ -84,7 +84,7 @@
</div>
<div id="right_column" class="PNB">
<div class="right_column_title title15 unselectable">
{% if basket.is_valid() %}
{% if basket.getValidation() %}
<img class="collapsed" src="/skins/lightbox/collapsed.png"/>
<img class="expanded" src="/skins/lightbox/expanded.png"/>
{% endif %}
@@ -122,7 +122,7 @@
<td style="width:20px;">
</td>
<td style="width:310px;">
{% if basket.is_valid() %}
{% if basket.getValidation() %}
<img title="{% trans 'lightbox::recaptitulatif' %}" class="report" src="/skins/lightbox/retour.png"/>
{% endif %}
<select id="navigation">

14
templates/web/prod/WorkZone/Macros.twig
View File

@@ -238,7 +238,7 @@
</div>
{% for basket_element in basket.get_elements() %}
{% for basket_element in basket.getElements() %}
<span class="wrapCHIM_{{ basket_element.getRecord().get_serialize_key() }} valid">
<table style="width: 100%; min-width: 330px; display: inline-block;">
<tr>
@@ -247,21 +247,21 @@
</td>
<td style="width:100%;">
<table style=width:100%>
{% for choice in basket_element.get_choices() %}
{% for choice in basket_element.getValidationDatas()) %}
<tr>
<td> {{choice.usr_name}} </td>
<td> {{ choice.getParticipant().getUser().get_display_name() }} </td>
<td>
{% if choice.agreement == '1' %}
{% if choice.getAgreement() == true %}
<img style="cursor:help;" src='/skins/lightbox/agree.png' title="{% trans "L'utilisateur approuve ce document" %}" />
{% elseif choice.agreement == '-1' %}
{% elseif choice.getAgreement() == false %}
<img style="cursor:help;" src='/skins/lightbox/disagree.png' title="{% trans "L'utilisateur desapprouve ce document" %}" />
{% else %}
<img style="cursor:help;" src='/skins/icons/valid.png' title="{% trans "L'utilisateur n'a pas encore donne son avis sur ce document" %}" />
{% endif %}
</td>
<td style="width:25px;">
{% if choice.note != '' %}
<img style="cursor:help;" src='/skins/icons/file-edit.png' class="noteTips" title="{{choice.note|e|nl2br}}" />
{% if choice.getNote() != '' %}
<img style="cursor:help;" src='/skins/icons/file-edit.png' class="noteTips" title="{{choice.getNote()|nl2br}}" />
{% endif %}
</td>
</tr>

4
templates/web/prod/actions/publish/publish.html
View File

@@ -34,8 +34,8 @@
{% set title = '' %}
{% set desc = '' %}
{% if publishing.is_basket() %}
{% set title = publishing.get_original_basket().get_name() %}
{% set desc = publishing.get_original_basket().get_description() %}
{% set title = publishing.get_original_basket().getName() %}
{% set desc = publishing.get_original_basket().getDescription() %}
{% endif %}
<div><label for="feed_add_title">{% trans 'publication : titre' %}</label></div>
<div><input class="required_text" type="text" name="title" id="feed_add_title" value="{{title}}" /></div>

4
templates/web/prod/preview/basket_train.html
View File

@@ -1,6 +1,6 @@
<div id="PREVIEWCURRENTCONT" class="PNB10">
<ul>
{% for child in record.get_container().get_elements() %}
{% for child in record.get_container().getElements() %}
{% set thumbnail = child.get_record().get_thumbnail() %}
{% if thumbnail.is_paysage() %}
@@ -23,7 +23,7 @@
{% endif %}
<li class="{{class}} prevTrainCurrent">
<img {{tooltip|raw}} jsargs="BASK|{{child.get_order()}}|{{record.get_container().get_ssel_id()}}"
<img {{tooltip|raw}} jsargs="BASK|{{child.get_order()}}|{{record.get_container().getId()}}"
class="openPreview prevRegToolTip" return(false);" src="{{thumbnail.get_url()}}"
style="{{style}}margin:7px;position:relative;"/></li>
{% endfor %}