diff --git a/templates/web/prod/actions/edit_default.twig b/templates/web/prod/actions/edit_default.twig index cc9ec75026..773f6710eb 100644 --- a/templates/web/prod/actions/edit_default.twig +++ b/templates/web/prod/actions/edit_default.twig @@ -53,8 +53,8 @@ {% endmacro %} @@ -189,7 +189,7 @@
- +
diff --git a/www/prod/jquery.edit.js b/www/prod/jquery.edit.js index 1d7aa3b37d..c194d4b743 100644 --- a/www/prod/jquery.edit.js +++ b/www/prod/jquery.edit.js @@ -31,7 +31,7 @@ function setSizeLimits() } function edit_kdwn(evt, src) -{ +{ cancelKey = false; switch(evt.keyCode) @@ -56,15 +56,15 @@ function edit_kdwn(evt, src) // des events sur le textarea pour tracker la selection (chercher dans le thesaurus...) // ---------------------------------------------------------------------------------------------- function edit_mdwn_ta(evt) -{ +{ evt.cancelBubble = true; return(true); } // mouse up textarea function edit_mup_ta(evt, obj) -{ - +{ + if(p4.edit.T_fields[p4.edit.curField].tbranch) { if(obj.value != "") @@ -76,7 +76,7 @@ function edit_mup_ta(evt, obj) // key up textarea function edit_kup_ta(evt, obj) { - + var cancelKey = false; var o; switch(evt.keyCode) @@ -88,7 +88,7 @@ function edit_kup_ta(evt, obj) cancelKey = true; break; } - + if(cancelKey) { evt.cancelBubble = true; @@ -124,7 +124,7 @@ function edit_mdwn_status(evt) } // --------------------------------------------------------------------------- -// on a clique sur un champ +// on a clique sur un champ // --------------------------------------------------------------------------- function edit_mdwn_fld(evt, meta_struct_id, fieldname) { @@ -165,16 +165,16 @@ function editStatus(evt) document.getElementById('idEditZTextArea').blur(); document.getElementById('EditTextMultiValued').blur(); - + $("#idFieldNameEdit", p4.edit.editBox).html("[STATUS]") ; $("#idExplain", p4.edit.editBox).html(" "); $("#ZTextMultiValued", p4.edit.editBox).hide(); $("#ZTextMonoValued", p4.edit.editBox).hide(); $("#ZTextStatus", p4.edit.editBox).show(); - + $("#idEditZone", p4.edit.editBox).show(); - + document.getElementById("editFakefocus").focus(); p4.edit.curField = -1; activeField(); @@ -185,7 +185,7 @@ function activeField() var meta_struct_id = parseInt(p4.edit.curField); meta_struct_id = (isNaN(meta_struct_id) || meta_struct_id <0)?'status':meta_struct_id; - + $('#divS div.active, #divS div.hover').removeClass('active hover'); $('#EditFieldBox_'+meta_struct_id).addClass('active'); @@ -207,9 +207,9 @@ function editField(evt, meta_struct_id) document.getElementById('idEditZTextArea').blur(); document.getElementById('EditTextMultiValued').blur(); $(".editDiaButtons", p4.edit.editBox).hide(); - + $('#idEditZTextArea, #EditTextMultiValued').unbind('keyup.maxLength'); - + p4.edit.curField = meta_struct_id; if(meta_struct_id >= 0) { @@ -241,18 +241,18 @@ function editField(evt, meta_struct_id) } }); - + if(p4.edit.T_fields[meta_struct_id].explain || p4.edit.T_fields[meta_struct_id].maxLength > 0) { var idexplain = $("#idExplain"); idexplain.html(''); - + $('#idEditZTextArea, #EditTextMultiValued').bind('keyup.maxLength', function(){ var remaining = Math.max((p4.edit.T_fields[meta_struct_id].maxLength - $(this).val().length), 0); idexplain.html(" Caracteres restants : "+(remaining)+""); $('.metadatas_restrictionsTips', idexplain).tooltip(); - }).trigger('keyup.maxLength'); + }).trigger('keyup.maxLength'); } else { @@ -263,7 +263,7 @@ function editField(evt, meta_struct_id) { // champ monovalue : textarea $(".editDiaButtons", p4.edit.editBox).hide(); - + if(p4.edit.T_fields[meta_struct_id].type == "date") { $("#idEditZTextArea", p4.edit.editBox).css("height", "16px"); @@ -274,11 +274,11 @@ function editField(evt, meta_struct_id) $("#idEditDateZone", p4.edit.editBox).hide(); $("#idEditZTextArea", p4.edit.editBox).css("height", "100%"); } - + $("#ZTextStatus", p4.edit.editBox).hide(); $("#ZTextMultiValued", p4.edit.editBox).hide(); $("#ZTextMonoValued", p4.edit.editBox).show(); - + if(p4.edit.T_fields[meta_struct_id]._status == 2) { // heterogene @@ -291,7 +291,7 @@ function editField(evt, meta_struct_id) // homogene $("#idEditZTextArea", p4.edit.editBox).val(p4.edit.fieldLastValue = p4.edit.T_fields[meta_struct_id]._value); $("#idEditZTextArea", p4.edit.editBox).removeClass("hetero"); - + $("#idDivButtons", p4.edit.editBox).hide(); // valeurs homog�nes if(p4.edit.T_fields[meta_struct_id].type == "date") { @@ -308,11 +308,11 @@ function editField(evt, meta_struct_id) } } p4.edit.textareaIsDirty = false; - + $("#idEditZone", p4.edit.editBox).show(); - + $('#idEditZTextArea').trigger('keyup.maxLength'); - + self.setTimeout("document.getElementById('idEditZTextArea').focus();", 50); } else @@ -321,16 +321,16 @@ function editField(evt, meta_struct_id) $("#ZTextStatus", p4.edit.editBox).hide(); $("#ZTextMonoValued", p4.edit.editBox).hide(); $("#ZTextMultiValued", p4.edit.editBox).show(); - + $("#idDivButtons", p4.edit.editBox).hide(); // valeurs homogenes - + updateCurrentMval(meta_struct_id); - + $('#EditTextMultiValued', p4.edit.editBox).val(""); $('#idEditZone', p4.edit.editBox).show(); - + $('#EditTextMultiValued').trigger('keyup.maxLength'); - + self.setTimeout("document.getElementById('EditTextMultiValued').focus();", 50); // reveal_mval(); @@ -348,7 +348,7 @@ function editField(evt, meta_struct_id) function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId) { - + // on compare toutes les valeurs de chaque fiche selectionnee p4.edit.T_mval = []; // tab des mots, pour trier var a = []; // key : mot ; val : nbr d'occurences distinctes @@ -360,7 +360,7 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId) continue; p4.edit.T_records[r].fields[meta_struct_id].sort(SortCompareMetas); - + var values = p4.edit.T_records[r].fields[meta_struct_id].getValues(); for(v in values) @@ -385,7 +385,7 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId) n++; } - + p4.edit.T_mval.sort(SortCompareMetas); var t = ""; @@ -395,7 +395,7 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId) var word = value.getValue(); var key = value.getVocabularyId() + '%' + word; - var extra = value.getVocabularyId() ? '(V) ' : ''; + var extra = value.getVocabularyId() ? ' ' : ''; if(i>0) { @@ -412,38 +412,38 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId) } } - t += "
" + t += "
" + '
' - + extra - + '' - + word - + "" - + '' - + '' - + "
" + + extra + + '' + + word + + "" + + ' ' + + '' + + "" + "
"; } $('#ZTextMultiValued_values', p4.edit.editBox).html(t); - + $('#ZTextMultiValued_values .add_all', p4.edit.editBox).unbind('click').bind('click', function(){ var container = $(this).closest('div'); - + var span = $('span.value', container) - + var value = span.text(); var vocab_id = span.attr('vocabid'); - + edit_addmval(value, vocab_id); updateFieldDisplay(); return false; }); $('#ZTextMultiValued_values .remove_all', p4.edit.editBox).unbind('click').bind('click', function(){ var container = $(this).closest('div'); - + var span = $('span.value', container) - + var value = span.text(); var vocab_id = span.attr('vocabid'); @@ -451,7 +451,7 @@ function updateCurrentMval(meta_struct_id, HighlightValue, vocabularyId) updateFieldDisplay(); return false; }); - + updateFieldDisplay(); } @@ -544,7 +544,7 @@ function edit_diabutton(record_indice, act, value, vocabularyId) function edit_addmval(value, VocabularyId) { var meta_struct_id = p4.edit.curField; // le champ en cours d'editing - + // on ajoute le mot dans tous les records selectionnes for(var r=0; r= 0) { if(p4.edit.textareaIsDirty && edit_validField(evt, "ask_ok")==false) return; } - + for(r in p4.edit.T_records) { for(f in p4.edit.T_records[r].fields) @@ -1236,7 +1236,7 @@ function edit_cancelMultiDesc(evt) e.style.display = ""; } self.setTimeout("$('#EDITWINDOW').fadeOut();hideOverlay(2);", 100); - + } } @@ -1308,7 +1308,7 @@ function edit_thesaurus_ow(id) // on ouvre ou ferme une branche de thesaurus // on ouvre o.className = "o"; document.getElementById("TH_P."+id).innerHTML = "-"; - + var t_id = id.split("."); var sbas_id = t_id[0]; t_id.shift(); @@ -1328,14 +1328,14 @@ function edit_thesaurus_ow(id) // on ouvre ou ferme une branche de thesaurus function EditThesaurusSeeker(sbas_id) { this.jq = null; - + this.sbas_id = sbas_id; - + var zid = (""+sbas_id).replace(new RegExp("\\.", "g"), "\\.") + "\\.T"; - + this.TH_P_node = $("#TH_P\\." + zid, p4.edit.editBox); this.TH_K_node = $("#TH_K\\." + zid, p4.edit.editBox); - + this._ctimer = null; this.search = function(txt) { @@ -1344,7 +1344,7 @@ function EditThesaurusSeeker(sbas_id) var js = "ETHSeeker.search_delayed('"+txt.replace("'", "\\'")+"');" ; this._ctimer = setTimeout(js, 125); }; - + this.search_delayed = function(txt) { if(this.jq && typeof this.jq.abort == "function") { @@ -1362,7 +1362,7 @@ function EditThesaurusSeeker(sbas_id) }; var me = this; - + this.jq = $.ajax({ url: url, data: parms, @@ -1425,11 +1425,11 @@ function replace() var field = $("#EditSRField", p4.edit.editBox).val(); var search = $("#EditSearch", p4.edit.editBox).val(); var replace = $("#EditReplace", p4.edit.editBox).val(); - + var where = $("[name=EditSR_Where]:checked", p4.edit.editBox).val(); var commut = ""; var rgxp = $("#EditSROptionRX", p4.edit.editBox).attr('checked') ? true : false; - + var r_search; if(rgxp) { @@ -1451,9 +1451,9 @@ function replace() if(where == "exact") r_search = "^" + r_search + "$"; } - + search = new RegExp(r_search, commut); - + var r, f; for(r in p4.edit.T_records) { @@ -1472,8 +1472,8 @@ function replace() function changeReplaceMode(ckRegExp) { - - + + if(ckRegExp.checked) { $("#EditSR_TX", p4.edit.editBox).hide(); @@ -1513,7 +1513,7 @@ function preset_paint(data) return false; } ); - + $(".EDIT_presets_list A.title").dblclick( function() { @@ -1523,7 +1523,7 @@ function preset_paint(data) return false; } ); - + $(".EDIT_presets_list A.delete").click( function() { @@ -1562,14 +1562,14 @@ function preset_load(preset_id) "act":"LOAD", "presetid":preset_id }; - + $.getJSON( "/xmlhttp/editing_presets.j.php", p, function(data, textStatus) { $("#Edit_copyPreset_dlg").dialog("close"); - + for(i in p4.edit.T_fields) { p4.edit.T_fields[i].preset = null; @@ -1624,7 +1624,7 @@ function hsplit1() function vsplit1() { $('#divS_wrapper').height('auto'); - + var el = $('#divS_wrapper'); if(el.length == 0) return; @@ -1649,27 +1649,27 @@ function setPreviewEdit() { if(!$('#TH_Opreview').is(':visible')) return false; - + var selected = $('#EDIT_FILM2 .diapo.selected'); - + if(selected.length != 1) { return; } var id = selected.attr('id').split('_').pop(); - + var container = $('#TH_Opreview'); var zoomable = $('img.record.zoomable', container); - + if(zoomable.length > 0 && zoomable.hasClass('zoomed')) return; - + // var datas = p4.edit.T_records[id].preview; - + var h = parseInt($('input[name=height]', container).val()); var w = parseInt($('input[name=width]', container).val()); - + // if(datas.doctype == 'video') // { // var h = parseInt(datas.height); @@ -1680,7 +1680,7 @@ function setPreviewEdit() var margX = 0; var margY = 0; - + if($('img.record.record_audio', container).length > 0) { var margY = 100; @@ -1690,13 +1690,13 @@ function setPreviewEdit() var display_box = $('#TH_Opreview .PNB10'); var dwidth = display_box.width(); var dheight = display_box.height(); - - + + // if(datas.doctype != 'flash') // { var ratioP = w / h; var ratioD = dwidth / dheight; - + if (ratioD > ratioP) { //je regle la hauteur d'abord if ((parseInt(h) + margY) > dheight) { @@ -1725,14 +1725,14 @@ function setPreviewEdit() top: t, left: l }).attr('width',w).attr('height',h); - + } function previewEdit(r) { - + $('#TH_Opreview .PNB10').empty().append(p4.edit.T_records[r].preview); - + // var data = p4.edit.T_records[r].preview; // if ((data.doctype == 'video' || data.doctype == 'audio' || data.doctype == 'flash')) { @@ -1776,7 +1776,7 @@ function previewEdit(r) // }); // } // } - + if($('img.PREVIEW_PIC.zoomable').length > 0) { $('img.PREVIEW_PIC.zoomable').draggable(); @@ -1791,11 +1791,11 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) p4.edit.what = what; p4.edit.regbasprid = regbasprid; p4.edit.ssel = ssel; - + for(r in p4.edit.T_records) { var fields = {}; - + for(f in p4.edit.T_records[r].fields) { var meta_struct_id = p4.edit.T_records[r].fields[f].meta_struct_id; @@ -1813,21 +1813,21 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) var vocabularyRestricted = p4.edit.T_fields[meta_struct_id].vocabularyRestricted; var fieldOptions = { - multi:multi, - required:required, - readonly:readonly, - maxLength:maxLength, - minLength:minLength, - type:type, - separator:separator, - vocabularyControl:vocabularyControl, + multi:multi, + required:required, + readonly:readonly, + maxLength:maxLength, + minLength:minLength, + type:type, + separator:separator, + vocabularyControl:vocabularyControl, vocabularyRestricted:vocabularyRestricted }; var databoxField = new p4.databoxField(name, meta_struct_id, fieldOptions); - + var values = []; - + for(v in p4.edit.T_records[r].fields[f].values) { var meta_id = p4.edit.T_records[r].fields[f].values[v].meta_id; @@ -1836,21 +1836,21 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) values.push(new p4.recordFieldValue(meta_id, value, vocabularyId)); } - + fields[f] = new p4.recordField(databoxField, values); } - + p4.edit.T_records[r].fields = fields; p4.edit.fields = fields; - + } - + $('#EditTextMultiValued').bind('keyup', function(){ reveal_mval($(this).val()); }); - + $('#EDIT_MID_R .tabs').tabs(); - + $('#divS div.edit_field:odd').addClass('odd'); $('#divS div').bind('mouseover',function(){ $(this).addClass('hover'); @@ -1859,22 +1859,22 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) }); $('#editcontextwrap').remove(); - + if($('#editcontextwrap').length == 0) $('body').append('
'); - + self.setTimeout("edit_select_all();", 100); $('.previewTips, .DCESTips, .fieldTips', p4.edit.editBox).tooltip({ - fixable:true, + fixable:true, fixableIndex:1200 }); $('.infoTips', p4.edit.editBox).tooltip(); - + if(p4.edit.what == 'GRP') { $('#EDIT_FILM2 .reg_opts').show(); - + $.each($('#EDIT_FILM2 .contextMenuTrigger'),function(){ var id = $(this).attr('id').split('_').slice(1,3).join('_'); @@ -1890,7 +1890,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) }); }); } - + $('#EDIT_TOP', p4.edit.editBox).resizable({ handles : 's', minHeight:100, @@ -1904,7 +1904,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) setSizeLimits(); } }); - + $('#divS_wrapper', p4.edit.editBox).resizable({ handles : 'e', minWidth:200, @@ -1918,7 +1918,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) setSizeLimits(); } }); - + $('#EDIT_MID_R', p4.edit.editBox).resizable({ handles : 'w', minWidth:200, @@ -1932,7 +1932,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) setSizeLimits(); } }); - + $('#EDIT_ZOOMSLIDER', p4.edit.editBox).slider({ min:60, max:300, @@ -1948,7 +1948,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) setPref("editing_images_size", p4.edit.diapoSize); } }); - + var buttons = {}; buttons[language.valider] = function(e) { @@ -1969,7 +1969,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) modal:true, buttons: buttons }); - + var buttons = {}; buttons[language.valider] = function() { @@ -1981,7 +1981,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) jtitle[0].focus(); return; } - + var p = { "act":"SAVE", "sbas":p4.edit.sbas_id, @@ -2029,9 +2029,9 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) buttons[language.annuler] = function() { $(this).dialog("close"); - + }; - + $("#Edit_copyPreset_dlg", p4.edit.editBox).dialog( { zIndex:5000, stack:true, @@ -2048,15 +2048,15 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) }, buttons:buttons }); - + $('#idEditDateZone', p4.edit.editBox).datepicker({ changeYear: true, changeMonth:true, dateFormat: 'yy/mm/dd', onSelect: function(dateText, inst) { - - + + var lval = $('#idEditZTextArea', p4.edit.editBox).val(); if(lval != dateText) { @@ -2068,7 +2068,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) } } }); - + $('input.input-button').hover( function(){ $(this).addClass('hover'); @@ -2077,7 +2077,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) $(this).removeClass('hover'); } ); - + ETHSeeker = new EditThesaurusSeeker(p4.edit.sbas_id); hsplit1(); @@ -2104,7 +2104,7 @@ function startThisEditing(sbas_id,what,regbasprid,ssel) $('#TH_Opresets button.adder').button().bind('click', function(){ preset_copy(); }); - + try{ $('#divS .edit_field:first').trigger('mousedown'); } @@ -2122,7 +2122,7 @@ function setRegDefault(n,record_id) var src = $('#idEditDiapo_'+n).find('img.edit_IMGT').attr('src'); var style = $('#idEditDiapo_'+n).find('img.edit_IMGT').attr('style'); - + $('#EDIT_GRPDIAPO .edit_IMGT').attr('src',src).attr('style',style); } diff --git a/www/skins/icons/minus11.png b/www/skins/icons/minus11.png new file mode 100644 index 0000000000..101b7acfaa Binary files /dev/null and b/www/skins/icons/minus11.png differ diff --git a/www/skins/icons/minus16.png b/www/skins/icons/minus16.png new file mode 100644 index 0000000000..a4b54b1928 Binary files /dev/null and b/www/skins/icons/minus16.png differ diff --git a/www/skins/icons/plus11.png b/www/skins/icons/plus11.png new file mode 100644 index 0000000000..bd1e225766 Binary files /dev/null and b/www/skins/icons/plus11.png differ diff --git a/www/skins/icons/plus16.png b/www/skins/icons/plus16.png new file mode 100644 index 0000000000..9a5834580d Binary files /dev/null and b/www/skins/icons/plus16.png differ diff --git a/www/skins/icons/ressource16.png b/www/skins/icons/ressource16.png new file mode 100644 index 0000000000..f51e781cb6 Binary files /dev/null and b/www/skins/icons/ressource16.png differ