Mercurial > hg > ismi-richfaces
changeset 151:1326182855ef
new iiif_manifest_url and public attributes for DIGITALIZATION. cleanup of codex form.
author | Robert Casties <casties@mpiwg-berlin.mpg.de> |
---|---|
date | Wed, 16 Aug 2017 18:56:52 -0400 |
parents | 29c4b64caad0 |
children | 06f499c35de9 84d20006521c |
files | src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentDigitalizationBean.java src/main/webapp/entry/codex.xhtml src/main/webapp/entry/digi.xhtml |
diffstat | 3 files changed, 129 insertions(+), 118 deletions(-) [+] |
line wrap: on
line diff
--- a/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentDigitalizationBean.java Wed Jul 26 16:33:26 2017 +0200 +++ b/src/main/java/de/mpiwg/itgroup/ismi/entry/beans/CurrentDigitalizationBean.java Wed Aug 16 18:56:52 2017 -0400 @@ -23,7 +23,7 @@ public static EditIntent editDigitalizationIntent = new EditIntent( AbstractISMIBean.DIGITALIZATION, // attributes - new String[]{"name", "num_files"}, + new String[]{"name", "num_files", "iiif_manifest_url", "public"}, // source relations new String[]{"is_digitalization_of"}, // target relations
--- a/src/main/webapp/entry/codex.xhtml Wed Jul 26 16:33:26 2017 +0200 +++ b/src/main/webapp/entry/codex.xhtml Wed Aug 16 18:56:52 2017 -0400 @@ -106,15 +106,6 @@ </h:panelGrid> - <h:outputText value="Alias" styleClass="titlePanel"/> - <h:panelGrid columns="2" styleClass="createPanel" - columnClasses="createPanelFirstColumn"> - <h:outputText value="Is this codex alias?" /> - <h:selectBooleanCheckbox value="#{CurrentCodex.isAlias}"> - <a4j:ajax event="click" render="codexAliasPanel" /> - </h:selectBooleanCheckbox> - </h:panelGrid> - <h:panelGrid columns="2" styleClass="createPanel" columnClasses="createPanelFirstColumn"> <h:outputText value="Public?"/> @@ -123,113 +114,6 @@ </h:selectOneMenu> </h:panelGrid> - - <h:panelGrid columns="1" id="codexAliasPanel"> - - <h:outputText value="Referenced Alias" - rendered="#{CurrentCodex.isAlias}" - styleClass="titlePanel"/> - - <h:panelGrid columns="4" styleClass="createPanel" - columnClasses="createPanelFirstColumn" - rendered="#{CurrentCodex.isAlias}"> - - <h:outputLabel value="Country" /> - <ismi:autocomplete - lo="#{CurrentCodex.referencedCodexTemplate.countryLo}" /> - <h:outputText /> - <h:panelGrid> - <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" - rendered="#{!empty CurrentCodex.referencedCodexTemplate.countryLo.entity.id}" - actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCountryAction}" /> - </h:panelGrid> - - <h:outputLabel value="Place/City" /> - <ismi:autocomplete - lo="#{CurrentCodex.referencedCodexTemplate.cityLo}" /> - <h:panelGrid> - <h:selectOneMenu - rendered="#{!empty CurrentCodex.referencedCodexTemplate.citiesInCurrentCountry}" - valueChangeListener="#{CurrentCodex.referencedCodexTemplate.inCurrentCountryListener}"> - <f:selectItems - value="#{CurrentCodex.referencedCodexTemplate.citiesInCurrentCountry}" /> - <a4j:ajax event="change" render="codexAliasPanel" /> - </h:selectOneMenu> - </h:panelGrid> - <h:panelGrid> - <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" - rendered="#{!empty CurrentCodex.referencedCodexTemplate.cityLo.entity.id}" - actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCityAction}" /> - </h:panelGrid> - - - <h:outputLabel value="Repository" /> - <ismi:autocomplete - lo="#{CurrentCodex.referencedCodexTemplate.repositoryLo}" /> - <h:panelGrid> - <h:selectOneMenu partialSubmit="true" - rendered="#{!empty CurrentCodex.referencedCodexTemplate.repositoriesInCurrentCity}" - valueChangeListener="#{CurrentCodex.referencedCodexTemplate.inCurrentCityListener}"> - <f:selectItems - value="#{CurrentCodex.referencedCodexTemplate.repositoriesInCurrentCity}" /> - <a4j:ajax event="change" render="codexAliasPanel" /> - </h:selectOneMenu> - <h:outputText - rendered="#{empty CurrentCodex.referencedCodexTemplate.repositoriesInCurrentCity}" /> - </h:panelGrid> - <h:panelGrid> - <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" - rendered="#{!empty CurrentCodex.referencedCodexTemplate.repositoryLo.entity.id}" - actionListener="#{CurrentCodex.referencedCodexTemplate.editThisRepositoryAction}" /> - </h:panelGrid> - - - <h:outputLabel value="Collection" /> - <ismi:autocomplete - lo="#{CurrentCodex.referencedCodexTemplate.collectionLo}" /> - <h:panelGrid> - <h:selectOneMenu - rendered="#{!empty CurrentCodex.referencedCodexTemplate.collectionsInCurrentRepository}" - valueChangeListener="#{CurrentCodex.referencedCodexTemplate.inCurrentRepositoryListener}"> - <f:selectItems - value="#{CurrentCodex.referencedCodexTemplate.collectionsInCurrentRepository}" /> - <a4j:ajax event="change" render="codexAliasPanel" /> - </h:selectOneMenu> - </h:panelGrid> - <h:panelGrid> - <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" - rendered="#{!empty CurrentCodex.referencedCodexTemplate.collectionLo.entity.id}" - actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCollectionAction}" /> - </h:panelGrid> - - <h:outputLabel value="Shelf Mark / Identifier" /> - <ismi:autocomplete - lo="#{CurrentCodex.referencedCodexTemplate.codexLo}" /> - <h:panelGrid> - <h:selectOneMenu - rendered="#{!empty CurrentCodex.referencedCodexTemplate.shelfMarksInCurrentCollection}" - valueChangeListener="#{CurrentCodex.referencedCodexTemplate.identifierChangedListener}"> - <f:selectItems - value="#{CurrentCodex.referencedCodexTemplate.shelfMarksInCurrentCollection}" /> - <a4j:ajax event="change" render="codexAliasPanel" /> - </h:selectOneMenu> - </h:panelGrid> - <h:panelGrid> - <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" - rendered="#{!empty CurrentCodex.referencedCodexTemplate.codexLo.entity.ownValue}" - actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCodexAction}" /> - </h:panelGrid> - - - <h:outputText /> - <h:commandButton - actionListener="#{CurrentCodex.referencedCodexTemplate.checkConsistencyFromCountryToCodex}" - value="Check Consistency From Country To Codex" /> - <h:outputText /> - <h:outputText /> - </h:panelGrid> - </h:panelGrid> - <h:panelGrid columns="2" styleClass="createPanel" columnClasses="createPanelFirstColumn"> @@ -378,6 +262,122 @@ <ismi:refWidget entityForm="#{CurrentCodex}" /> + <h:outputText value="Alias" styleClass="titlePanel"/> + <h:panelGrid columns="2" styleClass="createPanel" + columnClasses="createPanelFirstColumn"> + <h:outputText value="Is this codex alias?" /> + <h:selectBooleanCheckbox value="#{CurrentCodex.isAlias}"> + <a4j:ajax event="click" render="codexAliasPanel" /> + </h:selectBooleanCheckbox> + </h:panelGrid> + + + <h:panelGrid columns="1" id="codexAliasPanel"> + + <h:outputText value="Referenced Alias" + rendered="#{CurrentCodex.isAlias}" + styleClass="titlePanel"/> + + <h:panelGrid columns="4" styleClass="createPanel" + columnClasses="createPanelFirstColumn" + rendered="#{CurrentCodex.isAlias}"> + + <h:outputLabel value="Country" /> + <ismi:autocomplete + lo="#{CurrentCodex.referencedCodexTemplate.countryLo}" /> + <h:outputText /> + <h:panelGrid> + <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" + rendered="#{!empty CurrentCodex.referencedCodexTemplate.countryLo.entity.id}" + actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCountryAction}" /> + </h:panelGrid> + + <h:outputLabel value="Place/City" /> + <ismi:autocomplete + lo="#{CurrentCodex.referencedCodexTemplate.cityLo}" /> + <h:panelGrid> + <h:selectOneMenu + rendered="#{!empty CurrentCodex.referencedCodexTemplate.citiesInCurrentCountry}" + valueChangeListener="#{CurrentCodex.referencedCodexTemplate.inCurrentCountryListener}"> + <f:selectItems + value="#{CurrentCodex.referencedCodexTemplate.citiesInCurrentCountry}" /> + <a4j:ajax event="change" render="codexAliasPanel" /> + </h:selectOneMenu> + </h:panelGrid> + <h:panelGrid> + <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" + rendered="#{!empty CurrentCodex.referencedCodexTemplate.cityLo.entity.id}" + actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCityAction}" /> + </h:panelGrid> + + + <h:outputLabel value="Repository" /> + <ismi:autocomplete + lo="#{CurrentCodex.referencedCodexTemplate.repositoryLo}" /> + <h:panelGrid> + <h:selectOneMenu partialSubmit="true" + rendered="#{!empty CurrentCodex.referencedCodexTemplate.repositoriesInCurrentCity}" + valueChangeListener="#{CurrentCodex.referencedCodexTemplate.inCurrentCityListener}"> + <f:selectItems + value="#{CurrentCodex.referencedCodexTemplate.repositoriesInCurrentCity}" /> + <a4j:ajax event="change" render="codexAliasPanel" /> + </h:selectOneMenu> + <h:outputText + rendered="#{empty CurrentCodex.referencedCodexTemplate.repositoriesInCurrentCity}" /> + </h:panelGrid> + <h:panelGrid> + <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" + rendered="#{!empty CurrentCodex.referencedCodexTemplate.repositoryLo.entity.id}" + actionListener="#{CurrentCodex.referencedCodexTemplate.editThisRepositoryAction}" /> + </h:panelGrid> + + + <h:outputLabel value="Collection" /> + <ismi:autocomplete + lo="#{CurrentCodex.referencedCodexTemplate.collectionLo}" /> + <h:panelGrid> + <h:selectOneMenu + rendered="#{!empty CurrentCodex.referencedCodexTemplate.collectionsInCurrentRepository}" + valueChangeListener="#{CurrentCodex.referencedCodexTemplate.inCurrentRepositoryListener}"> + <f:selectItems + value="#{CurrentCodex.referencedCodexTemplate.collectionsInCurrentRepository}" /> + <a4j:ajax event="change" render="codexAliasPanel" /> + </h:selectOneMenu> + </h:panelGrid> + <h:panelGrid> + <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" + rendered="#{!empty CurrentCodex.referencedCodexTemplate.collectionLo.entity.id}" + actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCollectionAction}" /> + </h:panelGrid> + + <h:outputLabel value="Shelf Mark / Identifier" /> + <ismi:autocomplete + lo="#{CurrentCodex.referencedCodexTemplate.codexLo}" /> + <h:panelGrid> + <h:selectOneMenu + rendered="#{!empty CurrentCodex.referencedCodexTemplate.shelfMarksInCurrentCollection}" + valueChangeListener="#{CurrentCodex.referencedCodexTemplate.identifierChangedListener}"> + <f:selectItems + value="#{CurrentCodex.referencedCodexTemplate.shelfMarksInCurrentCollection}" /> + <a4j:ajax event="change" render="codexAliasPanel" /> + </h:selectOneMenu> + </h:panelGrid> + <h:panelGrid> + <h:commandButton alt="edit" image="#{ApplicationBean1.editImage}" + rendered="#{!empty CurrentCodex.referencedCodexTemplate.codexLo.entity.ownValue}" + actionListener="#{CurrentCodex.referencedCodexTemplate.editThisCodexAction}" /> + </h:panelGrid> + + + <h:outputText /> + <h:commandButton + actionListener="#{CurrentCodex.referencedCodexTemplate.checkConsistencyFromCountryToCodex}" + value="Check Consistency From Country To Codex" /> + <h:outputText /> + <h:outputText /> + </h:panelGrid> + </h:panelGrid> + <h:panelGrid columns="4"> <h:outputText value="ID of the Codex" /> <h:inputText value="#{CurrentCodex.currentId}" />
--- a/src/main/webapp/entry/digi.xhtml Wed Jul 26 16:33:26 2017 +0200 +++ b/src/main/webapp/entry/digi.xhtml Wed Aug 16 18:56:52 2017 -0400 @@ -38,11 +38,22 @@ value="#{CurrentDigi.attributes['name']}" /> <h:outputText /> + <h:outputText value="IIIF manifest URL" /> + <h:inputText size="80" + value="#{CurrentDigi.attributes['iiif_manifest_url']}" /> + <h:outputText /> + <h:outputText value="Number of files" /> - <h:inputText size="50" + <h:inputText size="10" value="#{CurrentDigi.attributes['num_files']}" /> <h:outputText /> + <h:outputText value="Scans are public"/> + <h:selectOneMenu value="#{CurrentDigi.attributes['public']}"> + <f:selectItems value="#{ApplicationBean1.suggestedBoolean}" /> + </h:selectOneMenu> + <h:outputText /> + <h:outputText value="Codex" styleClass="titlePanel"/> <h:panelGrid columns="4" styleClass="createPanel" columnClasses="createPanelFirstColumn" id="digiCodexPanel">