hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-17 15:03:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update templates to display databox fields labels

Browse Source
This commit is contained in:
Romain Neutron
2013-05-30 16:17:57 +02:00
parent 82af1ba69e
commit 769f319638
15 changed files with 189 additions and 607 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/Alchemy/Phrasea/Controller/Prod/Edit.php
View File

@@ -67,6 +67,7 @@ class Edit implements ControllerProviderInterface
, '_value' => ''
, '_sgval' => array()
, 'required' => $meta->is_required()
, 'label' => $meta->get_label($app['locale.I18n'])
, 'readonly' => $meta->is_readonly()
, 'type' => $meta->get_type()
, 'format' => ''

6
templates/web/admin/collection/suggested_value.html.twig
View File

@@ -77,9 +77,9 @@
<td valign="top" style="text-align:center;">
{% trans'admin::sugval: champs' %}
<select name=usrbases id="nomchamPH" onKeyUp="javascript:write_valsug();" onChange="javascript:savenomaff();makeRestrict();maketextaffich();makeEmpty();write_valsug();" onclick="javascript: makeRestrict();desactivall4VS(); write_valsug();" >
{% for meta in databox.get_meta_structure() %}
{% if not meta.is_readonly %}
<option value='{{ meta.get_name() }}'> {{ meta.get_name() }} </option>
{% for field in databox.get_meta_structure() %}
{% if not field.is_readonly %}
<option value='{{ field.get_name() }}'> {{ field.get_label(app['locale.I18n']) }} </option>
{% endif %}
{% endfor %}
</select>

424
templates/web/admin/databox/doc_structure.html.twig
View File

