Work in progress: redesign webpages

zanata · Aug 9, 2012 · 7c953dd · 7c953dd
1 parent f31d79e
commit 7c953dd
Show file tree

Hide file tree

Showing 23 changed files with 78 additions and 130 deletions.
diff --git a/zanata-war/src/main/resources/images/zanata-icon/16x16/edit.png b/zanata-war/src/main/resources/images/zanata-icon/16x16/edit.png
diff --git a/zanata-war/src/main/resources/images/zanata-icon/16x16/eye-open.png b/zanata-war/src/main/resources/images/zanata-icon/16x16/eye-open.png
diff --git a/zanata-war/src/main/resources/images/zanata-icon/16x16/file.png b/zanata-war/src/main/resources/images/zanata-icon/16x16/file.png
diff --git a/zanata-war/src/main/webapp/admin/glossary.xhtml b/zanata-war/src/main/webapp/admin/glossary.xhtml
@@ -13,7 +13,7 @@
         <h:form>
             <s:token allowMultiplePosts="true" />
             <rich:dataTable id="data_table" width="100%" value="#{glossaryStatsAction.getAllStatus().toArray()}" 
-                  var="language" styleClass="iteration_inline_tribes" rowClasses="odd,even">
+                  var="language" styleClass="iteration_inline_tribes">
                     <rich:column sortBy="#{language.locale}">
                         <f:facet name="header">#{messages['jsf.Language']}</f:facet>
                         #{language.locale}

diff --git a/zanata-war/src/main/webapp/admin/home.xhtml b/zanata-war/src/main/webapp/admin/home.xhtml
@@ -10,9 +10,6 @@
 
     <ui:define name="page_title">Administration</ui:define>
     <ui:define name="center_content">
-        <rich:jQuery selector="#tab_admin"
-                     query="addClass('ui-tabs-selected')"/>
-
         <h:panelGrid columns="4" border="0">
             <s:link id="Admin_Server_configuration_home" view="/admin/server_configuration.xhtml" propagation="none" styleClass="admin_link">
                 <div class="admin_link_div">

diff --git a/zanata-war/src/main/webapp/admin/roledetail.xhtml b/zanata-war/src/main/webapp/admin/roledetail.xhtml
@@ -10,8 +10,6 @@
 
     <ui:define name="page_title">#{roleAction.role} - Role Details</ui:define>
     <ui:define name="center_content">
-      <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
-
       <h:form>
         <s:token allowMultiplePosts="true" />
         <rich:panel>

diff --git a/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -21,7 +21,6 @@
     </ui:define>
 
     <ui:define name="center_content">
