replace s:button with h:button

zanata · Aug 7, 2015 · f749b41 · f749b41
1 parent 2970a9a
commit f749b41
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 15 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/RoleAction.java b/zanata-war/src/main/java/org/zanata/action/RoleAction.java
@@ -95,6 +95,7 @@ private String saveExistingRole() {
             }
         }
 
+        // TODO [CDI] need to end conversation or equivalent scope in CDI
         Conversation.instance().end();
         return "success";
     }

diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -61,8 +61,10 @@
 
           <h:commandButton value="#{msgs['jsf.Save']}"
             action="#{zanataRoleAction.save}" styleClass="button button--primary"/>
-          <s:button view="/admin/rolemanager.xhtml"
-            value="#{msgs['jsf.Cancel']}" propagation="end" styleClass="button button--link l--push-left-half"/>
+          <!-- TODO pahuang is conversation scope automatically ended -->
+          <h:button outcome="/admin/rolemanager.xhtml"
+            value="#{msgs['jsf.Cancel']}"
+            styleClass="button button--link l--push-left-half"/>
         </h:form>
       </div>
     </div>

diff --git a/zanata-war/src/main/webapp/admin/roleruledetails.xhtml b/zanata-war/src/main/webapp/admin/roleruledetails.xhtml
@@ -81,10 +81,9 @@
             action="#{roleAssignmentRuleAction.update}"
             rendered="#{roleAssignmentRuleAction.managed}"/>
 
-          <s:button id="cancel" styleClass="button button--link l--push-left-half"
+          <h:button id="cancel" styleClass="button button--link l--push-left-half"
             value="#{msgs['jsf.Cancel']}"
-            propagation="none"
-            view="/admin/rolerules.xhtml"/>
+            outcome="/admin/rolerules.xhtml"/>
         </h:form>
 
       </div>

diff --git a/zanata-war/src/main/webapp/admin/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
@@ -238,8 +238,8 @@
 
         <h:commandButton value="#{msgs['jsf.Save']}" id="save" styleClass="button--primary"
             action="#{serverConfigurationBean.update}"/>
-        <s:button view="/admin/home.xhtml" value="#{msgs['jsf.Cancel']}" id="cancel"
-            propagation="none" styleClass="button button--link l--push-left-half"/>
+        <h:button outcome="/admin/home.xhtml" value="#{msgs['jsf.Cancel']}" id="cancel"
+            styleClass="button button--link l--push-left-half"/>
       </h:form>
     </div>
   </div>

diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -100,8 +100,9 @@
           <h:commandButton id="userdetailSave" value="#{msgs['jsf.Save']}"
             action="#{userAction.save}" styleClass="button--primary"/>
 
-          <s:button id="userdetailCancel" view="/admin/usermanager.xhtml"
-            value="#{msgs['jsf.Cancel']}" propagation="end"
+          <!-- TODO pahuang is conversation scope automatically ended -->
+          <h:button id="userdetailCancel" outcome="/admin/usermanager.xhtml"
+            value="#{msgs['jsf.Cancel']}"
             styleClass="button button--link l--push-left-half"/>
 
         </h:form>

diff --git a/zanata-war/src/main/webapp/edit_home_content.xhtml b/zanata-war/src/main/webapp/edit_home_content.xhtml
@@ -11,6 +11,8 @@
 
   <ui:define name="page_title">#{msgs['jsf.EditHomePage']}</ui:define>
   <ui:define name="center_content">
+    <!-- TODO pahuang do we need this? -->
+    <a4j:jsFunction name="cancelEditHomeContent" action="#{serverConfigurationBean.cancel()}" />
     <h1>#{msgs['jsf.HomepageContent']}</h1>
 
     <h:form id="homeContentForm">
@@ -29,10 +31,9 @@
           <h:commandButton id="update"
             value="#{msgs['jsf.Update']}"
             action="#{serverConfigurationBean.updateHomeContent}"/>
-          <s:button id="cancel" view="/home.xhtml"
+          <h:button id="cancel" outcome="/home.xhtml"
             value="#{msgs['jsf.Cancel']}"
-            propagation="none"
-            action="#{serverConfigurationBean.cancel}"/>
+            onclick="cancelEditHomeContent()"/>
         </div>
 
         <hr/>

diff --git a/zanata-war/src/main/webapp/profile/create_user.xhtml b/zanata-war/src/main/webapp/profile/create_user.xhtml
@@ -11,6 +11,7 @@
     name="page_title">#{msgs['jsf.Profile']}:#{msgs['jsf.NewUser.Label']}</ui:define>
 
   <ui:define name="center_content">
+    <a4j:jsFunction name="cancelCreateUser" action="#{newProfileAction.cancel}" />
     <div class="g--centered">
       <div class="g__item w--1-2-m w--3-8-l w--1-3 l--push-bottom-1">
 
@@ -87,9 +88,8 @@
               value="#{msgs['jsf.Save']}"
               action="#{newProfileAction.createUser}"
               styleClass="l--push-right-half button--primary"/>
-            <s:button id="user-create-cancel" styleClass="button button-link"
-              value="#{msgs['jsf.Cancel']}"
-              action="#{newProfileAction.cancel}"/>
+            <h:button id="user-create-cancel" styleClass="button button-link"
+              value="#{msgs['jsf.Cancel']}" onclick="cancelCreateUser()"/>
           </div>
         </h:form>
       </div>