scores/odea
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

issue #0001285 : Affichage des infobulles à droites et correction conflit sur element list

Browse Source
This commit is contained in:
Michael RICOIS 2012-08-22 09:48:54 +00:00
parent f0bd4fc3dc
commit 117dec028d
2 changed files with 18 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/Scores/Fields.php
View File

@ -463,15 +463,23 @@ Les zones urbaines sensibles constituent un sous-ensemble de l'ensemble plus lar
* Forme Juridique
*/
'cj' => array(
'label' => 'Forme Juridique',
'fields' => array(
'tree' => array('value' => null, 'action' => 'juridique', 'title' => "Arborescence des Formes Juridiques"),
'text' => array('value' => null, 'label' => "Recherche", 'title'=>"Recherche des Formes Juridiques"),
),
'famille' => 'juridique',
'activated' => true,
'label' => 'Forme Juridique',
'fields' => array(
'tree' => array('value' => null, 'action' => 'juridique', 'title' => "Arborescence des Formes Juridiques"),
'text' => array('value' => null, 'label' => "Recherche", 'title'=>"Recherche des Formes Juridiques"),
),
'famille' => 'juridique',
'activated' => true,
),
'cjliste' => array(
'label' => 'Liste de formes juridique',
'fields' => array(
'list' => array(),
),
'famille' => 'juridique',
'title' => 'Liste de codes formes juridiques séparés des virgules ou des points-virgules',
'activated' => true,
),
'actifEco' => array(
'label' => 'Établissement économiquement actif',
'fields' => array(

15
public/themes/default/scripts/fields.js
View File

@ -11,7 +11,7 @@ $(document).ready(function()
solo:true, content: title,
style: { width: 600, classes: "ui-tooltip-dark" },
position: {
my: "top right",
my: "top left",
at: "bottom right",
viewport : $(window),
effect: false
@ -158,17 +158,6 @@ $(document).ready(function()
return false;
});
//@todo : We have two event bind on each element why ?
$('.intervalSelect').change(function(){
var key = $(this).attr('id');
var number = $(this).attr('number');
if(number == 1) {
$('span#'+key).html(' <span id="'+key+'"><a href="" class="intervalSelect" id="'+key+'">Valider</a></span>');
}else {
$('span#'+key).html(' <span id="'+key+'"><a href="" class="intervalSelect" id="'+key+'">Valider</a></span>');
}
});
$('#tabs').delegate('a.intervalSelect', 'click', function(e){
e.preventDefault();
var key = $(this).attr('id');
@ -219,7 +208,7 @@ $(document).ready(function()
}
});
$('#tabs').delegate('a.list', 'click', function(e) {
$('#tabs').delegate('a.dlist', 'click', function(e) {
e.preventDefault();
var id = $(this).attr('id');
if ($('div#field_list_'+id).css('display') == 'none') {