-      <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
       <script type="text/javascript">
         function confirmDelete()
         {
@@ -35,7 +34,6 @@
 	            value="#{roles}" 
 	            var="role"
 	            cellspacing="0"
-	            rowClasses="odd,even"
 	            columnClasses="centered,centered,centered"
 	            styleClass="fullwidth">
 

diff --git a/zanata-war/src/main/webapp/admin/search.xhtml b/zanata-war/src/main/webapp/admin/search.xhtml
@@ -11,7 +11,6 @@
 
     <ui:define name="page_title">#{messages['jsf.ManageSearch']}</ui:define>
     <ui:define name="center_content">
-      <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
         <a4j:form>
           <s:token allowMultiplePosts="true" />
           <a4j:region>

diff --git a/zanata-war/src/main/webapp/admin/server_configuration.xhtml b/zanata-war/src/main/webapp/admin/server_configuration.xhtml
@@ -11,7 +11,6 @@
 
     <ui:define name="page_title">#{messages['jsf.ServerConfiguration']}</ui:define>
     <ui:define name="center_content">
-      <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
         <h:form>
           <s:token allowMultiplePosts="true" />
           <rich:panel>

diff --git a/zanata-war/src/main/webapp/admin/stats.xhtml b/zanata-war/src/main/webapp/admin/stats.xhtml
@@ -10,8 +10,6 @@
 
     <ui:define name="page_title">Statistics</ui:define>
     <ui:define name="center_content">
-        <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
-
 		<rich:simpleTogglePanel switchType="client" label="#{messages['jsf.TotalTranslators']} : #{adminStatsAction.totalTranslator}" opened="#{true}">
         </rich:simpleTogglePanel>
         <br/>

diff --git a/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml b/zanata-war/src/main/webapp/admin/supportedlanguagedetail.xhtml
@@ -11,8 +11,6 @@
 
    <ui:define name="page_title">Language Details</ui:define>
 	<ui:define name="center_content">
-        <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />
-
 		<h:form>
 			<s:token allowMultiplePosts="true" />
 			<rich:panel>

diff --git a/zanata-war/src/main/webapp/admin/userdetail.xhtml b/zanata-war/src/main/webapp/admin/userdetail.xhtml
@@ -10,7 +10,6 @@
 
     <ui:define name="page_title">#{userAction.username} - User Details</ui:define>
     <ui:define name="center_content">
-      <rich:jQuery selector="#tab_admin" query="addClass('ui-tabs-selected')" />  
       <h:form>
         <s:token allowMultiplePosts="true" />
         <rich:panel>

diff --git a/zanata-war/src/main/webapp/admin/usermanager.xhtml b/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -31,7 +31,6 @@
 	            value="#{users}" 
 	            var="user" 
 	            cellspacing="0"
-	            rowClasses="odd,even"
 	            columnClasses="centered,centered,centered,centered"
 	            styleClass="fullwidth">
 	          <h:column width="auto">

diff --git a/zanata-war/src/main/webapp/help/contact_admin.xhtml b/zanata-war/src/main/webapp/help/contact_admin.xhtml
@@ -13,7 +13,6 @@
 
    <ui:define name="page_title">Contact Admin</ui:define>
    <ui:define name="center_content">
-      <rich:jQuery selector="#tab_help" query="addClass('ui-tabs-selected')" />
       <h:form>
          <s:token allowMultiplePosts="true" />
          <h1>#{messages['jsf.ContactAdmin']}</h1>

diff --git a/zanata-war/src/main/webapp/help/view.xhtml b/zanata-war/src/main/webapp/help/view.xhtml
@@ -10,7 +10,6 @@
 
 <ui:define name="page_title">Help</ui:define>
 <ui:define name="center_content">
-    <rich:jQuery selector="#tab_help" query="addClass('ui-tabs-selected')" />
     <!-- should this be project-help-content? -->
     <s:formattedText id="project-home-content" value="#{applicationConfiguration.helpContent}"></s:formattedText>
 </ui:define>

diff --git a/zanata-war/src/main/webapp/iteration/files.xhtml b/zanata-war/src/main/webapp/iteration/files.xhtml
@@ -57,7 +57,6 @@
                 <rich:dataTable id="data_table" width="100%" value="#{projectIterationFilesAction.iterationDocuments}"
                                 var="doc"
                                 styleClass="iteration_inline_tribes"
-                                rowClasses="odd,even"
                                 rows="20"
                                 rendered="#{projectIterationFilesAction.iterationDocuments.size() gt 0}">
                     <rich:column sortOrder="ASCENDING"

diff --git a/zanata-war/src/main/webapp/iteration/view.xhtml b/zanata-war/src/main/webapp/iteration/view.xhtml
@@ -57,93 +57,96 @@
 
 				<rich:dataTable id="data_table" width="100%"
 					value="#{viewAllStatusAction.getAllStatus().toArray()}" var="stats"
-					styleClass="iteration_inline_tribes" rowClasses="odd,even">
+					styleClass="iteration_inline_tribes">
 					<rich:column sortBy="#{stats.locale}"
 						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 						<f:facet name="header">#{messages['jsf.Language']}</f:facet>
-						<h:outputLink rendered="#{identity.loggedIn}"
-							value="#{request.contextPath}/webtrans/Application.html"
-							title="#{messages['jsf.iteration.stats.OpenInWebEditor']}" styleClass="iteration_link">
-							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
-							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
-							<f:param name="localeId" value="#{stats.locale}" />
-							<f:param name="locale" value="#{locale.language}" />
-							<h:outputText value="#{stats.locale}" />
-						</h:outputLink>
-						<h:outputText value="#{stats.locale}"
-							rendered="#{not identity.loggedIn}" />
+						<s:link view="/language/language.xhtml" rendered="#{identity.loggedIn}" propagation="none" value="#{stats.locale}" styleClass="table_link">
+                        	<f:param name="id" value="#{stats.locale}" />
+                        </s:link>
+						<h:outputText value="#{stats.locale}" rendered="#{not identity.loggedIn}" />
 					</rich:column>
+
 					<rich:column sortBy="#{stats.nativeName}"
 						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 						<f:facet name="header">#{messages['jsf.Name']}</f:facet>
-						<h:outputLink rendered="#{identity.loggedIn}"
-							value="#{request.contextPath}/webtrans/Application.html"
-							title="#{messages['jsf.iteration.stats.OpenInWebEditor']}" styleClass="iteration_link">
-							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
-							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
-							<f:param name="localeId" value="#{stats.locale}" />
-							<f:param name="locale" value="#{locale.language}" />
-							<h:outputText value="#{stats.nativeName}" />
-						</h:outputLink>
-						<h:outputText value="#{stats.nativeName}"
-							rendered="#{not identity.loggedIn}" />
+						<s:link view="/language/language.xhtml" rendered="#{identity.loggedIn}" propagation="none" value="#{stats.nativeName}" styleClass="table_link">
+                        	<f:param name="id" value="#{stats.locale}" />
+                        </s:link>
+						<h:outputText value="#{stats.nativeName}" rendered="#{not identity.loggedIn}" />
 					</rich:column>
+
 					<rich:column id="translate" 
 						rendered="#{identity.loggedIn and not viewAllStatusAction.isIterationObsolete()}"
-						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
-						<h:outputLink
-							rendered="#{not applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale) }"
-							value="#{request.contextPath}/webtrans/Application.html" styleClass="iteration_link">
-							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
-							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
-							<f:param name="localeId" value="#{stats.locale}" />
-							<f:param name="locale" value="#{locale.language}" />
-							#{messages['jsf.Open']}
-						</h:outputLink>
-
-						<h:outputLink
-							rendered="#{applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}"
-							value="#{request.contextPath}/webtrans/Application.html" styleClass="iteration_link">
-							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
-							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
-							<f:param name="localeId" value="#{stats.locale}" />
-							<f:param name="locale" value="#{locale.language}" />
-							<f:param name="gwt.codesvr" value="127.0.0.1:9997" />
-							#{messages['jsf.OpenGWTDevMode']}
-      					</h:outputLink>
-
-						<h:outputLink
-							rendered="#{not applicationConfiguration.debug and viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}"
-							value="#{request.contextPath}/webtrans/Application.html" styleClass="iteration_link">
-							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
-							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
-							<f:param name="localeId" value="#{stats.locale}" />
-							<f:param name="locale" value="#{locale.language}" />
-							#{messages['jsf.Translate']}
-      					</h:outputLink>
-
-						<h:outputLink
-							rendered="#{applicationConfiguration.debug and viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}"
-							value="#{request.contextPath}/webtrans/Application.html" styleClass="iteration_link">
-							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
-							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
-							<f:param name="localeId" value="#{stats.locale}" />
-							<f:param name="locale" value="#{locale.language}" />
-							<f:param name="gwt.codesvr" value="127.0.0.1:9997" />
-							#{messages['jsf.TranslateGWTDevMode']}
-      					</h:outputLink>
+						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''} centered">
+
+						<s:fragment rendered="#{not applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale) }">
+							<ui:remove><f:facet name="header">#{messages['jsf.Open']}</f:facet></ui:remove>
+							<h:outputLink
+								rendered="#{not applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale) }"
+								value="#{request.contextPath}/webtrans/Application.html" styleClass="table_link">
+								<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
+								<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
+								<f:param name="localeId" value="#{stats.locale}" />
+								<f:param name="locale" value="#{locale.language}" />
+								<img src="#{request.contextPath}/images/zanata-icon/16x16/eye-open.png" />
+							</h:outputLink>
+						</s:fragment>
+
+						<s:fragment rendered="#{applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}">
+							<ui:remove><f:facet name="header">#{messages['jsf.OpenGWTDevMode']}</f:facet></ui:remove>
+							<h:outputLink
+								rendered="#{applicationConfiguration.debug and not viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}"
+								value="#{request.contextPath}/webtrans/Application.html" styleClass="table_link">
+								<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
+								<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
+								<f:param name="localeId" value="#{stats.locale}" />
+								<f:param name="locale" value="#{locale.language}" />
+								<f:param name="gwt.codesvr" value="127.0.0.1:9997" />
+								<img src="#{request.contextPath}/images/zanata-icon/16x16/eye-open.png" />
+	      					</h:outputLink>
+						</s:fragment>
+
+						<s:fragment rendered="#{not applicationConfiguration.debug and viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}">
+							<ui:remove><f:facet name="header">#{messages['jsf.Translate']}</f:facet></ui:remove>
+							<h:outputLink
+								rendered="#{not applicationConfiguration.debug and viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}"
+								value="#{request.contextPath}/webtrans/Application.html" styleClass="table_link">
+								<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
+								<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
+								<f:param name="localeId" value="#{stats.locale}" />
+								<f:param name="locale" value="#{locale.language}" />
+								<img src="#{request.contextPath}/images/zanata-icon/16x16/edit.png" />
+	      					</h:outputLink>
+						</s:fragment>
+
+      					<s:fragment rendered="#{applicationConfiguration.debug and viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}">
+      						<ui:remove><f:facet name="header">#{messages['jsf.TranslateGWTDevMode']}</f:facet></ui:remove>
+      						<h:outputLink
+								rendered="#{applicationConfiguration.debug and viewAllStatusAction.isUserAllowedToTranslate(stats.locale)}"
+								value="#{request.contextPath}/webtrans/Application.html" styleClass="table_link">
+								<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
+								<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
+								<f:param name="localeId" value="#{stats.locale}" />
+								<f:param name="locale" value="#{locale.language}" />
+								<f:param name="gwt.codesvr" value="127.0.0.1:9997" />
+								<img src="#{request.contextPath}/images/zanata-icon/16x16/edit.png" />
+	      					</h:outputLink>
+      					</s:fragment>
 					</rich:column>
