Mercurial > hg > ismi-richfaces
diff src/main/webapp/search/displayAuthor.xhtml @ 72:70207f24937e
cleaned displayAuthor. added filter for witnesses with scans.
author | casties |
---|---|
date | Tue, 22 Dec 2015 20:07:13 +0100 |
parents | 954d6200336d |
children | a58e6b2fb87f |
line wrap: on
line diff
--- a/src/main/webapp/search/displayAuthor.xhtml Thu Dec 17 17:31:07 2015 +0100 +++ b/src/main/webapp/search/displayAuthor.xhtml Tue Dec 22 20:07:13 2015 +0100 @@ -145,7 +145,7 @@ <!-- Titles --> - <h:panelGrid id="titlesPanel" style="width: 100%;"> + <h:panelGrid id="titlesPanel" style="width:100%;"> <a name="titles" /> <h:outputText @@ -182,10 +182,10 @@ <h:panelGrid id="titlePanel" columns="1" style="width: 100%;" rendered="#{Session.displayAuthor.selectedTitleId != null}"> - <h:commandButton value="edit or view this title" - action="#{Session.displayAuthor.actionEditTitle}" - rendered="#{Session.canEdit}" /> - + <h:outputText + value="Title [#{Session.displayAuthor.selectedTitleId}]: #{Session.displayAuthor.title.ov}" + styleClass="titlePanel" /> + <h:panelGrid columns="2" styleClass="displayPanel" columnClasses="displayPanelColumn01,displayPanelColumn02"> @@ -283,14 +283,30 @@ </h:panelGrid> + <h:commandButton value="edit this title" + action="#{Session.displayAuthor.actionEditTitle}" + rendered="#{Session.canEdit}" /> + + <!-- no WITNESS --> + <h:outputText value="No known witnesses" + rendered="#{empty Session.displayAuthor.witnessItems}" + styleClass="titlePanel" /> + <!-- WITNESS --> - <h:panelGrid id="witnessesPanel"> + <h:panelGrid id="witnessesPanel" style="width:100%;" rendered="#{!empty Session.displayAuthor.witnessItems}"> <a name="witnesses" /> <h:outputText value="Witnesses (#{Session.displayAuthor.witnessItemsSize})" rendered="#{!empty Session.displayAuthor.witnessItems}" styleClass="titlePanel" /> + <h:panelGrid columns="3"> + <h:selectBooleanCheckbox value="#{Session.displayAuthor.showWitnessesWithScans}"/> + <h:outputText value="Show only witnesses with scans"/> + <h:commandButton value="Change" + action="#{Session.displayAuthor.changeShowWitnessesWithScans}"/> + </h:panelGrid> + <h:panelGrid columns="1" rendered="#{(!empty Session.displayAuthor.witnessItems) and Session.user != null}"> <h:commandLink value="Make all public" @@ -321,10 +337,10 @@ <h:panelGrid id="witnessPanel" columns="1" style="width: 100%;" rendered="#{Session.displayAuthor.selectedWitnessId != null}"> - <h:commandButton value="edit or view this witness" - action="#{Session.displayAuthor.actionEditWitness}" - rendered="#{Session.canEdit}" /> - + <h:outputText + value="Witness [#{Session.displayAuthor.selectedWitnessId}]: #{Session.displayAuthor.witness.ov}" + styleClass="titlePanel" /> + <h:panelGrid columns="2" styleClass="displayPanel" columnClasses="displayPanelColumn01,displayPanelColumn02"> @@ -381,10 +397,8 @@ escape="false" /> </h:column> </h:dataTable> - </h:panelGrid> - <h:outputText value="Witness Read by" /> <h:panelGrid columns="1"> <h:dataTable var="item" style="border:none;" @@ -427,7 +441,7 @@ rendered="#{!empty Session.displayAuthor.witness.referenceList}" /> <h:panelGrid columns="1" rendered="#{!empty Session.displayAuthor.witness.referenceList}"> - <rich:dataTable var="item" style="border:none;width: 700px;" + <rich:dataTable var="item" style="border:none; width:700px;" value="#{Session.displayAuthor.witness.referenceList}" rendered="#{!empty Session.displayAuthor.witness.referenceList}" rowKeyVar="cnt"> @@ -457,6 +471,11 @@ </h:panelGrid> </h:panelGrid> + + <h:commandButton value="edit this witness" + action="#{Session.displayAuthor.actionEditWitness}" + rendered="#{Session.canEdit}" /> + </h:panelGrid>