Mercurial > hg > ismi-richfaces

changeset 88:8d93f3a0108f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
More work on entering references.
author casties
date Thu, 06 Oct 2016 19:03:56 +0200
parents 545e47659e1f
children a142159f09c1
files src/main/webapp/browse/entityRepository.xhtml src/main/webapp/merge/referenceMerge.xhtml src/main/webapp/resources/components/ismi/refWidget.xhtml src/main/webapp/templates/main_template.xhtml
diffstat 4 files changed, 20 insertions(+), 14 deletions(-) [+]
line wrap: on
line diff
--- a/src/main/webapp/browse/entityRepository.xhtml	Thu Oct 06 18:01:59 2016 +0200
+++ b/src/main/webapp/browse/entityRepository.xhtml	Thu Oct 06 19:03:56 2016 +0200
@@ -156,7 +156,7 @@
                                 <h:panelGrid columns="2"
                                     rendered="#{EntityRepository.objectClass == 'REFERENCE'}">
                                     <h:column>
-                                        <h:outputText value="Bibliography (Endnote) ID number" />
+                                        <h:outputText value="Reference (EndNote) ID number" />
                                     </h:column>
                                     <h:column>
                                         <h:inputText value="#{EntityRepository.referenceBibIdNo}" />
--- a/src/main/webapp/merge/referenceMerge.xhtml	Thu Oct 06 18:01:59 2016 +0200
+++ b/src/main/webapp/merge/referenceMerge.xhtml	Thu Oct 06 19:03:56 2016 +0200
@@ -31,7 +31,7 @@
 
 					<h:panelGrid columns="4">
 
-						<h:outputText value="Source Biblio ID" 
+						<h:outputText value="Source Reference ID number" 
 							styleClass="textBack"/>
 						<h:inputText value="#{Session.referenceMerge.firstId}" />
 						<a4j:commandButton value="Load"
@@ -53,7 +53,7 @@
                         </h:column>
                         <h:outputText rendered="#{Session.referenceMerge.firstBibId == null}"/>
                         
-						<h:outputText value="Target Biblio ID" 
+						<h:outputText value="Target Reference ID number" 
 							styleClass="textBack"/>
 						<h:inputText value="#{Session.referenceMerge.secondId}" />
 						<a4j:commandButton value="Load"
@@ -102,21 +102,21 @@
 							</h:column>
 							<h:column>
 								<f:facet name="header">
-									<h:outputText value="Old biblio ID" />
+									<h:outputText value="Old Reference ID" />
 								</f:facet>
 								<h:outputText
 									value="#{result['old-bib-id']}" />
 							</h:column>
 							<h:column>
 								<f:facet name="header">
-									<h:outputText value="New biblio ID" />
+									<h:outputText value="New Reference ID" />
 								</f:facet>
 								<h:outputText
 									value="#{result['new-bib-id']}" />
 							</h:column>
                             <h:column>
                                 <f:facet name="header">
-                                    <h:outputText value="New biblio label" />
+                                    <h:outputText value="New Reference text" />
                                 </f:facet>
                                 <h:outputText
                                     value="#{result['new-endnote-content']}" />
--- a/src/main/webapp/resources/components/ismi/refWidget.xhtml	Thu Oct 06 18:01:59 2016 +0200
+++ b/src/main/webapp/resources/components/ismi/refWidget.xhtml	Thu Oct 06 19:03:56 2016 +0200
@@ -20,7 +20,6 @@
 		id="refArea">
 		
 		<h:panelGrid columns="1">
-			<h:outputText value="EndNote" />
 			<h:outputText value="References" />
 		</h:panelGrid>
 		
@@ -107,22 +106,29 @@
 					style="opacity: 0.1; height: 100px; left: 5px; top: 5px; bottom: -5px;">
 				</div>
 				<div class="rf-pp-hdr " style="cursor: default;">
-					<div class="rf-pp-hdr-cnt">EndNote Reference</div>
+					<div class="rf-pp-hdr-cnt">Bibliographical Reference</div>
 				</div>
 
 				<h:panelGrid columns="1" class="rf-pp-cnt-scrlr">
 					<h:panelGrid columns="1" class="rf-pp-cnt">
 
 						<h:panelGrid columns="2">
-							<h:outputLabel value="EndNote Id" />
-							<h:inputText value="#{cc.attrs.entityForm.endNoteRefTable.ref.endNoteId}" />
+						    <h:outputLabel value="ISMI Bibliography" />
+						    <h:outputLink value="https://ismi.mpiwg-berlin.mpg.de/drupal-ismi/search/biblio"
+                                    target="_blank">
+                                    Search Bibliography
+                            </h:outputLink>
+                            
+							<h:outputLabel value="Reference ID" />
+							<h:inputText value="#{cc.attrs.entityForm.endNoteRefTable.ref.endNoteId}" 
+							    size="50"/>
 
-							<h:outputLabel value="EndNote Content" />
+							<h:outputLabel value="Reference text (optional)" />
 							<h:inputTextarea
 								value="#{cc.attrs.entityForm.endNoteRefTable.ref.endNoteContent}"
-								rows="10" cols="50" />
+								rows="6" cols="50" />
 
-							<h:outputLabel value="Additional Information" />
+							<h:outputLabel value="Additional information" />
 							<h:inputTextarea
 								value="#{cc.attrs.entityForm.endNoteRefTable.ref.addInformation}"
 								rows="3" cols="50" />
--- a/src/main/webapp/templates/main_template.xhtml	Thu Oct 06 18:01:59 2016 +0200
+++ b/src/main/webapp/templates/main_template.xhtml	Thu Oct 06 19:03:56 2016 +0200
@@ -151,7 +151,7 @@
 				value="#{ApplicationBean1.root}/merge/generalMerge.xhtml">Merge</h:outputLink>
 
             <h:outputLink rendered="#{Session.canMerge}"
-                value="#{ApplicationBean1.root}/merge/referenceMerge.xhtml">Join Refs</h:outputLink>
+                value="#{ApplicationBean1.root}/merge/referenceMerge.xhtml">Join References</h:outputLink>
 
 			<h:outputLink  rendered="#{Session.canCreate}"
 				value="#{ApplicationBean1.root}/browse/entityRepository.xhtml">Browse Repository</h:outputLink>