Aggiornamneto layout bootstrap

consiglionazionaledellericerche · May 4, 2017 · f8b96fd · f8b96fd
1 parent 89dc76c
commit f8b96fd
Show file tree

Hide file tree

Showing 58 changed files with 282 additions and 260 deletions.
diff --git a/...b/src/main/resources/it/cnr/contab/doccont00/bp/AbstractFirmaDigitaleDocContBP.properties b/...b/src/main/resources/it/cnr/contab/doccont00/bp/AbstractFirmaDigitaleDocContBP.properties
@@ -5,6 +5,7 @@ Toolbar.refresh.href=javascript:submitForm('doRefresh')
 Toolbar.refresh.style=width:60px;
 Toolbar.refresh.title=Aggiorna
 Toolbar.refresh.accessKey=A
+Toolbar.refresh.iconClass=fa fa-2x fa-fw fa-refresh text-info
 
 Toolbar.predisponi.img=img/print24.gif
 Toolbar.predisponi.disabledImg=img/print24.gif
@@ -14,6 +15,7 @@ Toolbar.predisponi.style=width:90px;
 Toolbar.predisponi.enabledProperty=predisponiButtonEnabled
 Toolbar.predisponi.title=Predisponi per la Firma
 Toolbar.predisponi.accessKey=P
+Toolbar.predisponi.iconClass=fa fa-2x fa-fw fa-print text-info
 
 Toolbar.pdfdocumenti.img=img/application-pdf.png
 Toolbar.pdfdocumenti.disabledImg=img/application-pdf.png
@@ -23,6 +25,7 @@ Toolbar.pdfdocumenti.href=javascript:doVisualizzaDocumenti();
 Toolbar.pdfdocumenti.style=width:80px;
 Toolbar.pdfdocumenti.title=Visualizza Documenti
 Toolbar.pdfdocumenti.accessKey=D
+Toolbar.pdfdocumenti.iconClass=fa fa-2x fa-fw fa-file-pdf-o text-info
 
 Toolbar.zipdocumenti.img=img/zip.png
 Toolbar.zipdocumenti.disabledImg=img/zip.png
@@ -32,6 +35,7 @@ Toolbar.zipdocumenti.href=javascript:doVisualizzaDocumenti();
 Toolbar.zipdocumenti.style=width:80px;
 Toolbar.zipdocumenti.title=Scarica Documenti
 Toolbar.zipdocumenti.accessKey=D
+Toolbar.zipdocumenti.iconClass=fa fa-2x fa-fw fa-file-zip-o text-info
 
 Toolbar.detail.img=img/import24.gif
 Toolbar.detail.disabledImg=img/import24.gif
@@ -41,6 +45,8 @@ Toolbar.detail.style=width:60px;
 Toolbar.detail.enabledProperty=detailButtonEnabled
 Toolbar.detail.title=Dettagli Predisposizione
 Toolbar.detail.accessKey=T
+Toolbar.detail.iconClass=fa fa-2x fa-fw fa-list-ul text-warning
+
 
 Toolbar.sign.img=img/sign24.gif
 Toolbar.sign.disabledImg=img/sign24.gif
@@ -50,6 +56,7 @@ Toolbar.sign.style=width:60px;
 Toolbar.sign.enabledProperty=signButtonEnabled
 Toolbar.sign.title=Firma
 Toolbar.sign.accessKey=F
+Toolbar.sign.iconClass=fa fa-2x fa-fw fa-pencil text-primary
 
 Toolbar.delete.img=img/delete24.gif
 Toolbar.delete.disabledImg=img/delete24.gif
@@ -59,6 +66,8 @@ Toolbar.delete.style=width:100px;
 Toolbar.delete.hiddenProperty=deleteButtonHidden
 Toolbar.delete.title=Annulla Predisposizione
 Toolbar.delete.accessKey=A
+Toolbar.delete.iconClass=fa fa-2x fa-fw fa-trash text-danger
+
 
 Toolbar.deletesign.img=img/delete24.gif
 Toolbar.deletesign.disabledImg=img/delete24.gif
@@ -68,3 +77,5 @@ Toolbar.deletesign.style=width:100px;
 Toolbar.deletesign.hiddenProperty=deleteSignButtonHidden
 Toolbar.deletesign.title=Annulla Firma
 Toolbar.deletesign.accessKey=A