@@ -1,424 +0,0 @@
{% macro dces_selector(available_dc_sources, selected_field) %}
{% set disabled = '' %}
{% if selected_field.is_on_error() %}
{% set disabled = 'disabled="disabled"' %}
{% endif %}
<select class="metafield_{{ selected_field.get_id() }} dces_selector input-medium" {{ disabled }} name="dces_{{ selected_field.get_id() }}">
<option value="">{% trans 'choisir' %}</option>
{% for field in available_dc_sources %}
<option value="{{ field.get_label() }}" {% if selected_field.get_dces_element() != null and selected_field.get_dces_element().get_label() == field.get_label() %}selected="selected"{% endif %}>
DC:{{ field.get_label() }}
</option>
{% endfor %}
</select>
{% endmacro %}
{% macro thumbtitle_selector(title) %}
<option value="1" {% if title == '1' %}selected="selected"{% endif %}>{% trans 'Tous' %}</option>
<option value="0" {% if title == '0' %}selected="selected"{% endif %}>{% trans 'Aucun' %}</option>
<option value="fr" {% if title == 'fr' %}selected="selected"{% endif %}>{% trans 'Francais' %}</option>
<option value="nl" {% if title == 'nl' %}selected="selected"{% endif %}>{% trans 'Dutch' %}</option>
<option value="de" {% if title == 'de' %}selected="selected"{% endif %}>{% trans 'Allemand' %}</option>
<option value="en" {% if title == 'en' %}selected="selected"{% endif %}>{% trans 'Anglais' %}</option>
<option value="ar" {% if title == 'ar' %}selected="selected"{% endif %}>{% trans 'Arabe' %}</option>
{% endmacro %}
<div id="warning_dialog" class="alert alert-error" style="display:none" title="{% trans 'Attention !' %}" ></div>
<div style="display:none;" id="field_changer">
<input type="text" id="field_chooser" class="input-medium" value="" />
<input type="text" id="current_field_label" class="input-medium" readonly value="" />
<button id="tag_remover" class="btn">{% trans 'Delete' %}</button>
<input type="hidden" name="field_id" value="" />
</div>
<div style="display:none;" id="field_adder" title="{% trans 'Add a field' %}">
<label for="input_new_field_name">{% trans 'New field name' %} :</label>
<input type="text" id="input_new_field_name" name="newfield_name" class="input-large" />
<p class="help-block">
<label class="checkbox" for="input_new_field_multi">
<input type="checkbox" id="input_new_field_multi" name="newfield_multi" value="1" />
{% trans 'This field is multi-valued' %} *
</label>
</p>
<blockquote>* {% trans 'This can not be changed' %}</blockquote>
</div>
<div class="btn-toolbar">
<button class="field_adder btn btn-warning">{% trans 'boutton::ajouter' %}</button>
<button class="struct_saver btn btn-warning">{% trans 'Valider' %}</button>
</div>
<form id="form_struct" action="/admin/description/{{ databox.get_sbas_id() }}/" method="post" target="_self">
<input name="newfield" id="newfield" type="hidden" />
<input name="newfield_multi" id="newfield_multi" type="hidden" />
<table class="admintable">
<thead>
<tr>
<th></th>
<th>{% trans 'Nom' %}</th>
<th>{% trans 'Source' %}</th>
<th><span title="{% trans 'DublinCore Element Set' %}">DCES</span></th>
<th>{% trans 'Multivalue' %}</th>
<th>{% trans 'Indexable' %}</th>
<th>{% trans 'Vocabulary Type' %}</th>
<th>{% trans 'Vocabulary restricted' %}</th>
<th>{% trans 'Required' %}</th>
<th>{% trans 'Lecture seule' %}</th>
<th>{% trans 'Type' %}</th>
<th>{% trans 'Separateur' %}</th>
<th>{% trans 'Branche Thesaurus' %}</th>
<th>{% trans 'Affiche dans report' %}</th>
<th>{% trans 'Afficher en titre' %}</th>
<th>{% trans 'Business Field' %}</th>
</tr>
</thead>
<tbody>
{% for field in fields %}
{% set disabled = '' %}
{% if field.is_on_error() %}
{% set disabled = 'disabled="disabled"' %}
{% endif %}
<tr class="{% if loop.index is odd %}odd{% else %}even{% endif %}">
<td class="centered" style="min-width: 22px;">
<a class="meta_deleter">
<input type="hidden" value="{{ field.get_id() }}" />
<img src="/skins/icons/delete.png">
</a>
<input type="hidden" name="field_ids[]" value="{{ field.get_id() }}" />
</td>
<td>
<input type="text" class="meta_namer metafield_{{ field.get_id() }} input-medium" {{ disabled }} name="name_{{ field.get_id() }}" value="{{ field.get_name () }}" />
</td>
<td>
<span id="display_value_{{ field.get_id() }}">{% if field.is_on_error() %}{% trans 'Error' %}{% elseif field.get_tag().getTagname() != '' %}{{ field.get_tag().getTagname() }}{% else %}{% trans 'No source' %}{% endif %}</span>
<a href="#" class="field_change">{% trans 'boutton::modifier' %}<input type="hidden" value="{{ field.get_id() }}"/></a>
<input type="hidden" class="meta_src" name="src_{{ field.get_id() }}" value="{{ field.get_tag().getTagname() }}"/>
</td>
<td class="centered">
{{ _self.dces_selector(available_dc_fields, field) }}
</td>
<td class="multi_{{ field.get_id() }} centered">
{% if field.is_multi() %}<img src="/skins/icons/ok.png"/>{% endif %}
<img class="alert alertTips alert_not_multi" src="/skins/icons/alert.png" title="{% trans 'Attention, la source descriptive selectionne n\'est pas multivaluee' %}" style="display:none;" />
<img class="alert alertTips alert_is_multi" src="/skins/icons/alert.png" title="{% trans 'Attention, la source descriptive selectionne est multivaluee' %}" style="display:none;" />
</td>
<td class="centered">
<input type="checkbox" class="metafield_{{ field.get_id() }}" {{ disabled }} name="indexable_{{ field.get_id() }}" {% if field.is_indexable() %}checked="checked"{% endif %} />
</td>
<td class="centered">
{% if field.is_multi() %}
<select class="metafield_{{ field.get_id() }} input-medium" {{ disabled }} name="vocabulary_{{ field.get_id() }}">
<option value=""></option>
{% for vocabulary in vocabularies %}
<option {% if field.getVocabularyControl() and field.getVocabularyControl().getType() == vocabulary.getType() %}selected="selected"{% endif %} value="{{ vocabulary.getType() }}">{{ vocabulary.getName() }}</option>
{% endfor %}
</select>
{% endif %}
</td>
<td class="centered">
<input type="checkbox" class="metafield_{{ field.get_id() }}" {{ disabled }} name="vocabularyrestricted_{{ field.get_id() }}" {% if field.isVocabularyRestricted() %}checked="checked"{% endif %}/>
</td>
<td class="centered">
<input type="checkbox" class="metafield_{{ field.get_id() }}" {{ disabled }} name="required_{{ field.get_id() }}" {% if field.is_required() %}checked="checked"{% endif %}/>
</td>
<td class="centered">
<input type="checkbox" class="meta_readonly metafield_{{ field.get_id() }}" {{ disabled }} name="readonly_{{ field.get_id() }}" {% if field.is_readonly() %}checked="checked"{% endif %}/>
<img class="alert alertTips alert_not_readonly" src="/skins/icons/alert.png" title="{% trans 'Attention, la source descriptive selectionne n\'est pas en lecture seule, vous devriez decocher cette case' %}" style="display:none;" />
<img class="alert alertTips alert_is_readonly" src="/skins/icons/alert.png" title="{% trans 'Attention, la source descriptive selectionne est en lecture seule, vous devriez cocher cette case' %}" style="display:none;" />
</td>
<td class="centered">
<select class="metafield_{{ field.get_id() }} input-small" {{ disabled }} name="type_{{ field.get_id() }}">
<option value=""></option>
<option {% if field.get_type() == 'string' %}selected{% endif %} value="string">{% trans 'string' %}</option>
<option {% if field.get_type() == 'text' %}selected{% endif %} value="text">{% trans 'text' %}</option>
<option {% if field.get_type() == 'number' %}selected{% endif %} value="number">{% trans 'number' %}</option>
<option {% if field.get_type() == 'date' %}selected{% endif %} value="date">{% trans 'date' %}</option>
</select>
</td>
<td class="centered">
<input type="text" size="2" class="metafield_{{ field.get_id() }} input-small" {{ disabled }} value="{{ field.get_separator() }}" name="separator_{{ field.get_id() }}" />
</td>
<td class="centered">
<input type="text" class="metafield_{{ field.get_id() }} input-small" {{ disabled }} name="tbranch_{{ field.get_id() }}" value="{{ field.get_tbranch() }}"/>
</td>
<td class="centered">
<input type="checkbox" class="metafield_{{ field.get_id() }}" {{ disabled }} name="report_{{ field.get_id() }}" {% if field.is_report() %}checked="checked"{% endif %}/>
</td>
<td class="centered">
<select class="metafield_{{ field.get_id() }} input-small" {{ disabled }} name="thumbtitle_{{ field.get_id() }}">
{{ _self.thumbtitle_selector(field.get_thumbtitle()) }}
</select>
</td>
<td class="centered">
<input type="checkbox" class="metafield_{{ field.get_id() }}" {{ disabled }} name="business_{{ field.get_id() }}" {% if field.isBusiness() %}checked="checked"{% endif %}/>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<button type="submit" class="btn btn-warning">{% trans 'Valider' %}</button>
</form>
<style>
.ui-autocomplete {
max-height: 200px;
max-width: 400px;
overflow-y: auto;
/* prevent horizontal scrollbar */
overflow-x: hidden;
/* add padding to account for vertical scrollbar */
padding-right: 20px;
}
/** IE 6 doesn't support max-height
* we use height instead, but this forces the menu to always be this tall
*/
* html .ui-autocomplete {
height: 200px;
}
.ui-autocomplete-loading {
background: white url('/skins/icons/ui-anim_basic_16x16.gif') right center no-repeat; }
.alertTips {
cursor:help;
}
.alert {
vertical-align: baseline;
}
</style>
<script type="text/javascript">
$(document).ready(function(){
var container = $('#right-ajax');
$('#form_struct').bind('submit', function(){
var $this = $(this),
datas = $this.serializeArray(),
method = $this.attr('method') ? $this.attr('method') : 'GET',
url = $this.attr('action');
container.empty().addClass('loading');
$.ajax({
type: method,
url: url,
dataType: 'html',
data: datas,
error: function(){
container.removeClass('loading');
return;
},
timeout: function(){
container.removeClass('loading');
return;
},
success: function(data){
container.removeClass('loading').empty().append(data);
}
});
return false;
});
$('select.thumbtitle', container).bind('change', function(){
if($(this).val() == '') {
return;
}
var id = $(this).attr('name').split('_').pop();
var business = $('input[name="business_' + id + '"]');
if(business.attr('checked')) {
$(this).val('0');
{% set sentence %}
{% trans 'A field can not be set both as title and business field. Remove business field flag before setting title' %}
{% endset %}
alert('{{ sentence |e("js") }}');
}
});
$('input.business', container).bind('change', function(){
if(!$(this).attr('checked')) {
return;
}
var id = $(this).attr('name').split('_').pop();
var thumbtitle = $('select[name="thumbtitle_' + id + '"]');
if(thumbtitle.val() != '0') {
$(this).removeAttr('checked');
{% set sentence %}
{% trans 'A field can not be set both as title and business field. Remove the title before setting the business flag' %}
{% endset %}
alert('{{ sentence |e("js") }}');
}
});
var current_field_label = $('#current_field_label');
$("#field_chooser").autocomplete({
source: "/admin/description/metadatas/search/",
minLength: 2,
select: function( event, ui ) {
current_field_label.val(ui.item.value);
}
});
var buttons = {};
var dialog = $('#field_changer');
buttons['{% trans 'boutton::annuler' %}'] = function(){
dialog.dialog('close');
};
$('#tag_remover').bind('click', function(){
current_field_label.val('');
});
buttons['{% trans 'boutton::valider' %}'] = function(){
var field_id = $('input[name="field_id"]', dialog).val();
$('#display_value_'+field_id).empty().append(current_field_label.val());
$('input[name="src_'+field_id+'"]', container).val(current_field_label.val());
$('input[name="src_'+field_id+'"]', container).trigger('change');
$('.metafield_'+field_id, container).removeAttr('disabled');
dialog.dialog('close');
};
dialog.dialog({
modal:true,
buttons : buttons,
draggable:true,
resizable:false
}).dialog('close');
$('a.field_change', container).bind('click', function(){
$('#field_chooser').val('');
var field_id = $('input',this).val();
current_field_label.val( $('input[name="src_'+field_id+'"]', container).val());
$('input[name="field_id"]', dialog).val(field_id);
dialog.dialog().dialog('open');
return false;
});
$('.alertTips', container).tooltip();
$('button.struct_saver', container).bind('click', function(){
$('#form_struct').submit();
});
$('.field_adder', container).bind('click', function(){
var buttons = {};
buttons['{% trans 'boutton::annuler' %}'] = function(){
$('#field_adder').dialog('destroy').remove();
};
buttons['{% trans 'boutton::valider' %}'] = function(){
$('#newfield').val($('#field_adder input[name="newfield_name"]').val());
$('#newfield_multi').val($('#field_adder input[name="newfield_multi"]').attr('checked') ? 1 : 0);
$('#field_adder').dialog('destroy').remove();
$('#form_struct').submit();
};
$('#field_adder').dialog({
modal:true,
buttons : buttons,
draggable:false,
resizable:false,
width:400
}).dialog('open');
});
$('.meta_deleter', container).bind('click', function(){
{% set sentence %}
{% trans 'Etes vous sur de vouloir supprimer cette metadonnee ? Elle sera definitivement perdue' %}
{% endset %}
if(confirm('{{ sentence |e("js") }}'))
{
var field = $('input[name="field_ids[]"]', $(this).parent());
var field_id = $('input', $(this)).val();
field.attr('name', 'todelete_ids[]');
$('.metafield_'+field_id, container).attr('disabled', 'disabled');
}
});
$('.dces_selector', container).bind('change', function(event){
if($.trim($(this).val()) === '') {
return;
}
var $this = $(this);
var $others = $('.dces_selector option[value="'+$this.val()+'"]:selected', container);
if($others.length > 1)
{
var other_name = $($others.get(0)).closest('tr').find('input.meta_namer').val();
$('#warning_dialog').html("<p>{% trans 'Attention, deux champs ne peuvent représenter le meme element Dublin Core.' %}<br/><br/>{% trans 'La precedente attribution a ete desactivee' %} </p><p style='margin-top:10px;text-align:center;font-weight:bold;'>"+other_name+'</p>').dialog({modal:true});
$others.each(function(i, el){
var $parent = $(el).parent();
if($parent.attr('name') !== $this.attr('name'))
$parent.val('');
});
return false;
}
});
$('.meta_src', container).bind('change', function(){
var id = $(this).attr('name').split('_').pop();
$.ajax({
type: "GET",
url: "/admin/fields/checkmulti/",
dataType: 'json',
data: {
multi : $('input[name="multi_'+id+'"]', container).attr('checked'),
source : $('input[name="src_'+id+'"]', container).val()
},
error: function(){
return;
},
timeout: function(){
return;
},
success: function(data){
var $parent = $('.multi_'+id, container);
$('.alert', $parent).hide();
if(data.result === false && data.is_multi === true)
$('.alert_is_multi', $parent).show();
else if(data.result === false && data.is_multi === false)
$('.alert_not_multi', $parent).show();
}
});
});
$('.meta_readonly, .meta_src', container).bind('change', function(){
var id = $(this).attr('name').split('_').pop();
$.ajax({
type: "GET",
url: "/admin/fields/checkreadonly/",
dataType: 'json',
data: {
readonly : $('input[name="readonly_'+id+'"]', container).attr('checked'),
source : $('input[name="src_'+id+'"]', container).val()
},
error: function(){
return;
},
timeout: function(){
return;
},
success: function(data){
var $parent = $('input[name="readonly_'+id+'"]', container).parent();
$('.alert', $parent).hide();
if(data.result === false && data.is_readonly === true)
$('.alert_is_readonly', $parent).show();
else if(data.result === false && data.is_readonly === false)
$('.alert_not_readonly', $parent).show();
}
});
});
});
</script>

