Skip to content

Commit

Permalink
Aggiornamneto layout bootstrap
Browse files Browse the repository at this point in the history
  • Loading branch information
@mspasiano
mspasiano committed May 10, 2017
1 parent 94b60c7 commit c484e3c
Show file tree
Hide file tree
Showing 7 changed files with 298 additions and 255 deletions.
454 changes: 237 additions & 217 deletions sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/CRUDFatturaAttivaIBP.java
View file

Large diffs are not rendered by default.

7 changes: 0 additions & 7 deletions sigla-ejb/src/main/java/it/cnr/contab/docamm00/bp/CRUDFatturaPassivaIBP.java
View file
Expand Up @@ -364,13 +364,6 @@ public void writeToolbar(javax.servlet.jsp.JspWriter writer) throws java.io.IOEx
writeFPToolbar(writer);
writeFPInventarioToolbar(writer);
}

@Override
public void writeToolbar(PageContext pagecontext) throws IOException, ServletException {
super.writeToolbar(pagecontext);
writeFPToolbar(pagecontext.getOut());
writeFPInventarioToolbar(pagecontext.getOut());
}

public boolean isCreaCompensoButtonEnabled() {

Expand Down
2 changes: 2 additions & 0 deletions sigla-ejb/src/main/java/it/cnr/contab/pdg01/bp/SelezionatoreAssestatoBP.java
View file
Expand Up @@ -328,6 +328,8 @@ public void setEditable(boolean newEditable) {
public String getFormTitle(){
String title = BulkInfo.getBulkInfo(V_assestatoBulk.class).getLongDescription();
title = title.concat(" - " + (isGestioneSpesa()?"Spese":"Entrate"));
if (this.getParentRoot().isBootstrap())
return title;
return "<script>document.write(\""+title+"\")</script>";
}
public AssestatoReplacer getAssestatoReplacer() {
Expand Down
5 changes: 1 addition & 4 deletions sigla-ejb/src/main/java/it/cnr/contab/reports/bp/PrintSpoolerBP.java
View file
Expand Up @@ -120,10 +120,7 @@ public void writeToolbar(javax.servlet.jsp.PageContext pageContext) throws java.
toolbar[1].setHref("doPrint('"+ JSPUtils.getAppRoot((HttpServletRequest) pageContext.getRequest()) + "offline_report/"+print_spool.getNomeFile()+"?pg="+print_spool.getPgStampa().longValue()+"')");
else
toolbar[1].setHref(null);
if (HttpActionContext.isFromBootstrap(pageContext))
writeToolbarBootstrap(pageContext.getOut(), Arrays.asList(toolbar));
else
writeToolbar(pageContext.getOut(), toolbar);
writeToolbar(pageContext.getOut(), toolbar);
}
public void sign(ActionContext context) throws BusinessProcessException {
try {
Expand Down
1 change: 1 addition & 0 deletions sigla-ejb/src/main/resources/it/cnr/contab/anagraf00/bp/CRUDAnagraficaBP.properties
View file
Expand Up @@ -7,6 +7,7 @@ CRUDToolbar.terzi.enabledProperty=terziButtonEnabled
CRUDToolbar.terzi.title=Terzi
CRUDToolbar.terzi.accessKey=T
CRUDToolbar.terzi.iconClass=fa fa-2x fa-fw fa-external-link
CRUDToolbar.terzi.buttonClass=btn-secondary btn-title

CRUDToolbar.elenco.img=img/bringback24.gif
CRUDToolbar.elenco.disabledImg=img/bringback24.gif
Expand Down
16 changes: 16 additions & 0 deletions sigla-ejb/src/main/resources/it/cnr/contab/docamm00/bp/CRUDFatturaAttivaIBP.properties
View file
Expand Up @@ -9,6 +9,8 @@ CRUDToolbar.generaNdC.separator=true
CRUDToolbar.generaNdC.labelPosition=right
CRUDToolbar.generaNdC.title=Genera Nota Credito
CRUDToolbar.generaNdC.accessKey=C
CRUDToolbar.generaNdC.iconClass=fa fa-plus-square
CRUDToolbar.generaNdC.buttonClass=btn-sm btn-primary btn-title

CRUDToolbar.apriNdC.img=img/paste16.gif
CRUDToolbar.apriNdC.disabledImg=img/paste16.gif
Expand All @@ -20,6 +22,8 @@ CRUDToolbar.apriNdC.enabledProperty=apriNdCButtonEnabled
CRUDToolbar.apriNdC.labelPosition=right
CRUDToolbar.apriNdC.title=Apri Nota Credito
CRUDToolbar.apriNdC.accessKey=A
CRUDToolbar.apriNdC.iconClass=fa fa-external-link-square
CRUDToolbar.apriNdC.buttonClass=btn-sm btn-success btn-title

CRUDToolbar.generaNdCAut.img=img/paste16.gif
CRUDToolbar.generaNdCAut.disabledImg=img/paste16.gif
Expand All @@ -31,6 +35,8 @@ CRUDToolbar.generaNdCAut.enabledProperty=generaNdCButtonEnabled
CRUDToolbar.generaNdCAut.labelPosition=right
CRUDToolbar.generaNdCAut.title=Nota Credito Automatica
CRUDToolbar.generaNdCAut.accessKey=u
CRUDToolbar.generaNdCAut.iconClass=fa fa-bolt
CRUDToolbar.generaNdCAut.buttonClass=btn-sm btn-primary btn-title

CRUDToolbar.generaNdD.img=img/paste16.gif
CRUDToolbar.generaNdD.disabledImg=img/paste16.gif
Expand All @@ -43,6 +49,8 @@ CRUDToolbar.generaNdD.separator=true
CRUDToolbar.generaNdD.labelPosition=right
CRUDToolbar.generaNdD.title=Genera Nota Debito
CRUDToolbar.generaNdD.accessKey=D
CRUDToolbar.generaNdD.iconClass=fa fa-plus-square
CRUDToolbar.generaNdD.buttonClass=btn-sm btn-primary btn-title

CRUDToolbar.apriNdD.img=img/paste16.gif
CRUDToolbar.apriNdD.disabledImg=img/paste16.gif
Expand All @@ -54,6 +62,8 @@ CRUDToolbar.apriNdD.enabledProperty=apriNdDButtonEnabled
CRUDToolbar.apriNdD.labelPosition=right
CRUDToolbar.apriNdD.title=Apri Nota Debito
CRUDToolbar.apriNdD.accessKey=b
CRUDToolbar.apriNdD.iconClass=fa fa-external-link-square
CRUDToolbar.apriNdD.buttonClass=btn-sm btn-success btn-title

CRUDToolbar.inventaria.img=img/information16.gif
CRUDToolbar.inventaria.disabledImg=img/information16.gif
Expand All @@ -66,6 +76,8 @@ CRUDToolbar.inventaria.separator=true
CRUDToolbar.inventaria.labelPosition=right
CRUDToolbar.inventaria.title=Inventaria
CRUDToolbar.inventaria.accessKey=I
CRUDToolbar.inventaria.iconClass=fa fa-star
CRUDToolbar.inventaria.buttonClass=btn-sm btn-primary btn-title

CRUDToolbar.associaInventario.img=img/information16.gif
CRUDToolbar.associaInventario.disabledImg=img/information16.gif
Expand All @@ -77,6 +89,8 @@ CRUDToolbar.associaInventario.enabledProperty=associaInventarioButtonEnabled
CRUDToolbar.associaInventario.labelPosition=right
CRUDToolbar.associaInventario.title=Associa
CRUDToolbar.associaInventario.accessKey=o
CRUDToolbar.associaInventario.iconClass=fa fa-star
CRUDToolbar.associaInventario.buttonClass=btn-sm btn-primary btn-title

CRUDToolbar.beni_coll.img=img/information16.gif
CRUDToolbar.beni_coll.disabledImg=img/information16.gif
Expand All @@ -87,3 +101,5 @@ CRUDToolbar.beni_coll.hiddenProperty=beni_collButtonHidden
CRUDToolbar.beni_coll.enabledProperty=beni_collButtonEnabled
CRUDToolbar.beni_coll.separator=true
CRUDToolbar.beni_coll.labelPosition=right
CRUDToolbar.beni_coll.iconClass=fa fa-folder-open-o
CRUDToolbar.beni_coll.buttonClass=btn-sm btn-warning btn-title
68 changes: 41 additions & 27 deletions sigla-web/src/main/webapp/util/page_expired.jsp
View file
Expand Up @@ -19,33 +19,47 @@ restoreWorkspace();
BusinessProcess.encode(bp,pageContext); %>
<input type="hidden" name="comando" value="doDefault">
<table class="Window card col-5" cellspacing="0" cellpadding="2" align="center" width="280">
<tr><td class="FormTitle card-header h5">Informazione</td></tr>
<tr>
<td align="center">
<table class="Panel" width="100%">
<tr>
<td valign="center">
<%if (bp.getParentRoot().isBootstrap()) { %>
<i class="fa fa-exclamation-circle fa-fw fa-2x text-danger" aria-hidden="true"></i>
<%} else {%>
<img src="img/error.gif">
<%}%>
</td>
<td valign="center h5" width="100%">
Pagina scaduta.
<br>E' stata richiesta una operazione da una pagina non più valida.
<% if (bp != null) { %>
<br>Per ritornare alla pagina corrente premere il bottone 'chiudi'.
<% } %>
</td>
</tr>
</table>
<hr>
<% if (bp != null) { %>
<button class="btn btn-primary" onclick="if (disableDblClick()) submitForm('doDefault')">Chiudi</button>
<% } %>
</td>
</tr>
<tbody>
<tr>
<td class="FormTitle card-header h5">Informazione</td>
</tr>
<tr>
<td align="center">
<table class="Panel" width="100%">
<tr>
<td valign="center">
<%if (bp.getParentRoot().isBootstrap()) { %>
<i class="fa fa-exclamation-circle fa-fw fa-2x text-danger" aria-hidden="true"></i>
<%} else {%>
<img src="img/error.gif">
<%}%>
</td>
<td valign="center h5" width="100%">
Pagina scaduta.
<br>E' stata richiesta una operazione da una pagina non più valida.
<% if (bp != null) { %>
<br>Per ritornare alla pagina corrente premere il bottone 'chiudi'.
<% } %>
</td>
</tr>
</table>
</td>
</tr>
<tr>
<td align=center>
<hr>
<table class="Panel" width="100%">
<tr>
<% if (bp != null) { %>
<td>
<button class="btn btn-primary btn-block" onclick="if (disableDblClick()) submitForm('doDefault')">Chiudi</button>
</td>
<% } %>
</tr>
</table>
</td>
</tr>
</tbody>
</table>
</form>
</body>
Expand Down

0 comments on commit c484e3c

Please sign in to comment.