+
 					<rich:column id="files"
 						rendered="#{identity.loggedIn}"
-						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
-						<s:link
-							view="/iteration/files.xhtml" propagation="none"
-							value="#{messages['jsf.Files']}" styleClass="iteration_link">
+						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''} centered">
+						<f:facet name="header">#{messages['jsf.Files']}</f:facet>
+						<s:link view="/iteration/files.xhtml" propagation="none" styleClass="table_link">
 							<f:param name="project" value="#{viewAllStatusAction.projectSlug}" />
 							<f:param name="iteration" value="#{viewAllStatusAction.iterationSlug}" />
 							<f:param name="localeId" value="#{stats.locale}" />
+							<img src="#{request.contextPath}/images/zanata-icon/16x16/file.png" />
 						</s:link>
 					</rich:column>
+
 					<rich:column sortBy="#{stats.per}"
 						styleClass="#{viewAllStatusAction.showAllLocales and stats.userInLanguageTeam ? 'highlighted_datatable_row' : ''}">
 						<f:facet name="header">#{messages['jsf.iteration.stats.Percentage']}</f:facet>

diff --git a/zanata-war/src/main/webapp/language/contact_coordinator.xhtml b/zanata-war/src/main/webapp/language/contact_coordinator.xhtml
@@ -13,7 +13,6 @@
    <ui:param name="showGlobalMessages" value="true"/>
 
    <ui:define name="center_content">
-      <rich:jQuery selector="#tab_tribes" query="addClass('ui-tabs-selected')" />
       <h:form>
          <s:token allowMultiplePosts="true" />
          <rich:panel>

diff --git a/zanata-war/src/main/webapp/language/home.xhtml b/zanata-war/src/main/webapp/language/home.xhtml
@@ -34,7 +34,7 @@
                     <f:facet name="header">#{messages['jsf.NativeName']}</f:facet>
                     #{language.retrieveNativeName()}
                 </rich:column>
-                <rich:column sortBy="#{language.members.size}">
+                <rich:column sortBy="#{language.members.size}" styleClass="centered">
                     <f:facet name="header">#{messages['jsf.Members']}</f:facet>
                     #{language.members.size}
                 </rich:column>

diff --git a/zanata-war/src/main/webapp/language/language.xhtml b/zanata-war/src/main/webapp/language/language.xhtml
@@ -25,7 +25,6 @@
     </ui:define>
 
     <ui:define name="center_content">
-        <rich:jQuery selector="#tab_tribes" query="addClass('ui-tabs-selected')" />
         <a4j:form id="memberPanel">
                 <h1>#{languageTeamAction.locale.retrieveNativeName()}</h1>
                 <p>#{messages['jsf.SizeMembers']}</p>

diff --git a/zanata-war/src/main/webapp/language/request_to_join.xhtml b/zanata-war/src/main/webapp/language/request_to_join.xhtml
@@ -13,7 +13,6 @@
 
    <ui:define name="page_title">#{messages['jsf.RequestToJoinLanguageTeamTitle']}</ui:define>
    <ui:define name="center_content">
-      <rich:jQuery selector="#tab_tribes" query="addClass('ui-tabs-selected')" />
       <h:form>
          <s:token allowMultiplePosts="true" />
          <rich:panel>

diff --git a/zanata-war/src/main/webapp/stylesheet/2.0.css b/zanata-war/src/main/webapp/stylesheet/2.0.css
@@ -302,7 +302,7 @@ th,td {
 
 .rich-table-cell {
 	padding: 10px;
-	font-size: 11px;
+	font-size: 12px;
 	color: #595959;
 	font-family: Arial, Verdana, sans-serif;
 	border-left:0;