4
templates/web/common/caption_templates/answer.html.twig
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% for value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{ value.label }}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/basket_element.html.twig
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% for value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{ value.label }}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/internal_publi.html.twig
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% for value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{ value.label }}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/lazaret.html.twig
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% for value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{ value.label }}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/overview.html.twig
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div><b>{{name}}</b> : {{value.value|raw}}</div>
{% for value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div><b>{{ value.label }}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

4
templates/web/common/caption_templates/preview.html.twig
View File

@@ -1,5 +1,5 @@
{% macro format_caption(record, highlight, searchEngine, includeBusiness) %}
{% for name, value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{name}}</b> : {{value.value|raw}}</div>
{% for value in record.get_caption().get_highlight_fields(highlight, null, searchEngine, includeBusiness) %}
<div class="desc{% if loop.index is odd %}im{% endif %}pair"><b>{{ value.label }}</b> : {{value.value|raw}}</div>
{% endfor %}
{% endmacro %}

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

@@ -1,7 +1,7 @@
{% extends 'prod/Tooltip/Tooltip.html.twig'%}
{% set title %}
{{ field.get_name() }}
{{ field.get_label(app['locale.I18n']) }}
{% if field.get_type() == 'text' %}
({% trans 'Type texte' %})

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

@@ -1,6 +1,6 @@
{% extends 'prod/Tooltip/Tooltip.html.twig'%}
{% set title %} {{ field.get_name() }} ({{ field.get_tag().getTagname() }}) {% endset %}
{% set title %} {{ field.get_label(app['locale.I18n']) }} ({{ field.get_tag().getTagname() }}) {% endset %}
{% set width = 600 %}
{% set maxwidth = null %}

4
templates/web/prod/actions/edit_default.html.twig
View File

@@ -87,7 +87,7 @@
<img src="/skins/icons/titre16.png" title="{% trans 'This field represents the title of the document' %}" />
{% endif %}
<span id="spanidEditFieldBox_{{i}}">
{{field.get_name()}} {% if field.is_required() %}<span style="font-weight:bold;font-size:16px;"> * </span>{% endif %} :
{{field.get_label(app['locale.I18n'])}} {% if field.is_required() %}<span style="font-weight:bold;font-size:16px;"> * </span>{% endif %} :
</span>
<span class="fieldvalue" id="idEditField_{{i}}" >???</span>
</div>
@@ -268,7 +268,7 @@
<select id="EditSRField" class="input-xlarge">
<option value="">{% trans 'prod::editing::replace: remplacer dans tous les champs' %}</option>
{% for field in fields %}
<option value="{{ field.get_id() }}">{{ field.get_name() }}</option>
<option value="{{ field.get_id() }}">{{ field.get_label(app['locale.I18n']) }}</option>
{% endfor %}
</select>
</td>

6
www/include/js/jquery.Edit.js
View File

@@ -49,7 +49,7 @@
}
};
var databoxField = function(name, meta_struct_id, options) {
var databoxField = function(name, label, meta_struct_id, options) {
var defaults = {
multi : false,
@@ -70,6 +70,7 @@
}
this.name = name;
this.label = label;
this.meta_struct_id = meta_struct_id;
this.options = jQuery.extend(defaults, options);
@@ -87,6 +88,9 @@
getName : function() {
return this.name;
},
getLabel : function() {
return this.label;
},
isMulti : function() {
return this.options.multi;
},

18
www/include/js/tests/jquery.Edit.js.html
View File

@@ -40,7 +40,7 @@
test("Selection instanciation", function() {
var DBField = new p4.databoxField('Champ', 25)
var DBField = new p4.databoxField('Champ', 'Label', 25)
var field = new p4.recordField(DBField);
equal( field.getName(), 'Champ', "Field name is correct" );
@@ -50,10 +50,10 @@
equal( field.isRequired(), false, "Field is not required" );
equal( field.isEmpty(), true, "Field is empty" );
var DBFieldMulti = new p4.databoxField('Champ', 25, {separator:''});
var DBFieldMulti = new p4.databoxField('Champ', 'Label', 25, {separator:''});
equal( DBFieldMulti.getSeparator(), '', "Empty separator is available" );
var DBFieldMulti = new p4.databoxField('Champ', 25,
var DBFieldMulti = new p4.databoxField('Champ', 'Label', 25,
{
minLength:2,
maxLength:344,
@@ -67,7 +67,7 @@
equal( DBFieldMulti.getType(), 'ChaineEnOr', "Default Type is string" );
equal( DBFieldMulti.getSeparator(), '-', "Default Separator is ;" );
var DBFieldMulti = new p4.databoxField('Champ', 25, {multi:true});
var DBFieldMulti = new p4.databoxField('Champ', 'Label', 25, {multi:true});
equal( DBFieldMulti.getMaxLength(), null, "Default MaxLength is null" );
equal( DBFieldMulti.getMinLength(), null, "Default MinLength is null" );
@@ -78,13 +78,13 @@
equal( fieldMulti.isMulti(), true, "Field is multi" );
equal( fieldMulti.isRequired(), false, "Field is not required" );
var DBFieldRequired = new p4.databoxField('Champ', 25, {required:true})
var DBFieldRequired = new p4.databoxField('Champ', 'Label', 25, {required:true})
var fieldRequired = new p4.recordField(DBFieldRequired);
equal( fieldRequired.isMulti(), false, "Field is not multi" );
equal( fieldRequired.isRequired(), true, "Field is required" );
var DBFieldRequiredMulti = new p4.databoxField('Champ', 25, {required:true, multi:true})
var DBFieldRequiredMulti = new p4.databoxField('Champ', 'Label', 25, {required:true, multi:true})
var fieldMultiRequired = new p4.recordField(DBFieldRequiredMulti);
equal( fieldMultiRequired.isMulti(), true, "Field is not multi" );
@@ -132,7 +132,7 @@
test("Test recordFieldValue non-multi", function() {
var DBField = new p4.databoxField('Champ', 25)
var DBField = new p4.databoxField('Champ', 'Label', 25)
var arrayValues = [
new p4.recordFieldValue(1, 'valeur')
@@ -209,7 +209,7 @@
test("Test recordFieldValue Multi", function() {
var DBField = new p4.databoxField('Champ', 25,{multi:true})
var DBField = new p4.databoxField('Champ', 'Label', 25,{multi:true})
var arrayValues = [
new p4.recordFieldValue(1, 'valeur')
@@ -294,7 +294,7 @@
test("Test recordFieldValue Readonly", function() {
var DBField = new p4.databoxField('Champ', 25,{readonly:true})
var DBField = new p4.databoxField('Champ', 'Label', 25,{readonly:true})
var arrayValues = [
new p4.recordFieldValue(1, 'valeur')

7
www/skins/prod/jquery.edit.js
View File

@@ -213,7 +213,7 @@ function editField(evt, meta_struct_id)
p4.edit.curField = meta_struct_id;
if(meta_struct_id >= 0)
{
var name = p4.edit.T_fields[meta_struct_id].name + (p4.edit.T_fields[meta_struct_id].required ? '<span style="font-weight:bold;font-size:16px;"> * </span>' : '');
var name = p4.edit.T_fields[meta_struct_id].label + (p4.edit.T_fields[meta_struct_id].required ? '<span style="font-weight:bold;font-size:16px;"> * </span>' : '');
$("#idFieldNameEdit", p4.edit.editBox).html(name) ;
var vocabType = p4.edit.T_fields[meta_struct_id].vocabularyControl;
@@ -1513,7 +1513,7 @@ function preset_copy()
{
var c = p4.edit.T_fields[i]._value == "" ? "" : "checked=\"1\"";
var v = p4.edit.T_fields[i]._value;
html += "<div><label class=\"checkbox\" for=\"new_preset_" + p4.edit.T_fields[i].name + "\"><input type=\"checkbox\" class=\"checkbox\" id=\"new_preset_" + p4.edit.T_fields[i].name + "\" value=\"" + i + "\" " + c + "/>" + "<b>" + p4.edit.T_fields[i].name + " : </b></label> ";
html += "<div><label class=\"checkbox\" for=\"new_preset_" + p4.edit.T_fields[i].name + "\"><input type=\"checkbox\" class=\"checkbox\" id=\"new_preset_" + p4.edit.T_fields[i].name + "\" value=\"" + i + "\" " + c + "/>" + "<b>" + p4.edit.T_fields[i].label + " : </b></label> ";
html += cleanTags(p4.edit.T_fields[i]._value) + "</div>";
}
}
@@ -1819,6 +1819,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel)
var meta_struct_id = p4.edit.T_records[r].fields[f].meta_struct_id;
var name = p4.edit.T_fields[meta_struct_id].name;
var label = p4.edit.T_fields[meta_struct_id].label;
var multi = p4.edit.T_fields[meta_struct_id].multi;
var required = p4.edit.T_fields[meta_struct_id].required;
@@ -1842,7 +1843,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel)
vocabularyRestricted:vocabularyRestricted
};
var databoxField = new p4.databoxField(name, meta_struct_id, fieldOptions);
var databoxField = new p4.databoxField(name, label, meta_struct_id, fieldOptions);
var values = [];