Work in progress: edit home content layout, paging nav layout

zanata · Mar 1, 2012 · 8959c84 · 8959c84
1 parent ece34fb
commit 8959c84
Show file tree

Hide file tree

Showing 10 changed files with 385 additions and 769 deletions.
diff --git a/server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml b/server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
@@ -15,12 +15,11 @@
 		<title>#{messages['jsf.ZanataMainTitle']}</title>
 		<link rel="shortcut icon"
 		  href="#{request.contextPath}/public-img/favicon.ico" type="image/x-icon" />
-		<a:loadStyle src="/stylesheet/reset-fonts-grids.css" />
-		<a:loadStyle src="/stylesheet/base-min.css" />
+<!-- 		<a:loadStyle src="/stylesheet/reset-fonts-grids.css" /> -->
+<!-- 		<a:loadStyle src="/stylesheet/base-min.css" /> -->
 		<a:loadStyle src="/stylesheet/theme.css" />
+		<a:loadStyle src="/stylesheet/browser-specific.css" />
 		<a:loadStyle src="/stylesheet/zanata.css" />
-		<a:loadStyle src="/stylesheet/tabs.css" />
-		<a:loadStyle src="/stylesheet/zanata-theme.css" />
 		<ui:insert name="head" />
 	</head>
 

diff --git a/server/zanata-war/src/main/webapp/admin/rolemanager.xhtml b/server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
@@ -36,7 +36,7 @@
 	            cellspacing="0"
 	            headerClass="columnHeader"
 	            rowClasses="odd,even"
-	            columnClasses=",,enabled,action"
+	            columnClasses=",,enabled"
 	            styleClass="fullwidth">
 
 	          <h:column width="auto">

diff --git a/server/zanata-war/src/main/webapp/admin/usermanager.xhtml b/server/zanata-war/src/main/webapp/admin/usermanager.xhtml
@@ -36,7 +36,8 @@
 	            cellspacing="0"
 	            headerClass="columnHeader"
 	            rowClasses="odd,even"
-	            columnClasses=",,enabled,action">
+	            columnClasses=",,enabled"
+	            styleClass="fullwidth">
 	          <h:column width="auto">
 	            <f:facet name="header">
 	              User name

diff --git a/server/zanata-war/src/main/webapp/stylesheet/base-min.css b/server/zanata-war/src/main/webapp/stylesheet/base-min.css
@@ -1,9 +1,3 @@
-/*
-Copyright (c) 2009, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.7.0
-*/
 body {
 	margin: 10px;
 }

diff --git a/server/zanata-war/src/main/webapp/stylesheet/browser-specific.css b/server/zanata-war/src/main/webapp/stylesheet/browser-specific.css
@@ -0,0 +1,28 @@
+/* Additional IE specific bug fixes... */
+* html .ui-tabs-nav { /* auto clear, @ IE 6 & IE 7 Quirks Mode */
+	display: inline-block;
+}
+
+/* @ IE 7 Standards Mode - do not group selectors, otherwise IE 6 will ignore complete rule (because of the unknown + combinator)... */
+*:first-child+html .ui-tabs-nav {
+	display: inline-block;
+}
+
+/* IE 6 treats width as min-width */
+/* IE 6 treats height as min-height */
+#tabs .ui-tabs-nav a span {
+	min-width: 64px;
+	min-height: 18px;
+}
+
+/* @ Opera, use pseudo classes otherwise it confuses cursor... */
+.ui-tabs-nav .ui-tabs-selected a:link,.ui-tabs-nav .ui-tabs-selected a:visited,.ui-tabs-nav .ui-tabs-disabled a:link,.ui-tabs-nav .ui-tabs-disabled a:visited
+	{
+	cursor: text;
+}
+
+/* @ Opera, we need to be explicit again here now... */
+.ui-tabs-nav a:hover,.ui-tabs-nav a:focus,.ui-tabs-nav a:active,.ui-tabs-nav .ui-tabs-unselect a:hover,.ui-tabs-nav .ui-tabs-unselect a:focus,.ui-tabs-nav .ui-tabs-unselect a:active
+	{
+	cursor: pointer;
+}
diff --git a/server/zanata-war/src/main/webapp/stylesheet/reset-fonts-grids.css b/server/zanata-war/src/main/webapp/stylesheet/reset-fonts-grids.css
@@ -1,9 +1,3 @@
-/*
-Copyright (c) 2009, Yahoo! Inc. All rights reserved.
-Code licensed under the BSD License:
-http://developer.yahoo.net/yui/license.txt
-version: 2.7.0
-*/
 html {
 	color: #000;
 	background: #FFF;

diff --git a/server/zanata-war/src/main/webapp/stylesheet/tabs.css b/server/zanata-war/src/main/webapp/stylesheet/tabs.css