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

Update templates

Browse Source
This commit is contained in:
Romain Neutron
2012-07-23 12:00:35 +02:00
parent 9e15a33564
commit 63e554519c
31 changed files with 31 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Alchemy/Phrasea/Helper/Record/Edit.php
View File

@@ -283,7 +283,7 @@ class Edit extends RecordHelper
, 'h' => $thumbnail->get_height() , 'h' => $thumbnail->get_height()
); );
$_lst[$indice]['preview'] = $twig->render('common/preview.html', array('record' => $record)); $_lst[$indice]['preview'] = $twig->render('common/preview.html.twig', array('record' => $record));
$_lst[$indice]['type'] = $record->get_type(); $_lst[$indice]['type'] = $record->get_type();
} }

2
templates/web/common/dialog_export.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% macro print_ftp_form(datas) %} {% macro print_ftp_form(datas) %}
<div class="ftp_form ftp_form_{{datas.usr_id}}"> <div class="ftp_form ftp_form_{{datas.usr_id}}">

2
templates/web/common/preview.html.twig
View File

@@ -1,5 +1,5 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% if not_wrapped is defined and not_wrapped %} {% if not_wrapped is defined and not_wrapped %}
{% set wrap = false %} {% set wrap = false %}

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

@@ -1,6 +1,6 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}
{% block javascript %} {% block javascript %}

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

@@ -1,6 +1,6 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% block javascript %} {% block javascript %}
<script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script> <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>

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

@@ -1,6 +1,6 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}
{% block javascript %} {% block javascript %}

2
templates/web/lightbox/basket_content_report.twig
View File

@@ -1,5 +1,5 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div style="margin:0 7px;overflow:hidden;"> <div style="margin:0 7px;overflow:hidden;">
{% for basket_element in basket.getElements() %} {% for basket_element in basket.getElements() %}

2
templates/web/lightbox/feed.twig
View File

@@ -1,6 +1,6 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}
{% block javascript %} {% block javascript %}

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

@@ -1,6 +1,6 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% block javascript %} {% block javascript %}
<script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script> <script type="text/javascript" src="/include/jslibs/jquery-1.7.1.js"></script>

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

@@ -1,6 +1,6 @@
{% extends "common/index_bootstrap.html.twig" %} {% extends "common/index_bootstrap.html.twig" %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/caption_templates/preview.html.twig' as caption %} {% import 'common/caption_templates/preview.html.twig' as caption %}
{% block javascript %} {% block javascript %}

2
templates/web/overview.html.twig
View File

@@ -80,7 +80,7 @@
<div id="page"> <div id="page">
<h1>{{record.get_title()}}</h1> <h1>{{record.get_title()}}</h1>
<div class="preview enhancable"> <div class="preview enhancable">
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% set subdef = record.get_subdef(subdef_name) %} {% set subdef = record.get_subdef(subdef_name) %}
{{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', session, true) }} {{ thumbnail.format(subdef, subdef.get_width(), subdef.get_height(), '', session, true) }}

2
templates/web/prod/Baskets/Reorder.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div id="reorder_box" class="PNB" style="top:10px; overflow:auto; padding:10px;"> <div id="reorder_box" class="PNB" style="top:10px; overflow:auto; padding:10px;">
<div id="reorder_options" style="height:32px; margin-bottom:10px;"> <div id="reorder_options" style="height:32px; margin-bottom:10px;">
<span>{% trans 'Reordonner automatiquement' %}</span> <span>{% trans 'Reordonner automatiquement' %}</span>

2
templates/web/prod/Story/Reorder.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div id="reorder_options" class="PNB" style="height:30px;bottom:auto;"> <div id="reorder_options" class="PNB" style="height:30px;bottom:auto;">
<span>{% trans 'Reordonner automatiquement' %}</span> <span>{% trans 'Reordonner automatiquement' %}</span>
<select id="auto_order"> <select id="auto_order">

2
templates/web/prod/Tooltip/Basket.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% extends 'prod/Tooltip/Tooltip.html.twig'%} {% extends 'prod/Tooltip/Tooltip.html.twig'%}

2
templates/web/prod/Tooltip/Preview.html.twig
View File

@@ -5,5 +5,5 @@
{% set maxwidth = null %} {% set maxwidth = null %}
{% block content %} {% block content %}
{% include 'common/preview.html' %} {% include 'common/preview.html.twig' %}
{% endblock %} {% endblock %}

2
templates/web/prod/Tooltip/Story.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% extends 'prod/Tooltip/Tooltip.html.twig'%} {% extends 'prod/Tooltip/Tooltip.html.twig'%}

2
templates/web/prod/Tooltip/TechnicalDatas.html.twig
View File

@@ -5,5 +5,5 @@
{% set maxwidth = null %} {% set maxwidth = null %}
{% block content %} {% block content %}
{% include 'common/technical_datas.twig' %} {% include 'common/technical_datas.html.twig' %}
{% endblock %} {% endblock %}

2
templates/web/prod/WorkZone/Browser/Basket.html.twig
View File

