Mercurial > hg > ismi-richfaces

comparison src/main/webapp/merge/importMerge.xhtml @ 137:3c585df9f874

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
improved merge import dialog. now with prev+next buttons.
author casties
date Tue, 04 Apr 2017 17:43:51 +0200
parents c03527c428f5
children
comparison
equal deleted inserted replaced
136:502ae5b1a07d 137:3c585df9f874
44 columnClasses="createPanelFirstColumn" id="loadingPanel" 44 columnClasses="createPanelFirstColumn" id="loadingPanel"
45 rendered="#{!empty Session.importMerge.importNodeList}"> 45 rendered="#{!empty Session.importMerge.importNodeList}">
46 46
47 <h:outputText value="Import Nodes" /> 47 <h:outputText value="Import Nodes" />
48 48
49 <h:panelGrid columns="3"> 49 <h:panelGrid columns="2">
50 50
51 <h:outputText value="Node #{Session.importMerge.importNodeIdx + 1} / #{Session.importMerge.importNodeListLength}" 51 <h:outputText value="Node #{Session.importMerge.importNodeIdx + 1} / #{Session.importMerge.importNodeListLength}"
52 styleClass="textBack"/> 52 styleClass="textBack"/>
53 <a4j:commandButton value="Skip"
54 actionListener="#{Session.importMerge.skipCurrentNode}"
55 render="loadingPanel,mergingPanel" />
56 <h:column> 53 <h:column>
57 <h:outputText 54 <h:outputText
58 value="#{Session.importMerge.importNodeAsText}" 55 value="#{Session.importMerge.importNodeAsText}"
59 rendered="#{Session.importMerge.importNode != null}" 56 rendered="#{Session.importMerge.importNode != null}"
60 styleClass="textBack"/> 57 styleClass="textBack"/>
61 </h:column> 58 </h:column>
62 59
63 <h:outputText/> 60 <h:column>
64 <a4j:commandButton value="Load" 61 <a4j:commandButton value="Previous"
65 actionListener="#{Session.importMerge.loadFirstEntity}" 62 actionListener="#{Session.importMerge.skipToPrevNode}"
66 render="loadingPanel,mergingPanel" /> 63 render="loadingPanel,mergingPanel" />
64 <a4j:commandButton value="Next"
65 actionListener="#{Session.importMerge.skipCurrentNode}"
66 render="loadingPanel,mergingPanel" />
67 </h:column>
68 <h:column>
67 <h:outputText 69 <h:outputText
68 value="#{Session.importMerge.importNodeMsg}" 70 value="#{Session.importMerge.importNodeMsg}"
69 rendered="#{! empty Session.importMerge.importNodeMsg}" 71 rendered="#{! empty Session.importMerge.importNodeMsg}"
70 styleClass="textBack"/> 72 styleClass="textBack"/>
73 <a4j:commandButton value="Load"
74 actionListener="#{Session.importMerge.loadFirstEntity}"
75 render="loadingPanel,mergingPanel" />
76 </h:column>
71 </h:panelGrid> 77 </h:panelGrid>
72 78
73 </h:panelGrid> 79 </h:panelGrid>
74 80
75 <h:panelGrid columns="1" id="mergingPanel"> 81 <h:panelGrid columns="1" id="mergingPanel">