-
Notifications
You must be signed in to change notification settings - Fork 17
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Convert to Faces 4, remove inline styles and move them to style.css
- Loading branch information
1 parent
24f369e
commit 9c595c1
Showing
6 changed files
with
86 additions
and
93 deletions.
There are no files selected for viewing
25 changes: 11 additions & 14 deletions
25
MetFragWeb/src/main/webapp/includes/dialogs/aboutDialog.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
6 changes: 2 additions & 4 deletions
6
MetFragWeb/src/main/webapp/includes/dialogs/downloadCandidatesDialog.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
57 changes: 27 additions & 30 deletions
57
MetFragWeb/src/main/webapp/includes/dialogs/downloadParametersDialog.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,37 +1,34 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | ||
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" | ||
| xmlns:p="http://primefaces.org/ui"> | ||
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns:h="jakarta.faces.html" | ||
| xmlns:p="http://primefaces.org/ui"> | ||
|
|
||
| <h:body> | ||
| <ui:composition> | ||
| <p:dialog id="downloadParametersDialog" header="Download Parameters" | ||
| widgetVar="downloadParametersDialog" | ||
| modal="true" resizable="false" style="text-align: center;"> | ||
| <h:form id="downloadParametersForm" enctype="multipart/form-data"> | ||
| <p:commandLink ajax="false" onclick="PrimeFaces.monitorDownload(startDownloadParameters, stopDownloadParameters);" > | ||
| <h:graphicImage name="images/icons/zip.png" width="64" height="64" /> | ||
| <p:fileDownload value="#{metFragWebBean.downloadParameters}" /> | ||
| </p:commandLink> | ||
| </h:form> | ||
| <p:dialog id="downloadParametersStatusDialog" modal="true" widgetVar="downloadParametersStatusDialog" | ||
| header="Creating Parameter Files" draggable="false" closable="false" resizable="false"> | ||
| <p:graphicImage name="images/ajaxloadingbar.gif" /> | ||
| </p:dialog> | ||
| <script type="text/javascript"> | ||
| function startDownloadParameters() { | ||
| PF('downloadParametersStatusDialog').show(); | ||
| } | ||
|
|
||
| function stopDownloadParameters() { | ||
| PF('downloadParametersStatusDialog').hide(); | ||
| } | ||
| </script> | ||
| </p:dialog> | ||
| </ui:composition> | ||
| <p:dialog id="downloadParametersDialog" header="Download Parameters" | ||
| widgetVar="downloadParametersDialog" | ||
| modal="true" resizable="false" styleClass="centered-text"> | ||
| <h:form id="downloadParametersForm" enctype="multipart/form-data"> | ||
| <p:commandLink ajax="false" | ||
| onclick="PrimeFaces.monitorDownload(startDownloadParameters, stopDownloadParameters);"> | ||
| <h:graphicImage name="images/icons/zip.png" width="64" height="64"/> | ||
| <p:fileDownload value="#{metFragWebBean.downloadParameters}"/> | ||
| </p:commandLink> | ||
| </h:form> | ||
| <p:dialog id="downloadParametersStatusDialog" modal="true" widgetVar="downloadParametersStatusDialog" | ||
| header="Creating Parameter Files" draggable="false" closable="false" resizable="false"> | ||
| <p:graphicImage name="images/ajaxloadingbar.gif"/> | ||
| </p:dialog> | ||
| <script type="text/javascript"> | ||
| function startDownloadParameters() { | ||
| PF('downloadParametersStatusDialog').show(); | ||
| } | ||
|
|
||
| function stopDownloadParameters() { | ||
| PF('downloadParametersStatusDialog').hide(); | ||
| } | ||
| </script> | ||
| </p:dialog> | ||
| </h:body> | ||
|
|
||
| </html> |
47 changes: 23 additions & 24 deletions
47
MetFragWeb/src/main/webapp/includes/dialogs/processCandidatesProgressDialog.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,32 +1,31 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | ||
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" | ||
| <html xmlns:h="jakarta.faces.html" | ||
| xmlns:p="http://primefaces.org/ui"> | ||
|
|
||
| <h:body> | ||
|
|
||
| <h:form> | ||
| <p:dialog visible="#{metFragWebBean.candidateProcessing}" id="processCandidatesProgressDialog" | ||
| header="#{metFragWebBean.processCompoundsDialogHeader}" | ||
| widgetVar="processCandidatesProgressDialog" modal="true" resizable="false" closable="false"> | ||
| <!-- <p:graphicImage name="images/ajaxloadingbar.gif"/> --> | ||
| <br /> | ||
| <p:progressBar style="width: 200px" widgetVar="pbAjax" ajax="true" value="#{metFragWebBean.processingProgress}" labelTemplate="{value}%" styleClass="animated" global="false"> | ||
| </p:progressBar> | ||
| <br /> | ||
| <h:panelGroup style="padding-left: 0px;"> | ||
| <p:commandButton style="height: 22px; font-size: 0.7em" value="Stop" id="stopProcessCompounds" | ||
| action="#{metFragWebBean.stopCompoundProcessing}" actionListener="#{metFragWebBean.stopCompoundProcessingListener}" onclick="PF('processCompoundsDialog').hide()"/> | ||
| </h:panelGroup> | ||
| <br /> | ||
| <p:poll interval="1" listener="#{metFragWebBean.checkProcessingThread}" update="processCandidatesProgressDialog"/> | ||
| </p:dialog> | ||
|
|
||
| </h:form> | ||
|
|
||
| <h:form> | ||
| <p:dialog visible="#{metFragWebBean.candidateProcessing}" id="processCandidatesProgressDialog" | ||
| header="#{metFragWebBean.processCompoundsDialogHeader}" widgetVar="processCandidatesProgressDialog" | ||
| modal="true" resizable="false" closable="false"> | ||
| <!-- <p:graphicImage name="images/ajaxloadingbar.gif"/> --> | ||
| <br/> | ||
| <p:progressBar style="width: 200px" widgetVar="pbAjax" ajax="true" | ||
| value="#{metFragWebBean.processingProgress}" labelTemplate="{value}%" styleClass="animated" | ||
| global="false"> | ||
| </p:progressBar> | ||
| <br/> | ||
| <h:panelGroup style="padding-left: 0px;"> | ||
| <p:commandButton style="height: 22px; font-size: 0.7em" value="Stop" id="stopProcessCompounds" | ||
| action="#{metFragWebBean.stopCompoundProcessing}" | ||
| actionListener="#{metFragWebBean.stopCompoundProcessingListener}" | ||
| onclick="PF('processCompoundsDialog').hide()"/> | ||
| </h:panelGroup> | ||
| <br/> | ||
| <p:poll interval="1" listener="#{metFragWebBean.checkProcessingThread}" | ||
| update="processCandidatesProgressDialog"/> | ||
| </p:dialog> | ||
| </h:form> | ||
| </h:body> | ||
|
|
||
| </html> |
39 changes: 19 additions & 20 deletions
39
MetFragWeb/src/main/webapp/includes/dialogs/retrieveCandidatesProgressDialog.xhtml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,28 +1,27 @@ | ||
| <?xml version="1.0" encoding="UTF-8"?> | ||
| <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" | ||
| "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> | ||
| <html xmlns="http://www.w3.org/1999/xhtml" | ||
| xmlns:ui="http://xmlns.jcp.org/jsf/facelets" | ||
| xmlns:h="http://xmlns.jcp.org/jsf/html" | ||
| <html xmlns:h="jakarta.faces.html" | ||
| xmlns:p="http://primefaces.org/ui"> | ||
|
|
||
| <h:body> | ||
|
|
||
| <h:form> | ||
| <p:dialog visible="#{metFragWebBean.databaseProcessing}" id="retrieveCandidatesProgressDialog" | ||
| header="#{metFragWebBean.retrieveCandidatesDialogHeader}" widgetVar="retrieveCandidatesProgressDialog" modal="true" | ||
| resizable="false" closable="false"> | ||
| <p:graphicImage name="images/ajaxloadingbar.gif"/> | ||
| <br /> | ||
| <h:panelGroup style="padding-left: 0px;"> | ||
| <p:commandButton style="height: 22px; font-size: 0.7em" value="Stop" id="stopRetrieveCompounds" rendered="false" | ||
| action="#{metFragWebBean.stopCompoundRetrieving}" actionListener="#{metFragWebBean.stopCompoundRetrievingListener}" onclick="PF('retrieveCompoundsDialog').hide()"/> | ||
| </h:panelGroup> | ||
| <br /> | ||
| <p:poll interval="3" listener="#{metFragWebBean.checkDatabaseThread}" update="retrieveCandidatesProgressDialog"/> | ||
| </p:dialog> | ||
| </h:form> | ||
|
|
||
| <h:form> | ||
| <p:dialog visible="#{metFragWebBean.databaseProcessing}" id="retrieveCandidatesProgressDialog" | ||
| header="#{metFragWebBean.retrieveCandidatesDialogHeader}" widgetVar="retrieveCandidatesProgressDialog" | ||
| modal="true" resizable="false" closable="false"> | ||
| <p:graphicImage name="images/ajaxloadingbar.gif"/> | ||
| <br/> | ||
| <h:panelGroup style="padding-left: 0px;"> | ||
| <p:commandButton style="height: 22px; font-size: 0.7em" value="Stop" id="stopRetrieveCompounds" | ||
| rendered="false" | ||
| action="#{metFragWebBean.stopCompoundRetrieving}" | ||
| actionListener="#{metFragWebBean.stopCompoundRetrievingListener}" | ||
| onclick="PF('retrieveCompoundsDialog').hide()"/> | ||
| </h:panelGroup> | ||
| <br/> | ||
| <p:poll interval="3" listener="#{metFragWebBean.checkDatabaseThread}" | ||
| update="retrieveCandidatesProgressDialog"/> | ||
| </p:dialog> | ||
| </h:form> | ||
| </h:body> | ||
|
|
||
| </html> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters