Work in progress: minor changes in UI

zanata · Oct 23, 2012 · 57930d3 · 57930d3
1 parent 6de750d
commit 57930d3
Show file tree

Hide file tree

Showing 8 changed files with 51 additions and 15 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/UserAction.java b/zanata-war/src/main/java/org/zanata/action/UserAction.java
@@ -20,8 +20,12 @@
  */
 package org.zanata.action;
 
+import static org.jboss.seam.ScopeType.CONVERSATION;
+import static org.jboss.seam.annotations.Install.APPLICATION;
+
 import java.io.Serializable;
 import java.util.Map;
+
 import javax.persistence.EntityManager;
 import javax.persistence.PersistenceException;
 
@@ -33,9 +37,8 @@
 import org.jboss.seam.faces.FacesMessages;
 import org.jboss.seam.international.StatusMessage;
 import org.jboss.seam.security.management.IdentityManager;
-
-import static org.jboss.seam.ScopeType.CONVERSATION;
-import static org.jboss.seam.annotations.Install.APPLICATION;
+import org.zanata.annotation.CachedMethodResult;
+import org.zanata.dao.PersonDAO;
 
 /**
  * Extension of Seam management's UserAction class' behaviour.
@@ -59,6 +62,9 @@ public class UserAction extends org.jboss.seam.security.management.action.UserAc
    @In
    private Map<String, String> messages;
 
+   @In
+   private PersonDAO personDAO;
+
    public void deleteUser( String userName )
    {
       try
@@ -75,4 +81,10 @@ public void deleteUser( String userName )
          }
       }
    }
+
+   @CachedMethodResult
+   public String getEmail(String username)
+   {
+      return personDAO.findEmail(username);
+   }
 }
diff --git a/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java b/zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
@@ -99,6 +99,16 @@ public HPerson findByUsername(String username)
       return (HPerson) query.uniqueResult();
    }
 
+   public String findEmail(String username)
+   {
+      Query query = getSession().createQuery("select p.email from HPerson as p where p.account.username = :username");
+      query.setParameter("username", username);
+      query.setCacheable(true);
+      query.setComment("PersonDAO.findEmail");
+      return (String) query.uniqueResult();
+
+   }
+
    @SuppressWarnings("unchecked")
    public List<HPerson> findAllContainingName(String name)
    {

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
@@ -15,11 +15,12 @@
             <s:validateAll>
                 <ui:insert/>
             </s:validateAll>
-
-            <s:span styleClass="icon-cancel-circle-2 errors" rendered="#{invalid}"/>
-            <s:message styleClass="errors"/>
         </span>
-
+
+        <span class="value #{invalid?'errors':''} errorsMessage">
+			<s:span styleClass="icon-cancel-circle-2 errors" rendered="#{invalid}"/>
+        	<s:message styleClass="errors"/>
+        </span>
     </div>
 
 </ui:composition>
diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
@@ -41,7 +41,7 @@
                         </h:panelGroup>
                         <h:outputText value="#{languageManagerAction.languageNameWarningMessage}"
                                       rendered="#{languageManagerAction.languageNameWarningMessage != null}"
-                                      style="background-color: yellow"/>
+                                      style="background-color: yellow; display:block; width:195px;"/>
                     </h:panelGroup>
 
                 </h:panelGrid>

diff --git a/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml b/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
@@ -42,7 +42,7 @@
         <s:decorate id="homeContentField" template="edit.xhtml">
             <ui:define name="label">#{messages['jsf.HomepageContent']}</ui:define>
              <rich:editor id="homeContent" 
-                width="400" height="300" style="width:400px;"
+                width="412" height="300" style="width:412px;"
                 required="false"
                 value="#{projectHome.instance.homeContent}"
                 viewMode="visual" 

diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -18,6 +18,10 @@
           <s:decorate id="usernameField" template="../WEB-INF/layout/edit.xhtml">
             <ui:define name="label">#{messages['jsf.Username']}</ui:define>
             <h:inputText id="username" value="#{userAction.username}" readonly="#{identityManager.userExists(userAction.username)}"/>
+          </s:decorate>
+          <s:decorate id="emailField" template="../WEB-INF/layout/edit.xhtml">
+            <ui:define name="label">#{messages['jsf.Email']}</ui:define>
+            <h:inputText id="email" value="#{userAction.getEmail(userAction.username)}" readonly="#{identityManager.userExists(userAction.username)}"/>
           </s:decorate>
 	      <s:fragment rendered="#{applicationConfiguration.internalAuth}">
 	          <s:decorate id="passwordField" template="../WEB-INF/layout/edit.xhtml" >

diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -34,9 +34,13 @@
 	            columnClasses="centered,centered,centered,centered"
 	            styleClass="fullwidth">
 	          <h:column width="auto">
-	            <f:facet name="header">User name</f:facet>
+	            <f:facet name="header">#{messages['jsf.Username']}</f:facet>
 	            #{user}
 	          </h:column>
+	          <h:column width="auto">
+	            <f:facet name="header">#{messages['jsf.Email']}</f:facet>
+	            #{userAction.getEmail(userSearch.selectedUser)}
+	          </h:column>
 	          <h:column width="auto">
 	            <f:facet name="header">#{messages['jsf.MemberOf']}</f:facet>
 	            #{userSearch.getUserRoles(user)}

diff --git a/zanata-war/src/main/webapp/stylesheet/zanata.css b/zanata-war/src/main/webapp/stylesheet/zanata.css
@@ -75,8 +75,9 @@ input,textarea {
 
 input[type="text"], input[type="password"]
 {
-	width:210px;
-	font-size:12px;
+	width:260px;
+	font-size:14px;
+	height:20px;
 }
 
 button,input[type="checkbox"],input[type="radio"],input[type="reset"],input[type="submit"],input[type="button"]
@@ -320,7 +321,7 @@ a.breadcrumbs_link:hover
 	padding: 5px;
 	margin-top: 5px;
 	clear: left;
-	font-size:12px;
+	font-size:13px;
 }
 
 img.login_option {
@@ -357,6 +358,10 @@ img.selected_login_option {
 	color: #F00000;
 	font-size:13px;
 }
+.errorsMessage
+{
+	width:188px;
+}
 
 img.errors {
 	padding-left: 5px;
@@ -605,11 +610,11 @@ a.readonly_link,a.readonly_link:visited,a.readonly_link:link {
 
 .footer div.footer_container
 {
-	width:960px;
+	width:900px;
 	margin-left:auto;
 	margin-right:auto;
 	display:block;
-	padding:0 2px;
+	padding:0 30px;
 }
 
 .footer