resolve conflict

This commit is contained in:
Mike Ng
2018-01-08 15:57:13 +04:00
parent bddc3781ba
commit 30f49bdd35
27 changed files with 564 additions and 467 deletions

View File

@@ -16,16 +16,16 @@
<script type="text/javascript" src="/assets/vendors/jquery-ui/jquery-ui{% if not app.debug %}.min{% endif %}.js"></script>
<script type="text/javascript" src="/assets/vendors/jquery-test-paths/jquery.test-paths{% if not app.debug %}.min{% endif %}.js"></script>#}
<script type="text/javascript">
$(document).ready(function(){
$(document).ready(function () {
$('.path_testable').path_file_test();
$('.url_testable').url_test();
$('.tabs').tabs({
beforeActivate:function(event, ui){
beforeActivate: function (event, ui) {
$('.path_testable:visible, .url_testable:visible').trigger('keyup');
}
});
$(".toggle").on("click", function() {
$(".toggle").on("click", function () {
var box = $(this).data("toggle");
$(box).toggle("500");
});
@@ -40,101 +40,100 @@
function fillCheckbox(section, name, defType, fieldname, values) {
$("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"][]']").each(function(){
$("[name='" + section + "_" + name + "_" + defType + "[" + fieldname + "][]']").each(function () {
$(this).removeAttr("checked");
for(var key in values){
if($(this).val() == values[key])
for (var key in values) {
if ($(this).val() == values[key])
$(this).prop("checked", "true");
}
});
}
function fillRadio(section, name, defType, fieldname, value) {
$("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"]'][value='"+value+"']").prop( "checked", true );
$("[name='" + section + "_" + name + "_" + defType + "[" + fieldname + "]'][value='" + value + "']").prop("checked", true);
}
function fillSelect(section, name, defType, fieldname, value) {
$("[name='"+section+"_"+name+"_"+defType+"["+fieldname+"]']").val(value)
$("[name='" + section + "_" + name + "_" + defType + "[" + fieldname + "]']").val(value)
}
function fillSlide(section, name, defType, fieldname, value) {
$("#slider"+section+name+defType+fieldname).slider({value:value});
$("#slidervalue"+section+name+defType+fieldname).val(value);
$("#slider" + section + name + defType + fieldname).slider({value: value});
$("#slidervalue" + section + name + defType + fieldname).val(value);
}
function populate_values(section, name) {
var config = JSON.parse('{{ config |json_encode|raw }}'),
i = 0,
defType = $('[name="'+section+'_'+name+'_mediatype"]').val(),
preset = $('[name="'+section+'_'+name+'_presets"]').val(),
optionValue = $('[name="'+section+'_'+name+'_presets"] option:selected').attr("value");
i = 0,
defType = $('[name="' + section + '_' + name + '_mediatype"]').val(),
preset = $('[name="' + section + '_' + name + '_presets"]').val(),
optionValue = $('[name="' + section + '_' + name + '_presets"] option:selected').attr("value");
if(typeof optionValue === 'undefined'){
if (typeof optionValue === 'undefined') {
return;
}
for (var input in config[defType].form) {
if(config[defType].form[input] == "slide"){
if (config[defType].form[input] == "slide") {
fillSlide(section, name, defType, input, config[defType].definitions[preset][input]);
}
if(config[defType].form[input] == "radio"){
if (config[defType].form[input] == "radio") {
fillRadio(section, name, defType, input, config[defType].definitions[preset][input]);
}
if(config[defType].form[input] == "select"){
if (config[defType].form[input] == "select") {
fillSelect(section, name, defType, input, config[defType].definitions[preset][input]);
}
if(config[defType].form[input] == "checkbox"){
if (config[defType].form[input] == "checkbox") {
fillCheckbox(section, name, defType, input, config[defType].definitions[preset][input]);
}
i++;
}
}
function select_mediatype(type, name, selector)
{
function select_mediatype(type, name, selector) {
var config = JSON.parse('{{ config |json_encode|raw }}'),
inputPresets = '[name="'+type+'_'+name+'_presets"]',
defType = $(selector).val();
inputPresets = '[name="' + type + '_' + name + '_presets"]',
defType = $(selector).val();
$('.'+type+name).hide();
$('.' + type + name).hide();
$('[data-toggle^="#box'+type+name+'"]').hide();
$('[data-toggle="#box'+type+name+defType+'"]').show();
$('[data-toggle^="#box' + type + name + '"]').hide();
$('[data-toggle="#box' + type + name + defType + '"]').show();
$('#box'+type+name+$(selector).val()).show();
$('#box' + type + name + $(selector).val()).show();
if(defType == 'flexpaper'){
if (defType == 'flexpaper') {
$(inputPresets).closest("tr").hide();
return;
}else{
} else {
$(inputPresets).closest("tr").show();
}
$(inputPresets)
.find('option')
.remove()
.end()
.append($("<option value='custom'></option>").text('{{ 'Custom' | trans }}'));
.find('option')
.remove()
.end()
.append($("<option value='custom'></option>").text('{{ 'Custom' | trans }}'));
if(typeof config[defType] === 'undefined'){
if (typeof config[defType] === 'undefined') {
return;
}
for (var key in config[defType].definitions) {
if (config[defType].definitions[key] == null){
if (config[defType].definitions[key] == null) {
$(inputPresets).append($("<option></option>")
.attr("disabled", "disabled")
.text(key)
.attr("disabled", "disabled")
.text(key)
);
}else{
} else {
$(inputPresets).append($("<option></option>")
.attr("value", key)
.text(key)
.attr("value", key)
.text(key)
);
}
}
@@ -142,74 +141,75 @@
function subview_type(selector) {
var mapping = JSON.parse('{{ subviews_mapping |json_encode|raw }}'),
subviewType = $(selector).val();
subviewType = $(selector).val();
$("#mediaType")
.find('option')
.remove()
.end()
.append($("<option></option>").text('{{ 'Choisir' | trans }}'));
.find('option')
.remove()
.end()
.append($("<option></option>").text('{{ 'Choisir' | trans }}'));
for (var key in mapping[subviewType]) {
$("#mediaType").append($('<option></option>')
.attr("value", mapping[subviewType][key])
.text(mapping[subviewType][key])
.attr("value", mapping[subviewType][key])
.text(mapping[subviewType][key])
);
}
}
function media_type(selector){
function media_type(selector) {
var config = JSON.parse('{{ config |json_encode|raw }}'),
defType = $(selector).val();
defType = $(selector).val();
$("#presets")
.find('option')
.remove()
.end()
.append($("<option></option>").text('{{ 'Choisir' | trans }}'));
.find('option')
.remove()
.end()
.append($("<option></option>").text('{{ 'Choisir' | trans }}'));
if(typeof config[defType] === 'undefined'){
if (typeof config[defType] === 'undefined') {
return;
}
for (var key in config[defType].definitions) {
if (config[defType].definitions[key] == null){
if (config[defType].definitions[key] == null) {
$("#presets").append($("<option></option>")
.attr("disabled", "disabled")
.text(key)
.attr("disabled", "disabled")
.text(key)
);
}else{
} else {
$("#presets").append($('<option></option>')
.attr("value", key)
.text(key)
.attr("value", key)
.text(key)
);
}
}
}
$(function() {
$(function () {
// a workaround for a flaw in the demo system (http://dev.jqueryui.com/ticket/4375), ignore!
$( "#dialog:ui-dialog" ).dialog( "destroy" );
$("#dialog:ui-dialog").dialog("destroy");
var name = $( "#name" ), accessclass = $( "#accessclass" ), subviewType =$( "#subviewType" ) , mediaType = $( "#mediaType" ), presets = $( "#presets" ),
allFields = $( [] ).add( name ).add(accessclass).add(subviewType).add(mediaType).add(presets),
tips = $( ".validateTips" );
var name = $("#name"), accessclass = $("#accessclass"), subviewType = $("#subviewType"),
mediaType = $("#mediaType"), presets = $("#presets"),
allFields = $([]).add(name).add(accessclass).add(subviewType).add(mediaType).add(presets),
tips = $(".validateTips");
function updateTips( t ) {
function updateTips(t) {
tips
.text( t )
.addClass( "ui-state-highlight" );
setTimeout(function() {
tips.removeClass( "ui-state-highlight", 1500 );
}, 500 );
.text(t)
.addClass("ui-state-highlight");
setTimeout(function () {
tips.removeClass("ui-state-highlight", 1500);
}, 500);
}
function checkLength( o, n, min, max ) {
if ( o.val().length > max || o.val().length < min ) {
o.addClass( "ui-state-error" );
updateTips( "Length of " + n + " must be between " +
min + " and " + max + "." );
function checkLength(o, n, min, max) {
if (o.val().length > max || o.val().length < min) {
o.addClass("ui-state-error");
updateTips("Length of " + n + " must be between " +
min + " and " + max + ".");
return false;
} else {
@@ -217,12 +217,12 @@
}
}
function checkPresence( mediaType, o ) {
function checkPresence(mediaType, o) {
var el = $('input[name="subdefs[]"][value="'+mediaType+'_'+o.val()+'"]');
if ( el.length !== 0 ) {
o.addClass( "ui-state-error" );
updateTips( "SubdefName should be unique per group" );
var el = $('input[name="subdefs[]"][value="' + mediaType + '_' + o.val() + '"]');
if (el.length !== 0) {
o.addClass("ui-state-error");
updateTips("SubdefName should be unique per group");
return false;
} else {
@@ -230,84 +230,81 @@
}
}
function checkSpecialChar( o )
{
function checkSpecialChar(o) {
var ok = true;
var reg = new RegExp("[A-Za-z0-9-]+","g");
var reg = new RegExp("[A-Za-z0-9-]+", "g");
if(o.val().match(reg)[0].length !== o.val().length)
{
if (o.val().match(reg)[0].length !== o.val().length) {
ok = false;
o.addClass( "ui-state-error" );
updateTips( "Special characters (except minus) or espaces are not authorized" );
o.addClass("ui-state-error");
updateTips("Special characters (except minus) or espaces are not authorized");
}
return ok;
}
$( "#dialog-form" ).dialog({
$("#dialog-form").dialog({
autoOpen: false,
height: 420,
width: 300,
modal: true,
buttons: {
"Create a Subdef": function() {
"Create a Subdef": function () {
var bValid = true;
allFields.removeClass( "ui-state-error" );
allFields.removeClass("ui-state-error");
bValid = bValid && checkLength( name, "subdef name", 3, 16 );
bValid = bValid && checkSpecialChar( name );
bValid = bValid && checkPresence( subviewType.val(), name );
bValid = bValid && checkLength(name, "subdef name", 3, 16);
bValid = bValid && checkSpecialChar(name);
bValid = bValid && checkPresence(subviewType.val(), name);
if ( bValid ) {
if (bValid) {
$('input[name="add_subdef[group]"]').val(subviewType.val());
$('input[name="add_subdef[name]"]').val(name.val());
$('input[name="add_subdef[mediaType]"]').val(mediaType.val());
$('input[name="add_subdef[class]"]').val(accessclass.val());
$('input[name="add_subdef[presets]"]').val(presets.val());
$( this ).dialog( "close" );
$(this).dialog("close");
$('form.subdefs').submit();
}
},
Cancel: function() {
$( this ).dialog( "close" );
Cancel: function () {
$(this).dialog("close");
}
},
close: function() {
allFields.val( "" ).removeClass( "ui-state-error" );
close: function () {
allFields.val("").removeClass("ui-state-error");
}
});
$( "#create-subdef" )
$("#create-subdef")
// .button()
.click(function() {
$( "#dialog-form" ).dialog( "open" );
});
.click(function () {
$("#dialog-form").dialog("open");
});
$('.subdef_deleter')
// .button()
.click(function(){
delete_subdef($(this).next('input[name="subdef"]').val());
.click(function () {
delete_subdef($(this).next('input[name="subdef"]').val());
return false;
});
return false;
});
function delete_subdef(name)
{
$( "#dialog-delete-subdef" ).dialog({
function delete_subdef(name) {
$("#dialog-delete-subdef").dialog({
resizable: false,
height:140,
height: 140,
modal: true,
buttons: {
"Delete subdef": function() {
"Delete subdef": function () {
$('#delete_subdef').val(name);
$( this ).dialog( "destroy" );
$(this).dialog("destroy");
$('form.subdefs').submit();
},
Cancel: function() {
$( this ).dialog( "destroy" );
Cancel: function () {
$(this).dialog("destroy");
}
}
});
@@ -363,44 +360,56 @@
</form>
</div>
<form method="post" action="{{ path('admin_subdefs_subdef_update', { 'sbas_id' : databox.get_sbas_id }) }}" target="_self" class="subdefs">
<form method="post" action="{{ path('admin_subdefs_subdef_update', { 'sbas_id' : databox.get_sbas_id }) }}"
target="_self" class="subdefs">
<div class="tabs">
<ul>
{% for subdefgroup, subdeflist in subdefs %}
<li><a class="no-ajax" href="#{{subdefgroup}}">{{subdefgroup}}</a></li>
<li><a class="no-ajax" href="#{{ subdefgroup }}">{{ subdefgroup }}</a></li>
{% endfor %}
</ul>
<button type="submit" disabled="disabled" class="btn btn-primary subviews-submit">{{ 'boutton::valider' | trans }}</button>
<button type="submit" disabled="disabled"
class="btn btn-primary subviews-submit">{{ 'boutton::valider' | trans }}</button>
{% for subdefgroup, subdeflist in subdefs %}
<div id="{{subdefgroup}}">
<div id="{{ subdefgroup }}">
{% for subdefname , subdef in subdeflist %}
<div>
<input type="hidden" name="subdefs[]" value="{{subdefgroup}}_{{subdefname}}"/>
<h2 class="subdefName">{{subdefname}}</h2><button class="subdef_deleter btn btn-danger btn-mini">{{ 'boutton::supprimer' | trans }}</button>
<input type="hidden" name="subdef" value="{{subdefgroup}}_{{subdefname}}"/>
<br />
<table class="subdefTab" cellspacing="0" cellpading="0" border="0" style="display:inline-block;">
<input type="hidden" name="subdefs[]" value="{{ subdefgroup }}_{{ subdefname }}"/>
<h2 class="subdefName">{{ subdefname }}</h2>
<button class="subdef_deleter btn btn-danger btn-mini">{{ 'boutton::supprimer' | trans }}</button>
<input type="hidden" name="subdef" value="{{ subdefgroup }}_{{ subdefname }}"/>
<br/>
<table class="subdefTab" cellspacing="0" cellpading="0" border="0"
style="display:inline-block;">
<tbody>
<tr>
<td style="width:100px;line-height: 0.9rem;">{{ 'Telechargeable' | trans }}</td>
<td style="width:300px;"><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_downloadable" {% if subdef.isDownloadable() %}checked="checked"{% endif %} value="1" /></td>
<td style="width:300px;"><input type="checkbox"
name="{{ subdefgroup }}_{{ subdefname }}_downloadable"
{% if subdef.isDownloadable() %}checked="checked"{% endif %}
value="1"/></td>
<td></td>
</tr>
<tr>
<td>{{ 'subdef.orderable' | trans }}</td>
<td><input type="checkbox" name="{{subdefgroup}}_{{subdefname}}_orderable" {% if subdef.isOrderable() %}checked="checked"{% endif %} value="1" /></td>
<td><input type="checkbox" name="{{ subdefgroup }}_{{ subdefname }}_orderable"
{% if subdef.isOrderable() %}checked="checked"{% endif %} value="1"/>
</td>
<td></td>
</tr>
</tr>
<tr>
<td>
{{ 'classe' | trans }}
</td>
<td>
<select name="{{subdefgroup}}_{{subdefname}}_class">
<select name="{{ subdefgroup }}_{{ subdefname }}_class">
<option>{{ 'classe' | trans }}</option>
<option value="document" {% if subdef.get_class() == "document" %}selected="selected"{% endif %}>{{ 'document' | trans }}</option>
<option value="preview" {% if subdef.get_class() == "preview" %}selected="selected"{% endif %}>{{ 'preview' | trans }}</option>
<option value="thumbnail" {% if subdef.get_class() == "thumbnail" %}selected="selected"{% endif %}>{{ 'tout le monde' | trans }}</option>
<option value="document"
{% if subdef.get_class() == "document" %}selected="selected"{% endif %}>{{ 'document' | trans }}</option>
<option value="preview"
{% if subdef.get_class() == "preview" %}selected="selected"{% endif %}>{{ 'preview' | trans }}</option>
<option value="thumbnail"
{% if subdef.get_class() == "thumbnail" %}selected="selected"{% endif %}>{{ 'tout le monde' | trans }}</option>
</select>
</td>
<td></td>
@@ -410,10 +419,12 @@
{{ 'mediatype' | trans }}
</td>
<td>
<select onchange="select_mediatype('{{subdefgroup}}', '{{subdefname}}', this);" name="{{subdefgroup}}_{{subdefname}}_mediatype">
<select onchange="select_mediatype('{{ subdefgroup }}', '{{ subdefname }}', this);"
name="{{ subdefgroup }}_{{ subdefname }}_mediatype">
<option>{{ 'Choisir' | trans }}</option>
{% for subdefType in subdef.getAvailableSubdefTypes() %}
<option value="{{ subdefType.getType() }}" {% if subdef.getSubdefType.getType() == subdefType.getType() %}selected="selected"{% endif %}>{{ subdefType.getType() }}</option>
<option value="{{ subdefType.getType() }}"
{% if subdef.getSubdefType.getType() == subdefType.getType() %}selected="selected"{% endif %}>{{ subdefType.getType() }}</option>
{% endfor %}
</select>
</td>
@@ -424,14 +435,16 @@
{{ 'Presets' | trans }}
</td>
<td>
<select onchange="populate_values('{{subdefgroup}}', '{{subdefname}}');" name="{{subdefgroup}}_{{subdefname}}_presets">
<select onchange="populate_values('{{ subdefgroup }}', '{{ subdefname }}');"
name="{{ subdefgroup }}_{{ subdefname }}_presets">
<option value="custom">{{ 'Custom' | trans }}</option>
{% set defType = subdef.getSubdefType.getType() %}
{% for key, pressets in config[defType].definitions %}
{% if pressets == null %}
<option disabled="disabled">{{ key }}</option>
{% else %}
<option value="{{ key }}" {% if subdef.get_preset() == key %}selected="selected"{% endif %}>{{ key }}</option>
<option value="{{ key }}"
{% if subdef.get_preset() == key %}selected="selected"{% endif %}>{{ key }}</option>
{% endif %}
{% endfor %}
</select>
@@ -443,7 +456,9 @@
Path
</td>
<td>
<input class="path_testable test_writeable" type="text" value="{{subdef.get_path()}}" name="{{subdefgroup}}_{{subdefname}}_path"/>
<input class="path_testable test_writeable" type="text"
value="{{ subdef.get_path() }}"
name="{{ subdefgroup }}_{{ subdefname }}_path"/>
</td>
<td></td>
</tr>
@@ -452,7 +467,9 @@
{{ 'Write Metas' | trans }}
</td>
<td>
<input type="checkbox" value="yes" {% if subdef.isMetadataUpdateRequired() %}checked="checked"{% endif %} name="{{subdefgroup}}_{{subdefname}}_meta"/>
<input type="checkbox" value="yes"
{% if subdef.isMetadataUpdateRequired() %}checked="checked"{% endif %}
name="{{ subdefgroup }}_{{ subdefname }}_meta"/>
</td>
<td></td>
</tr>
@@ -465,73 +482,88 @@
{% for code, language in app['locales.available'] %}
<tr>
<td style="width:100px;">{{ language }}</td>
<td style="width:300px;"><input type="text" name="{{subdefgroup}}_{{subdefname}}_label[{{ code }}]" value="{{ subdef.get_label(code, false) }}" /></td>
<td style="width:300px;"><input type="text"
name="{{ subdefgroup }}_{{ subdefname }}_label[{{ code }}]"
value="{{ subdef.get_label(code, false) }}"/>
</td>
</tr>
{% endfor %}
</table>
{% for subdefType in subdef.getAvailableSubdefTypes() %}
<span class="toggle" data-toggle="#box{{subdefgroup}}{{subdefname}}{{ subdefType.getType() }}" {% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
<span class="toggle"
data-toggle="#box{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}"
{% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
{{ 'Advanced settings' | trans }}
</span>
<div id="box{{subdefgroup}}{{subdefname}}{{ subdefType.getType() }}" class="{{subdefgroup}}{{subdefname}}" {% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
<div id="box{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}"
class="{{ subdefgroup }}{{ subdefname }}"
{% if subdef.getSubdefType.getType() != subdefType.getType() %}style="display:none;"{% endif %}>
<table cellspacing="0" cellpading="0" border="0" style="width:500px;">
{% for option in subdefType.getOptions() %}
{% set varname = subdefgroup~'_'~subdefname~'_'~subdefType.getType()~'['~ option.getName() ~']' %}
<tr>
<td style="width:120px;">
{{option.getDisplayName()}}
{{ option.getDisplayName() }}
</td>
<td style="width:250px;">
{% set extradata = '' %}
{% if option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_RANGE') %}
<div style="width:250px;" id="slider{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}"></div>
<div style="width:250px;"
id="slider{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}"></div>
<script type="text/javascript">
$('#slider{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}')
.slider({
value:{{ option.getValue }},
min: {{ option.getMinValue() }},
max: {{ option.getMaxValue() }},
{% if option.getStep() is not empty %}step : {{ option.getStep() }},{% endif %}
slide: function( event, ui ) {
$( "#slidervalue{{subdefgroup}}{{subdefname}}{{ subdefType.getType() }}{{ option.getName() }}" ).val( ui.value );
jQuery('[name={{subdefgroup}}_{{subdefname}}_presets]').val("custom");
if(jQuery(".subviews-submit").attr("disabled"))
activeSubmit();
},
create: function (event, ui) {
{# add no-ajax class to slider link to prevent page load in IE7 #}
$("a.ui-slider-handle", event.target).addClass("no-ajax");
}
});
$('#slider{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}')
.slider({
value:{{ option.getValue }},
min: {{ option.getMinValue() }},
max: {{ option.getMaxValue() }},
{% if option.getStep() is not empty %}step: {{ option.getStep() }},{% endif %}
slide: function (event, ui) {
$("#slidervalue{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}").val(ui.value);
jQuery('[name={{ subdefgroup }}_{{ subdefname }}_presets]').val("custom");
if (jQuery(".subviews-submit").attr("disabled"))
activeSubmit();
},
create: function (event, ui) {
{# add no-ajax class to slider link to prevent page load in IE7 #}
$("a.ui-slider-handle", event.target).addClass("no-ajax");
}
});
$('#slidervalue{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}').on('change', function(){
$('#slidervalue{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}').on('change', function () {
var $this = $(this);
$('#slider{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}').slider( "option", "value", $this.val() );
$('#slider{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}').slider("option", "value", $this.val());
})
</script>
{% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_ENUM') %}
<select name="{{varname}}">
<select name="{{ varname }}">
<option value="">{{ 'Choisir' | trans }}</option>
{% for pot_value in option.getAvailableValues() %}
<option value="{{ pot_value }}" {% if pot_value == option.getValue() %}selected="selected"{% endif %}>{{ pot_value }}</option>
<option value="{{ pot_value }}"
{% if pot_value == option.getValue() %}selected="selected"{% endif %}>{{ pot_value }}</option>
{% endfor %}
</select>
{% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_BOOLEAN') %}
<input name="{{varname}}" type="radio" value="yes" {% if option.getValue() %}checked="checked"{% endif %} /> {{ 'yes' | trans }}
<input name="{{varname}}" type="radio" value="no" {% if option.getValue() is empty %}checked="checked"{% endif %}/> {{ 'no' | trans }}
<input name="{{ varname }}" type="radio" value="yes"
{% if option.getValue() %}checked="checked"{% endif %} /> {{ 'yes' | trans }}
<input name="{{ varname }}" type="radio" value="no"
{% if option.getValue() is empty %}checked="checked"{% endif %}/> {{ 'no' | trans }}
{% elseif option.getType() == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_MULTI') %}
{% for pot_value, selected in option.Value(true) %}
<label class="checkbox inline">
<input type="checkbox" name="{{varname}}[]" value="{{ pot_value }}" {% if selected %}checked="checked"{% endif %}/>{{ pot_value }}
<input type="checkbox" name="{{ varname }}[]"
value="{{ pot_value }}"
{% if selected %}checked="checked"{% endif %}/>{{ pot_value }}
</label>
{% endfor %}
{% endif %}
</td>
<td>
{% if option.type == constant('\\Alchemy\\Phrasea\\Media\\Subdef\\OptionType\\OptionType::TYPE_RANGE') %}
<input style="width:35px;" value="{{option.value}}" id="slidervalue{{subdefgroup}}{{subdefname}}{{subdefType.getType()}}{{ option.getName() }}" name="{{varname}}" />
<input style="width:35px;" value="{{ option.value }}"
id="slidervalue{{ subdefgroup }}{{ subdefname }}{{ subdefType.getType() }}{{ option.getName() }}"
name="{{ varname }}"/>
{% endif %}
</td>
</tr>
@@ -542,8 +574,8 @@
</div>
<script>
{% set defType = subdef.getSubdefType.getType() %}
jQuery('#box{{subdefgroup}}{{subdefname}}{{ defType }} input, #box{{subdefgroup}}{{subdefname}}{{ defType }} select').change(function(){
jQuery('[name={{subdefgroup}}_{{subdefname}}_presets]').val("custom");
jQuery('#box{{ subdefgroup }}{{ subdefname }}{{ defType }} input, #box{{ subdefgroup }}{{ subdefname }}{{ defType }} select').change(function () {
jQuery('[name={{ subdefgroup }}_{{ subdefname }}_presets]').val("custom");
});
</script>
{% endfor %}

View File

@@ -138,7 +138,8 @@
<a target="_blank" href="https://docs.phraseanet.com/4.0/">
<span>
{{ 'phraseanet:: aide' | trans }}
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;" id="help-trigger"> <i class="icon-caret-down"></i></span>
<span style="display:inline-block;cursor:pointer;padding:0;border:none;padding-right:4px;padding-left:4px;"
id="help-trigger"> <i class="icon-caret-down"></i></span>
</span>
</a>
<table cellspacing="0" cellpadding="0" style="display:none;" class="contextMenu helpcontextmenu">

View File

@@ -31,8 +31,10 @@
<input type="hidden" name="id" value="{{ element.getId() }}"/>
<input type="hidden" name="title" value="{{ element.getRecord(app).get_title() }}"/>
<input type="hidden" name="default" value="{{ element.getOrd() }}"/>
<input type="hidden" name="date_created" value="{{ element.getRecord(app).getCreated() | date('Y-m-dTH:i:s') }}"/>
<input type="hidden" name="date_updated" value="{{ element.getRecord(app).getUpdated() | date('Y-m-dTH:i:s') }}"/>
<input type="hidden" name="date_created"
value="{{ element.getRecord(app).getCreated() | date('Y-m-dTH:i:s') }}"/>
<input type="hidden" name="date_updated"
value="{{ element.getRecord(app).getUpdated() | date('Y-m-dTH:i:s') }}"/>
</form>
</div>
{% endfor %}

View File

@@ -1,7 +1,7 @@
{% if not isAvailable %}
<p>{{ 'No permalink available.' | trans }}</p>
{% else %}
{% if subdefList is not empty %}
{% if subdefList is not empty %}
{% set defKey = defaultKey %}
<div id="share">
<div id="tweet" class="well-large">
@@ -17,14 +17,18 @@
</span>
</p>
<p>
<a id="twitter-link" href="http://www.twitter.com/home/?status={{ subdefList[defKey].permaviewUrl }}" target="_blank">
<img src="/assets/common/images/icons/twitter.png" title="share this on twitter" style="width:25px;vertical-align:middle;padding:0 5px;"/>
<a id="twitter-link" href="http://www.twitter.com/home/?status={{ subdefList[defKey].permaviewUrl }}"
target="_blank">
<img src="/assets/common/images/icons/twitter.png" title="share this on twitter"
style="width:25px;vertical-align:middle;padding:0 5px;"/>
{% trans %}Send to Twitter{% endtrans %}
</a>
</p>
<p>
<a id="facebook-link" href="http://www.facebook.com/sharer.php?u={{ subdefList[defKey].permaviewUrl }}" target="_blank">
<img src="/assets/common/images/icons/facebook.png" title="share on facebook" style="width:25px;vertical-align:middle;padding:0 5px;"/>
<a id="facebook-link" href="http://www.facebook.com/sharer.php?u={{ subdefList[defKey].permaviewUrl }}"
target="_blank">
<img src="/assets/common/images/icons/facebook.png" title="share on facebook"
style="width:25px;vertical-align:middle;padding:0 5px;"/>
{% trans %}Send to Facebook{% endtrans %}
</a>
</p>
@@ -32,19 +36,23 @@
<form action="#">
<div class="form-group clearfix">
<label style="display:inline-block;">{% trans %}Resource URL{% endtrans %}</label>
<input class="input-block-level" readonly="readonly" type="text" value="{{ subdefList[defKey].permalinkUrl }}"
<input class="input-block-level" readonly="readonly" type="text"
value="{{ subdefList[defKey].permalinkUrl }}"
id="permalinkUrl"/>
<p class="pull-right">
<a id="permalinkUrl-link" href="{{ subdefList[defKey].permalinkUrl }}" target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a id="permalinkUrl-link" href="{{ subdefList[defKey].permalinkUrl }}"
target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a href="#" class="" id="permalinkUrlCopy">{{ 'copyClipboardLabel' | trans }}</a>
</p>
</div>
<div class="form-group clearfix">
<label>{% trans %}Detailed view URL{% endtrans %}</label>
<input class="input-block-level" readonly="readonly" type="text" value="{{ subdefList[defKey].permaviewUrl }}" id="permaviewUrl"/>
<input class="input-block-level" readonly="readonly" type="text"
value="{{ subdefList[defKey].permaviewUrl }}" id="permaviewUrl"/>
<p class="pull-right">
<a id="permaviewUrl-link" href="{{ subdefList[defKey].permaviewUrl }}" target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a id="permaviewUrl-link" href="{{ subdefList[defKey].permaviewUrl }}"
target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a href="#" class="" id="permaviewUrlCopy">{{ 'copyClipboardLabel' | trans }}</a>
</p>
</div>
@@ -53,11 +61,14 @@
<label>{% trans %}Embed code{% endtrans %}</label>
{% spaceless %}
<textarea class="input-block-level" rows="4" readonly="true" id="embedRecordUrl">
<iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}" src="{{ subdefList[defKey].embedUrl }}" frameborder="0" allowfullscreen></iframe>
<iframe width="{{ subdefList[defKey].width }}" height="{{ subdefList[defKey].height }}"
src="{{ subdefList[defKey].embedUrl }}" frameborder="0"
allowfullscreen></iframe>
</textarea>
{% endspaceless %}
<p class="pull-right">
<a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}" target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a id="embedRecordUrl-link" href="{{ subdefList[defKey].embedUrl }}"
target="_blank">{{ 'previewLinkLabel' | trans }}</a> &nbsp;&nbsp;
<a href="#" class="" id="embedCopy">{{ 'copyClipboardLabel' | trans }}</a>
</p>
</div>
@@ -67,31 +78,35 @@
<script language="javascript">
// var subdefListObj = JSON.parse(subdefList); // to convert json into a javascript object
$(document).ready(function(){
$(document).ready(function () {
var subdefList = JSON.parse('{{ subdefList | json_encode | escape('js') }}');
$('#resource_type_sel').on('change', function() {
$('#resource_type_sel').on('change', function () {
assignPermalinks(this.value);
});
$('input.ui-state-default').hover(
function(){$(this).addClass('ui-state-hover');},
function(){$(this).removeClass('ui-state-hover');}
function () {
$(this).addClass('ui-state-hover');
},
function () {
$(this).removeClass('ui-state-hover');
}
);
$('#permalinkUrlCopy').on('click', function(event) {
$('#permalinkUrlCopy').on('click', function (event) {
event.preventDefault();
return copyElContentClipboard('permalinkUrl');
});
$('#permaviewUrlCopy').on('click', function(event) {
$('#permaviewUrlCopy').on('click', function (event) {
event.preventDefault();
return copyElContentClipboard('permaviewUrl');
});
$('#embedCopy').on('click', function(event) {
$('#embedCopy').on('click', function (event) {
event.preventDefault();
return copyElContentClipboard('embedRecordUrl');
});
$('#advance-share').on('click', function() {
$('#advance-share').on('click', function () {
$('#shared-def').show();
});
var copyElContentClipboard = function(elId) {
var copyElContentClipboard = function (elId) {
var copyEl = document.getElementById(elId);
copyEl.select();
try {
@@ -102,7 +117,7 @@
console.log('unable to copy');
}
}
var assignPermalinks = function(resourceType) {
var assignPermalinks = function (resourceType) {
$('#twitter-link').attr('href', 'http://www.twitter.com/home/?status=' + subdefList[resourceType].permaviewUrl);
$('#facebook-link').attr('href', 'http://www.facebook.com/sharer.php?u=' + subdefList[resourceType].permaviewUrl);
$('#permalinkUrl').val(subdefList[resourceType].permalinkUrl);

View File

@@ -6,17 +6,18 @@
<option value="">{{ 'Choisir' | trans }}</option>
<option value="default">{{ 'Re-initialiser' | trans }}</option>
<option value="title">{{ 'Titre' | trans }}</option>
<option value="date_created">{{ 'Date de création' | trans }}</option>
<option value="date_updated">{{ 'Date de modification' | trans }}</option>
<option value="date_created">{{ 'Date de création' | trans }}</option>
<option value="date_updated">{{ 'Date de modification' | trans }}</option>
</select>
<button type="button" class="autoorder btn btn-inverse">{{ 'Re-ordonner' | trans }}</button>
<button type="button" class="reverseorder btn btn-inverse">{{ 'Inverser' | trans }}</button>
</form>
<form class="form-inline span2" name="reorder" method="POST" action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
<form class="form-inline span2" name="reorder" method="POST"
action="{{ path('prod_stories_story_reorder', { 'sbas_id' : story.get_sbas_id(), 'record_id' : story.get_record_id() }) }}">
{% for element in story.get_children() %}
<input type="hidden" name="element[{{ element.get_record_id() }}]" value="{{ element.getNumber() }}"/>
{% endfor %}
<input type="submit" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}" />
<input type="submit" class="btn btn-inverse" value="{{ 'boutton::valider' | trans }}"/>
</form>
</div>
<div style="top:45px;overflow:auto;" id="reorder_box" class="row-fluid">

View File

@@ -41,9 +41,9 @@
</button>
{% endif %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %}
{#<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}">#}
{#<img src="/assets/common/images/icons/door.png"/>#}
{#</button>#}
{#<button class="ui-corner-all TOOL_bridge_btn basket_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}">#}
{#<img src="/assets/common/images/icons/door.png"/>#}
{#</button>#}
<button class="ui-corner-all TOOL_publish_btn basket_window" title="{{ 'action : publier' | trans }}" data-selection-source="basket">
<img src="/assets/common/images/icons/rss16.png"/>
</button>

View File

@@ -41,9 +41,9 @@
</button>
{% endif %}
{% if app.getAclForUser(app.getAuthenticatedUser()).has_right(constant('\\ACL::BAS_CHUPUB')) %}
{#<button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}" data-selection-source="story">#}
{#<img src="/assets/common/images/icons/door.png"/>#}
{#</button>#}
{#<button class="ui-corner-all TOOL_bridge_btn story_window" title="{{ 'action : bridge' | trans }}" data-href="{{ path("prod_bridge_manager") }}" data-selection-source="story">#}
{#<img src="/assets/common/images/icons/door.png"/>#}
{#</button>#}
<button class="ui-corner-all TOOL_publish_btn story_window" title="{{ 'action : publier' | trans }}" data-selection-source="story">
<img src="/assets/common/images/icons/rss16.png"/>
</button>

View File

@@ -304,7 +304,9 @@
<td style="width:50%; vertical-align:top;">
{% set useTruncation = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'use_truncation') %}
<label class="checkbox inline" for="ADVSRCH_USE_TRUNCATION">
<input id="ADVSRCH_USE_TRUNCATION" type="checkbox" class="checkbox preferences-options-use-truncation" name="truncation" {% if useTruncation == '1' or useTruncation == NULL %}checked="checked"{% endif %}>
<input id="ADVSRCH_USE_TRUNCATION" type="checkbox"
class="checkbox preferences-options-use-truncation" name="truncation"
{% if useTruncation == '1' or useTruncation == NULL %}checked="checked"{% endif %}>
{{ 'index:advanced-preferences:: use truncation' | trans }}
</label>
<div id="ADVSRCH_SBAS_ZONE" class="sbasglob">
@@ -689,9 +691,12 @@
{% set order_collection_by = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'order_collection_by') %}
<label class="select" for="orderByName">
<select class="preferences-options-collection-order" name="orderByName">
<option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') %} selected="selected" {% endif %} value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') }}">{{ 'Defined by admin' | trans }}</option>
<option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') %} selected="selected" {% endif %} value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') }}">{{ 'Alphabetic asc' | trans }}</option>
<option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') %} selected="selected" {% endif %} value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') }}">{{ 'Alphabetic desc' | trans }}</option>
<option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') %} selected="selected" {% endif %}
value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_BY_ADMIN') }}">{{ 'Defined by admin' | trans }}</option>
<option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') %} selected="selected" {% endif %}
value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_ASC') }}">{{ 'Alphabetic asc' | trans }}</option>
<option {% if order_collection_by == constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') %} selected="selected" {% endif %}
value="{{ constant('Alchemy\\Phrasea\\Core\\Configuration\\DisplaySettingService::ORDER_ALPHA_DESC') }}">{{ 'Alphabetic desc' | trans }}</option>
</select>
</label>
</form>

View File

@@ -141,10 +141,10 @@
</li>
{#<li class="divider"></li>#}
{#<li>#}
{#<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}" data-selection-source="search-result">#}
{#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
{#{{ 'action : bridge' | trans }}#}
{#</a>#}
{#<a class="TOOL_bridge_btn results_window" href="{{ path("prod_bridge_manager") }}" data-selection-source="search-result">#}
{#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/>#}
{#{{ 'action : bridge' | trans }}#}
{#</a>#}
{#</li>#}
<li class="divider"></li>
<li>
@@ -212,7 +212,7 @@
<span class="dropdownButton">
<div class="btn-group">
{#<button class="TOOL_pushdoc_btn default_action results_window btn btn-inverse" data-selection-source="search-result">#}
{#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }}#}
{#<img src="/assets/common/images/icons/door.png" height="16" width="16" class="btn-image"/> {{ 'action : bridge' | trans }}#}
{#</button>#}
<button class="TOOL_publish_btn results_window btn btn-inverse">
<img src="/assets/common/images/icons/rss16.png" height="16" width="16" class="btn-image"/>
@@ -230,7 +230,8 @@
<li>
<a class="results_window {{ action.classes|default('') }}">
{% if action.icon %}
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}" height="16" width="16" class="btn-image"/>
<img src="{{ plugin_asset(plugin.PluginName, action.icon) }}"
height="16" width="16" class="btn-image"/>
{% endif %}
{% set label = action.label %}

View File

@@ -34,18 +34,19 @@
</span>
</td>
{#<td class='uploader-icon'>#}
{#<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>#}
{#<img src='/assets/common/images/icons/logo-flash.png' width="32px" heigh="32px" title="{{ 'You are using the Flash uploader.' | trans }}"/>#}
{#</td>#}
{#<td class='uploader-info'>#}
{#<p>#}
{#{{ 'You are using the Flash uploader.' | trans }}#}
{#{% if not app['browser'].supportFileAPI() %}#}
{#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
{#{% endif %}#}
{#</p>#}
{#{% if app['browser'].supportFileAPI() %}#}
<a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}" class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
{#{% endif %}#}
{#<p>#}
{#{{ 'You are using the Flash uploader.' | trans }}#}
{#{% if not app['browser'].supportFileAPI() %}#}
{#{{ 'This version does not allow you to access all the features offered by the HTML5 uploader' | trans }}#}
{#{% endif %}#}
{#</p>#}
{#{% if app['browser'].supportFileAPI() %}#}
<a style="display: none" id="UPLOAD_HTML5_LINK" href="{{ path('upload_html5_form') }}"
class="dialog full-dialog">{{ 'Use the HTML5 uploader' | trans }}</a>
{#{% endif %}#}
{#</td>#}
</tr>
</table>
@@ -59,7 +60,9 @@
{% for sbasId, availableCollections in collections %}
<optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
{% for collection in availableCollections['databox_collections'] %}
<option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
<option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %}
value="{{ collection.get_base_id() }}"
class="select-row">{{ collection.get_label(app['locale']) }}</option>
{% endfor %}
</optgroup>
{% endfor %}
@@ -67,7 +70,8 @@
{# collections status #}
{% for availableCollections in collections %}
{% for collection in availableCollections['databox_collections'] %}
<div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
<div id="status-{{ collection.get_base_id() }}" class='collection-status'
style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
<h5>{{ 'upload:: Status :' | trans }} :</h5>
<table class="status-tab">
<tbody>

View File

@@ -37,16 +37,17 @@
</span>
</td>
{#<td class='uploader-icon'>#}
{#<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px" title="{{ 'You are using the HTML5 uploader.' | trans }}"/>#}
{#<img src='/assets/common/images/icons/html5-logo.png' width="32px" heigh="32px" title="{{ 'You are using the HTML5 uploader.' | trans }}"/>#}
{#</td>#}
{#<td class="uploader-infmaxFileSizeo">#}
{#<p>#}
{#{{ 'You are using the HTML5 uploader.' | trans }}#}
{#{% if not app['browser'].supportFileAPI() %}#}
{#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
{#{% endif %}#}
{#</p>#}
<a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}" class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
{#<p>#}
{#{{ 'You are using the HTML5 uploader.' | trans }}#}
{#{% if not app['browser'].supportFileAPI() %}#}
{#{{ 'Your browser does not support all HTML5 features properly.' | trans }}#}
{#{% endif %}#}
{#</p>#}
<a style="display: none" id="UPLOAD_FLASH_LINK" href="{{ path('upload_flash_form') }}"
class="dialog full-dialog">{{ 'Use the Flash uploader' | trans }}</a>
{#</td>#}
</tr>
</table>
@@ -58,9 +59,12 @@
{% set last_used_collection = app['settings'].getUserSetting(app.getAuthenticatedUser(), 'upload_last_used_collection') %}
<select name="base_id" class="span3 upload-options-collection" style="margin-left: 10px;">
{% for sbasId, availableCollections in collections %}
<optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}" class="select-label">
<optgroup label="{{ availableCollections['databox'].get_label(app['locale']) }}"
class="select-label">
{% for collection in availableCollections['databox_collections'] %}
<option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %} value="{{ collection.get_base_id() }}" class="select-row">{{ collection.get_label(app['locale']) }}</option>
<option {% if last_used_collection == collection.get_base_id() %} selected="selected" {% endif %}
value="{{ collection.get_base_id() }}"
class="select-row">{{ collection.get_label(app['locale']) }}</option>
{% endfor %}
</optgroup>
{% endfor %}
@@ -68,7 +72,8 @@
{# collections status #}
{% for availableCollections in collections %}
{% for collection in availableCollections['databox_collections'] %}
<div id="status-{{ collection.get_base_id() }}" class='collection-status' style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
<div id="status-{{ collection.get_base_id() }}" class='collection-status'
style='{{ last_used_collection == collection.get_base_id() ? "display:block" :"display:none" }}'>
<h5>{{ 'upload:: Status :' | trans }} :</h5>
<table class="status-tab">
<tbody>

View File

@@ -270,7 +270,8 @@
<tr>
<td style="text-align:right; width:80px;"><span class="label"></span> :&nbsp;</td>
<td></td>
<td><input type="text" style="width:250px;" name="term" onkeyup="inputChanged();return(false);"></td>
<td><input type="text" style="width:250px;" name="term"
onkeyup="inputChanged();return(false);"></td>
</tr>
<tr>
<td style="text-align:right">{{ 'thesaurus:: contexte' | trans }} : </td>