@@ -94,7 +94,7 @@
{% set top = top + 40 %} {% set top = top + 40 %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="PNB" style="top:{{ top }}px;"> <div class="PNB" style="top:{{ top }}px;">

2
templates/web/prod/WorkZone/Browser/Results.html.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="PNB header"> <div class="PNB header">
<table> <table>

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

@@ -248,7 +248,7 @@
{% set box_height = (box_height + 20) %} {% set box_height = (box_height + 20) %}
{% endif %} {% endif %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div ondblclick="{% if wz_scope == 'groupings' %}openPreview('REG',{{ ord }},'{{container.get_sbas_id()}}_{{container.get_record_id()}}');{% else %}openPreview('BASK',{{ ord }},{{container.getId()}});{% endif %}" <div ondblclick="{% if wz_scope == 'groupings' %}openPreview('REG',{{ ord }},'{{container.get_sbas_id()}}_{{container.get_record_id()}}');{% else %}openPreview('BASK',{{ ord }},{{container.getId()}});{% endif %}"
class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;" class="CHIM diapo CHIM_{{record.get_serialize_key()}}" style="height:{{box_height}}px;"

2
templates/web/prod/actions/Bridge/Flickr/upload.twig
View File

@@ -1,5 +1,5 @@
{% extends "prod/actions/Bridge/wrapper.twig"%} {% extends "prod/actions/Bridge/wrapper.twig"%}
{% import "common/thumbnail.html" as thumb %} {% import "common/thumbnail.html.twig" as thumb %}
{% import "prod/actions/Bridge/macro_error_form.twig" as error_form %} {% import "prod/actions/Bridge/macro_error_form.twig" as error_form %}
{% block menu %} {% block menu %}

2
templates/web/prod/actions/Bridge/index.twig
View File

@@ -1,5 +1,5 @@
{% import "common/thumbnail.html" as thumb %} {% import "common/thumbnail.html.twig" as thumb %}
<div class="PNB" id='dialog_publicator'> <div class="PNB" id='dialog_publicator'>
<div id='publicator_selection' class="PNB10 ui-corner-all"> <div id='publicator_selection' class="PNB10 ui-corner-all">

2
templates/web/prod/actions/Bridge/records_list.twig
View File

@@ -1,5 +1,5 @@
{% extends "prod/actions/Bridge/wrapper.twig" %} {% extends "prod/actions/Bridge/wrapper.twig" %}
{% import "common/thumbnail.html" as thumb %} {% import "common/thumbnail.html.twig" as thumb %}

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

@@ -1,5 +1,5 @@
{% macro format_diapo(record, session) %} {% macro format_diapo(record, session) %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="diapo"> <div class="diapo">
{{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}} {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
</div> </div>

2
templates/web/prod/actions/publish/publish_edit.html
View File

@@ -1,6 +1,6 @@
{% macro format_diapo(record, session) %} {% macro format_diapo(record, session) %}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div class="diapo"> <div class="diapo">
{{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}} {{thumbnail.format(record.get_thumbnail(), 100, 100, '', session, true)}}
</div> </div>

2
templates/web/prod/orders/order_item.twig
View File

@@ -1,4 +1,4 @@
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
<div> <div>
<div> <div>

2
templates/web/prod/preview/caption.html
View File

@@ -18,4 +18,4 @@
{{caption.format_caption(record, highlight, searchEngine, business)}} {{caption.format_caption(record, highlight, searchEngine, business)}}
{% endif %} {% endif %}
<hr style="margin:10px 0;"/> <hr style="margin:10px 0;"/>
{% include 'common/technical_datas.twig' %} {% include 'common/technical_datas.html.twig' %}

2
templates/web/prod/results/record.html
View File

@@ -1,5 +1,5 @@
{% macro block(record, user, session, highlight, searchEngine, prefix, entry_id)%} {% macro block(record, user, session, highlight, searchEngine, prefix, entry_id)%}
{% import 'common/thumbnail.html' as thumbnail %} {% import 'common/thumbnail.html.twig' as thumbnail %}
{% import 'common/doctype_icons.html.twig' as doctype_icons %} {% import 'common/doctype_icons.html.twig' as doctype_icons %}
{% import 'common/drop_down_options.html.twig' as drop_down %} {% import 'common/drop_down_options.html.twig' as drop_down %}
{% set th_size = user.getPrefs('images_size')%} {% set th_size = user.getPrefs('images_size')%}

2
templates/web/prod/upload/lazaret.html.twig
View File

@@ -199,7 +199,7 @@
</script> </script>
{% macro lazaretElement(file) %} {% macro lazaretElement(file) %}
{% import "common/thumbnail.html" as thumb %} {% import "common/thumbnail.html.twig" as thumb %}
{% set records = file.getRecordsToSubstitute() %} {% set records = file.getRecordsToSubstitute() %}
<div class="lazaret-file span4"> <div class="lazaret-file span4">
<h5>{% trans "Last uploaded version" %}</h5> <h5>{% trans "Last uploaded version" %}</h5>

2
www/client/answer.php
View File

@@ -301,7 +301,7 @@ if (count($result->get_datas()) > 0) {
try { try {
$record->get_subdef('document'); $record->get_subdef('document');
$light_info = $twig->render('common/technical_datas.twig', array('record' => $record)); $light_info = $twig->render('common/technical_datas.html.twig', array('record' => $record));
} catch (\Exception $e) { } catch (\Exception $e) {
$light_info = ''; $light_info = '';
} }

2
www/client/clientFeedBack.php
View File

@@ -79,7 +79,7 @@ switch ($parm['action']) {
, 'searchEngine' => $search_engine , 'searchEngine' => $search_engine
) )
) )
, "html_preview" => $twig->render('common/preview.html', array('record' => $record) , "html_preview" => $twig->render('common/preview.html.twig', array('record' => $record)
) )
, "others" => $twig->render('prod/preview/appears_in.html', array( , "others" => $twig->render('prod/preview/appears_in.html', array(
'parents' => $record->get_grouping_parents(), 'parents' => $record->get_grouping_parents(),