issue #0001219 : Rearrange criteres

application/views/default/scripts/economique/index.phtml

@@ -1,18 +1,15 @@
 <div id="economique">
-	<div id="s_economique">
 	<ul id="fieldsblock">
 		<li><?=$this->Field('capital')?></li>
-			<li><?=$this->Field('ape_etab')?></li>
 		<li><?=$this->Field('ape_entrep')?></li>
-			<li><?=$this->Field('age_etab')?></li>
+		<li class="advanced"><?=$this->Field('ape_etab')?></li>
-			<li><?=$this->Field('teff_etab')?></li>
-			<li><?=$this->Field('eff_etab')?></li>
-		<div id="a_economique" style="display:none;">
 		<li><?=$this->Field('age_entrep')?></li>
+		<li class="advanced"><?=$this->Field('age_etab')?></li>
 		<li><?=$this->Field('teff_entrep')?></li>
+		<li class="advanced"><?=$this->Field('teff_etab')?></li>
 		<li><?=$this->Field('eff_entrep')?></li>
-			<li><?=$this->Field('nbEtab')?></li>
+		<li class="advanced"><?=$this->Field('eff_etab')?></li>
-		</div>
+		<li class="advanced"><?=$this->Field('nbEtab')?></li>
 	</ul>
 	<p>
 		<a class="mode" id="a_economique" style="cursor:pointer;margin-left:50%">
@@ -20,7 +17,6 @@
 		</a>
 	</p>
 </div>
-</div>
 <div style="text-align:right;margin-top:20px;">
 	<a class="resetFamille" id="economique">Réinitialiser les critères economiques</a>
 </div>

application/views/default/scripts/financier/index.phtml

@@ -1,5 +1,4 @@
 <div id="financiere">
-	<div id="s_financier">
 	<ul id="fieldsblock">
 		<li><?=$this->Field('bilType')?></li>
 		<li><?=$this->Field('avisCs')?></li>
@@ -8,24 +7,19 @@
 		<li><?=$this->Field('bilDuree')?></li>
 		<li><?=$this->Field('bilTca')?></li>
 		<li><?=$this->Field('bilFL')?></li>
+		<li class="advanced"><?=$this->Field('bilEE')?></li>
+		<li class="advanced"><?=$this->Field('bilFK')?></li>
+		<li class="advanced"><?=$this->Field('bilFR')?></li>
+		<li class="advanced"><?=$this->Field('bilGF')?></li>
+		<li class="advanced"><?=$this->Field('bilGP')?></li>
+		<li class="advanced"><?=$this->Field('bilGW')?></li>
+		<li class="advanced"><?=$this->Field('bilHD')?></li>
+		<li class="advanced"><?=$this->Field('bilHH')?></li>
+		<li class="advanced"><?=$this->Field('bilHL')?></li>
+		<li class="advanced"><?=$this->Field('bilHM')?></li>
+		<li class="advanced"><?=$this->Field('bilHN')?></li>
+		<li class="advanced"><?=$this->Field('bilYP')?></li>
 	</ul>
-	</div>
-	<div id="a_financiere" style="display:none">
-		<ul id="fieldsblock">
-			<li><?=$this->Field('bilEE')?></li>
-			<li><?=$this->Field('bilFK')?></li>
-			<li><?=$this->Field('bilFR')?></li>
-			<li><?=$this->Field('bilGF')?></li>
-			<li><?=$this->Field('bilGP')?></li>
-			<li><?=$this->Field('bilGW')?></li>
-			<li><?=$this->Field('bilHD')?></li>
-			<li><?=$this->Field('bilHH')?></li>
-			<li><?=$this->Field('bilHL')?></li>
-			<li><?=$this->Field('bilHM')?></li>
-			<li><?=$this->Field('bilHN')?></li>
-			<li><?=$this->Field('bilYP')?></li>
-		</ul>
-	</div>
 	<p>
 		<a class="mode" id="a_financiere" style="cursor:pointer;margin-left:50%">
 			<img src="/themes/default/images/fleche-bas.gif" />

application/views/default/scripts/juridique/index.phtml

@@ -1,17 +1,11 @@
 <div id="juridique">
-	<div id="s_juridique">
     <ul id="fieldsblock">
     	<li><?=$this->Field('cj')?></li>
     	<li><?=$this->Field('actifEco')?></li>
     	<li><?=$this->Field('procolHisto')?></li>
     	<li><?=$this->Field('dateImmat')?></li>
+    	<li class="advanced"><?=$this->Field('tvaIntraValide')?></li>
     </ul>
-	</div>
-	<div id="a_juridique" style="display:none">
-		<ul id="fieldsblock">
-			<li><?=$this->Field('tvaIntraValide')?></li>
-		</ul>
-	</div>
 	<p>
 		<a class="mode" id="a_juridique" style="cursor:pointer;margin-left:50%">
 			<img src="/themes/default/images/fleche-bas.gif" />

public/themes/default/scripts/scripts.js

@@ -54,19 +54,22 @@ $(document).ready(function(){
 	});
 	
 	$('.mode').click(function() {
-		var id = $(this).attr('id');
+		var mode = 0;
-		
+		$('ul#fieldsblock li').each(function() {
-		
+			if ($(this).attr('class')=='advanced') {
-		
+				if($(this).css('display')=='none') {
-		
+					$(this).css('display', 'block');
-		if($('#'+id).css('display') == 'none') {
+					mode++;
-			$('#'+id).show('blind');
+				} else {
+					$(this).css('display', 'none');
+				}
+			}
+		});
+		if (mode==0) {
+			$(this).html('<img src="/themes/default/images/fleche-bas.gif" />');
+		} else {
 			$(this).html('<img src="/themes/default/images/fleche-haut.gif" />');
 		}
-		else {
-			$('#'+id).hide('blind');
-			$(this).html('<img src="/themes/default/images/fleche-bas.gif" />');
-		}
 	});
 });
 

public/themes/default/styles/main.css

@@ -254,6 +254,10 @@ ul#fieldsblock li:hover {
     background-color:#9EC5FF;
 }
 
+ul#fieldsblock li.advanced {
+    display:none;
+}
+
 ul#fieldsblock li div.fieldgrp {
     clear: both;
     width: 100%;