Mercurial > hg > ismi-richfaces

diff src/main/webapp/templates/main_template.xhtml @ 96:895bf7494d17

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
first version of new import-merge.
author casties
date Thu, 27 Oct 2016 20:19:57 +0200
parents 8d93f3a0108f
children df6ca03c4bf9 29bd63f749c6
line wrap: on
line diff
--- a/src/main/webapp/templates/main_template.xhtml	Thu Oct 20 14:09:28 2016 +0200
+++ b/src/main/webapp/templates/main_template.xhtml	Thu Oct 27 20:19:57 2016 +0200
@@ -147,11 +147,25 @@
 				</rich:menuItem>
 			</rich:dropDownMenu>
 
-			<h:outputLink rendered="#{Session.canMerge}"
-				value="#{ApplicationBean1.root}/merge/generalMerge.xhtml">Merge</h:outputLink>
+            <rich:dropDownMenu mode="ajax" rendered="#{Session.canMerge}">
+                <f:facet name="label">
+                    <h:panelGroup>
+                        <h:outputText value="Merge" />
+                    </h:panelGroup>
+                </f:facet>
 
-            <h:outputLink rendered="#{Session.canMerge}"
-                value="#{ApplicationBean1.root}/merge/referenceMerge.xhtml">Join References</h:outputLink>
+                <rich:menuItem label="Merge Entities"
+                    onclick="document.location.href='#{ApplicationBean1.root}/merge/generalMerge.xhtml'">
+                </rich:menuItem>
+
+                <rich:menuItem label="Join References"
+                    onclick="document.location.href='#{ApplicationBean1.root}/merge/referenceMerge.xhtml'">
+                </rich:menuItem>
+
+                <rich:menuItem label="Merge Import List"
+                    onclick="document.location.href='#{ApplicationBean1.root}/merge/importMerge.xhtml'">
+                </rich:menuItem>
+            </rich:dropDownMenu>
 
 			<h:outputLink  rendered="#{Session.canCreate}"
 				value="#{ApplicationBean1.root}/browse/entityRepository.xhtml">Browse Repository</h:outputLink>