+Toolbar.deletesign.iconClass=fa fa-2x fa-fw fa-trash-o text-danger
+
diff --git a/sigla-ejb/src/main/resources/it/cnr/contab/util00/bulk/cmis/AllegatoGenericoBulkInfo.xml b/sigla-ejb/src/main/resources/it/cnr/contab/util00/bulk/cmis/AllegatoGenericoBulkInfo.xml
@@ -51,6 +51,7 @@
 		enabledOnView="true"
 		readonlyProperty="nodeNotPresent"
 		img="img/import24.gif"
+		iconClass="fa fa-fw fa-2x fa-download text-primary"		
 		href="javascript:doScaricaFile()"
 		label="Apri File" />
 

diff --git a/sigla-web/src/main/webapp/anagraf00/tab_anagrafica.jsp b/sigla-web/src/main/webapp/anagraf00/tab_anagrafica.jsp
@@ -19,7 +19,7 @@
 <legend class="GroupLabel card-header h3 text-primary">Tipologia</legend>
 	<table class="card-block">
 		<tr>
-			<td><%bp.getController().writeFormInput(out,"default","ti_entita",false,"FormInput","onclick=\"submitForm('doCambiaTi_entita')\"");%></td>
+			<td><%bp.getController().writeFormInput(out,"default","ti_entita",false,null,"onclick=\"submitForm('doCambiaTi_entita')\"");%></td>
 			 	<td>
 					<% if (anagrafico.getDt_fine_rapporto()!=null) { %>
 						<span class="FormLabel" style="color:red">
@@ -40,11 +40,11 @@
 	<%} %>
 	<%if (anagrafico.isPersonaFisica() || anagrafico.isDiversi()) {%>
 		<tr>
-			<td><%bp.getController().writeFormInput(out,"default","ti_entita_fisica",false,"FormInput","onclick=\"submitForm('doCambiaTi_entita')\"");%></td>
+			<td><%bp.getController().writeFormInput(out,"default","ti_entita_fisica",false,null,"onclick=\"submitForm('doCambiaTi_entita')\"");%></td>
 		</tr>
 			<%} else if (anagrafico.isPersonaGiuridica()) {%>
 		<tr>
-			<td><%bp.getController().writeFormInput(out,"default","ti_entita_giuridica",false,"FormInput","onclick=\"submitForm('doCambiaTi_entita')\"");%></td>
+			<td><%bp.getController().writeFormInput(out,"default","ti_entita_giuridica",false,null,"onclick=\"submitForm('doCambiaTi_entita')\"");%></td>
 		</tr>
 	<%} %>
 <%if (!anagrafico.isStrutturaCNR()) { %>
@@ -71,7 +71,7 @@
 		</tr>
 		<tr>	
 			<td colspan="2">		
-				<% bp.getController().writeFormInput(out,"default","fl_cervellone",false,"FormInput","onclick=\"submitForm('doCambiaFl_cervellone')\"");%>
+				<% bp.getController().writeFormInput(out,"default","fl_cervellone",false,null,"onclick=\"submitForm('doCambiaFl_cervellone')\"");%>
 				<% bp.getController().writeFormLabel(out,"fl_cervellone");%>
 			</td>	
 		</tr>	
@@ -94,7 +94,7 @@
 		<%if (bp.isAbilitatoAutorizzareDiaria()) { %>	
 			<tr>	
 				<td colspan="2">		
-					<% bp.getController().writeFormInput(out,"default","fl_abilita_diaria_miss_est",false,"FormInput","onclick=\"submitForm('doCambiaFl_abilita_diaria_miss_est')\"");%>
+					<% bp.getController().writeFormInput(out,"default","fl_abilita_diaria_miss_est",false,null,"onclick=\"submitForm('doCambiaFl_abilita_diaria_miss_est')\"");%>
 					<% bp.getController().writeFormLabel(out,"fl_abilita_diaria_miss_est");%>
 				</td>	
 			</tr>	

diff --git a/sigla-web/src/main/webapp/chiusura00/annullamento_massivo.jsp b/sigla-web/src/main/webapp/chiusura00/annullamento_massivo.jsp
@@ -40,7 +40,7 @@
 		<tr>
 		   <td></td>
 		   <td>
-		      <% bp.getController().writeFormInput(out,"default","fl_ente",false,"FormInput","onclick=\"submitForm('doDefault')\""); %>
+		      <% bp.getController().writeFormInput(out,"default","fl_ente",false,null,"onclick=\"submitForm('doDefault')\""); %>
 		      <% bp.getController().writeFormLabel( out, "fl_ente"); %>
 		   </td>
 

diff --git a/sigla-web/src/main/webapp/chiusura00/riporto_es_precedente.jsp b/sigla-web/src/main/webapp/chiusura00/riporto_es_precedente.jsp
@@ -39,7 +39,7 @@
 	   <% if ( !modello.isEnteInScrivania() ) { %>
 		<tr>
 		   <td><% bp.getController().writeFormLabel( out, "fl_ente"); %></td>		
-		   <td><% bp.getController().writeFormInput(out,"default","fl_ente",false,"FormInput","onclick=\"submitForm('doDefault')\""); %></td>
+		   <td><% bp.getController().writeFormInput(out,"default","fl_ente",false,null,"onclick=\"submitForm('doDefault')\""); %></td>
 
 		</tr>
 		<tr>

diff --git a/sigla-web/src/main/webapp/chiusura00/riporto_es_successivo.jsp b/sigla-web/src/main/webapp/chiusura00/riporto_es_successivo.jsp
@@ -39,7 +39,7 @@
 	   <% if ( !modello.isEnteInScrivania() ) { %>
 		<tr>
 		   <td><% bp.getController().writeFormLabel( out, "fl_ente"); %></td>		
-		   <td><% bp.getController().writeFormInput(out,"default","fl_ente", !bp.isUoEnte(),"FormInput","onclick=\"submitForm('doDefault')\""); %></td>
+		   <td><% bp.getController().writeFormInput(out,"default","fl_ente", !bp.isUoEnte(),null,"onclick=\"submitForm('doDefault')\""); %></td>
 
 		</tr>
 		<tr>

diff --git a/sigla-web/src/main/webapp/chiusura00/riporto_evoluto_es_successivo.jsp b/sigla-web/src/main/webapp/chiusura00/riporto_evoluto_es_successivo.jsp
@@ -39,12 +39,12 @@
 	   <% if ( !modello.isEnteInScrivania() ) { %>
 		<tr>
 		   <td><% bp.getController().writeFormLabel( out, "fl_ente"); %></td>		
-		   <td><% bp.getController().writeFormInput(out,"default","fl_ente",!bp.isUoEnte(),"FormInput","onclick=\"submitForm('doAnnullaVoce')\""); %></td>
+		   <td><% bp.getController().writeFormInput(out,"default","fl_ente",!bp.isUoEnte(),null,"onclick=\"submitForm('doAnnullaVoce')\""); %></td>
 
 		</tr>
 		<tr>
 		   <td><% bp.getController().writeFormLabel( out, "ti_gestione"); %></td>		
-		   <td><% bp.getController().writeFormInput(out,"default","ti_gestione",false,"FormInput","onchange=\"submitForm('doAnnullaVoce')\""); %></td>		   
+		   <td><% bp.getController().writeFormInput(out,"default","ti_gestione",false,null,"onchange=\"submitForm('doAnnullaVoce')\""); %></td>		   
 		</tr>
 	   <% } else { %>
 			<tr>

diff --git a/sigla-web/src/main/webapp/coepcoan00/tab_movimenti.jsp b/sigla-web/src/main/webapp/coepcoan00/tab_movimenti.jsp
@@ -13,20 +13,20 @@
 	<td><% bp.getMovimenti().writeFormLabel(out, "cd_voce_ep"); %></td>
 	<td><% bp.getMovimenti().writeFormInput(out, "cd_voce_ep");
 	       bp.getMovimenti().writeFormInput(out, "ds_voce_ep");
-	       bp.getMovimenti().writeFormInput(out,"default", "find_voce_ep", bp.isEditing(), "FormInput", null);
+	       bp.getMovimenti().writeFormInput(out,"default", "find_voce_ep", bp.isEditing(), null, null);
 	       bp.getMovimenti().writeFormLabel(out, "sezione");
-	       bp.getMovimenti().writeFormInput(out,"default", "sezione",bp.isEditing(),"FormInput",null);%></td>
+	       bp.getMovimenti().writeFormInput(out,"default", "sezione",bp.isEditing(),null,null);%></td>
 </tr>
 <tr>
 	<td><% bp.getMovimenti().writeFormLabel(out, "cd_linea_attivita"); %></td>
 	<td><% bp.getMovimenti().writeFormInput(out, "cd_centro_responsabilita");
 		   bp.getMovimenti().writeFormInput(out, "cd_linea_attivita");
 		   bp.getMovimenti().writeFormInput(out, "ds_linea_attivita");
-		   bp.getMovimenti().writeFormInput(out,"default", "find_linea_attivita", bp.isEditing(), "FormInput", null);%></td>	
+		   bp.getMovimenti().writeFormInput(out,"default", "find_linea_attivita", bp.isEditing(), null, null);%></td>	
 </tr>
 <tr>
 	<td><% bp.getMovimenti().writeFormLabel(out, "im_movimento"); %></td>
-	<td><% bp.getMovimenti().writeFormInput(out,"default", "im_movimento", bp.isEditing(), "FormInput",null);%></td>	
+	<td><% bp.getMovimenti().writeFormInput(out,"default", "im_movimento", bp.isEditing(), null,null);%></td>	
 </tr>
 
 </table>
diff --git a/sigla-web/src/main/webapp/coepcoan00/tab_scrittura_analitica.jsp b/sigla-web/src/main/webapp/coepcoan00/tab_scrittura_analitica.jsp
@@ -11,13 +11,13 @@
 
 <tr>
 	<td><% bp.getController().writeFormLabel(out,"ds_scrittura"); %></td>
-	<td><% bp.getController().writeFormInput(out,"default","ds_scrittura",bp.isEditing(),"FormInput", null); %></td>	
+	<td><% bp.getController().writeFormInput(out,"default","ds_scrittura",bp.isEditing(),null, null); %></td>	
 </tr>
 <tr>
 	<td><% bp.getController().writeFormLabel(out,"cd_terzo"); %></td>
-	<td><% bp.getController().writeFormInput(out,"default","cd_terzo", bp.isEditing(),"FormInput", null); 
+	<td><% bp.getController().writeFormInput(out,"default","cd_terzo", bp.isEditing(),null, null); 
 	       bp.getController().writeFormInput(out,"ds_terzo");
-	       bp.getController().writeFormInput(out,"default","find_terzo",bp.isEditing(),"FormInput", null); %></td>
+	       bp.getController().writeFormInput(out,"default","find_terzo",bp.isEditing(),null, null); %></td>
 </tr>
 
 <tr>

diff --git a/sigla-web/src/main/webapp/config00/tab_contratti_allegati.jsp b/sigla-web/src/main/webapp/config00/tab_contratti_allegati.jsp
@@ -52,18 +52,18 @@ function doScaricaAllegato() {
 				</td></tr>					
 				<tr>
 			        <td><% controller.writeFormLabel(out,"default","type"); %></td>
-			        <td colspan="2"><% controller.writeFormInput(out,"default","type", !bp.isAllegatiEnabled(),"FormInput",null); %></td>
+			        <td colspan="2"><% controller.writeFormInput(out,"default","type", !bp.isAllegatiEnabled(),null,null); %></td>
 				</tr>
 				<% if (bulk != null && AllegatoContrattoDocumentBulk.PROGETTO.equals(bulk.getType())){%>
 				<tr>
 			        <td><% controller.writeFormLabel(out,"default","link"); %></td>
-			        <td colspan="2"><% controller.writeFormInput(out,"default","link", !bp.isAllegatiEnabled(),"FormInput",null); %></td>
+			        <td colspan="2"><% controller.writeFormInput(out,"default","link", !bp.isAllegatiEnabled(),null,null); %></td>
 				</tr>
 			    <%}%>
 				<% if (bp.isAllegatiEnabled()){%>
 					<tr>
 				        <td><% controller.writeFormLabel(out,"default","file"); %></td>
-				        <td colspan="2"><% controller.writeFormInput(out,"default","file", !bp.isAllegatiEnabled(),"FormInput",null); %></td>
+				        <td colspan="2"><% controller.writeFormInput(out,"default","file", !bp.isAllegatiEnabled(),null,null); %></td>
 				    </tr>
 			    <%}%>
 				<tr>
@@ -75,11 +75,11 @@ function doScaricaAllegato() {
 			    </tr>
 				<tr>
 			        <td><% controller.writeFormLabel(out,"default","descrizione"); %></td>
-			        <td colspan="2"><% controller.writeFormInput(out,"default","descrizione", !bp.isAllegatiEnabled(),"FormInput",null); %></td>
+			        <td colspan="2"><% controller.writeFormInput(out,"default","descrizione", !bp.isAllegatiEnabled(),null,null); %></td>
 				</tr>
 				<tr>
 			        <td><% controller.writeFormLabel(out,"default","titolo"); %></td>
-			        <td colspan="2"><% controller.writeFormInput(out,"default","titolo", !bp.isAllegatiEnabled(),"FormInput",null); %></td>
+			        <td colspan="2"><% controller.writeFormInput(out,"default","titolo", !bp.isAllegatiEnabled(),null,null); %></td>
 				</tr>
 			</table>  	
 	  	</td>