[Cluster-devel] conga/luci cluster/index_html homebase/index_h ...

[rmccabe@sourceware.org <rmccabe@sourceware.org>]

CVSROOT:	/cvs/cluster
Module name:	conga
Changes by:	rmccabe at sourceware.org	2007-09-25 04:00:24

Modified files:
	luci/cluster   : index_html 
	luci/homebase  : index_html 
	luci/site/luci/Extensions: LuciZopeAsync.py 
	luci/storage   : index_html 
Added files:
	luci/plone-custom: clusterportlet.css 
Removed files:
	luci/cluster   : clusterportlet.css 

Log message:
	Move clusterportlet.css to the site common directory to allow it to be cached by the server

Patches:
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/index_html.diff?cvsroot=cluster&r1=1.38&r2=1.39
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/cluster/clusterportlet.css.diff?cvsroot=cluster&r1=1.3&r2=NONE
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/homebase/index_html.diff?cvsroot=cluster&r1=1.23&r2=1.24
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/plone-custom/clusterportlet.css.diff?cvsroot=cluster&r1=NONE&r2=1.1
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/site/luci/Extensions/LuciZopeAsync.py.diff?cvsroot=cluster&r1=1.2&r2=1.3
http://sourceware.org/cgi-bin/cvsweb.cgi/conga/luci/storage/index_html.diff?cvsroot=cluster&r1=1.11&r2=1.12

--- conga/luci/cluster/index_html	2007/09/25 03:51:02	1.38
+++ conga/luci/cluster/index_html	2007/09/25 04:00:23	1.39
@@ -59,7 +59,7 @@
 
     <metal:cssslot fill-slot="css_slot">
 		<style type="text/css">
-			<!-- @import url(./clusterportlet.css); -->
+			<!-- @import url(clusterportlet.css); -->
 		</style>
 		<style type="text/css">
 			<!-- @import url(/luci/homebase/luci_homebase.css); -->
--- conga/luci/homebase/index_html	2007/07/12 02:42:42	1.23
+++ conga/luci/homebase/index_html	2007/09/25 04:00:23	1.24
@@ -35,7 +35,7 @@
 
 	<metal:cssslot fill-slot="css_slot">
 		<style type="text/css">
-			<!-- @import url(../cluster/clusterportlet.css); -->
+			<!-- @import url(clusterportlet.css); -->
 		</style>
 
 		<style type="text/css">
/cvs/cluster/conga/luci/plone-custom/clusterportlet.css,v  -->  standard output
revision 1.1
--- conga/luci/plone-custom/clusterportlet.css
+++ -	2007-09-25 04:00:24.797794000 +0000
@@ -0,0 +1,239 @@
+dl.portlet {
+    margin: 1px 0 1em 0;
+    border-bottom: 1px solid #8cacbb;
+}
+
+dl.portlet a {
+    text-decoration: none;
+}
+#portal-columns {
+    width: 100% !important;
+    border-collapse: collapse;
+    border-spacing: 0;
+}
+
+#portal-column-one {
+    vertical-align: top;
+    width: 16em;
+}
+
+#portal-column-content {
+    vertical-align: top;
+    margin: 0;
+    padding: 0;
+}
+
+#portal-column-two {
+    vertical-align: top;
+    width: 16em;
+}
+
+/* Padding for the columns */
+
+#portal-column-one .visualPadding {
+    padding: 2em 0em 1em 2em;
+}
+
+#portal-column-two .visualPadding {
+    padding: 2em 2em 1em 0em;
+}
+
+/* XXX: The two below rules should really be in the rule above, but that makes the items grow/shrink on :hover (navtree) - need to investigate how to make it not do that. ~limi, Dec 2005 */
+dd.portletItem a,
+dd.portletFooter a {
+    border-bottom: none;
+}
+dd.portletItem a:visited,
+dd.portletFooter a:visited {
+    color: #436976;
+}
+
+.portletHeader {
+    background-color: #dee7ec;
+    border: 1px solid #8cacbb;
+    padding: 0em 1em;
+    text-transform: lowercase;
+    font-weight: normal;
+    line-height: 1.6em;
+}
+
+.portletHeader a {
+    color: Black;
+}
+
+.portletItem {
+    margin: 0;
+    padding: 1em;
+    border-left: 1px solid #8cacbb;
+    border-right: 1px solid #8cacbb;
+}
+.portletItem a {
+    display: block;
+}
+
+.portletItemDetails {
+    text-align: right;
+    display: block;
+    color: Black;
+}
+
+dd.portletFooter {
+    background-color: #eef3f5;
+    margin: 0;
+    padding: 0.25em 1em;
+    border: 1px solid #8cacbb;
+    border-style: dotted solid none solid;
+    text-align: right;
+}
+
+
+/* Elements that enable layout with rounded corners */
+
+.portletTopLeft {}
+.portletTopRight {}
+.portletBottomLeft {}
+.portletBottomRight {}
+.portletCluConfigTree {
+    margin: 0 0 0 0.75em;
+    padding: 0;
+    list-style: none;
+    list-style-image: none;
+    line-height: 1em;
+}
+
+
+
+.cluConfigTree {
+    list-style: none;
+    list-style-image: none;
+    margin-top: 1px;
+}
+
+.cluConfig li {
+    margin-bottom: 1px;
+}
+
+.cluConfigTreeItem {
+    display: block;
+    padding: 0;
+    margin: 0;
+}
+.cluConfigTreeItem a,
+dd.portletItem .cluConfigTreeItem a {
+    border: 1px solid White;
+    display: block;
+    text-decoration: none;
+    padding-top: 0.2em;
+    padding-bottom: 0.25em;
+}
+
+.cluConfigTreeItem a:hover,
+dd.portletItem .cluConfigTreeItem a:hover {
+    background-color: #dee7ec;
+    color: #436976;
+    border: 1px solid #8cacbb;
+}
+
+.cluConfigTreeCurrentItem {
+    background-color: #dee7ec;
+    color: #436976;
+    border: 1px solid #8cacbb !important;
+}
+li.cluConfigTreeCurrentItem {
+    display: block;
+    padding: 0 0 0 1px;
+    margin: 0 0 2px -1px;
+}
+li.cluConfigTreeCurrentItem a,
+li.cluConfigTreeCurrentItem a:hover {
+    display: block;
+    border: 1px solid #dee7ec;
+    min-height: 1.6em;
+    line-height: 1.6em;
+    height: auto;
+}
+
+/* Another workaround for broken Internet Explorer */
+
+* html li.cluConfigTreeCurrentItem a,
+* html li.cluConfigTreeCurrentItem a:hover {
+    height: 1.6em;
+}
+
+.type-nodecfg, .type-nodes, .type-node, .type-nodelist,
+.type-nodegrid, .type-nodeadd {
+display: block;
+}
+
+.cluConfigTreeLevel0 { margin: 0; }
+.cluConfigTreeLevel1 { margin-left: 1em;}
+.cluConfigTreeLevel2 { margin-left: 0.75em; }
+.cluConfigTreeLevel3 { margin-left: 0.75em; }
+.cluConfigTreeLevel4 { margin-left: 0.75em; }
+.cluConfigTreeLevel5 { margin-left: 0.75em; }
+
+#main-portal-logo {
+    background: url(./clusterbanner.png) no-repeat;
+    border: 0;
+    margin: 0.75em 0em 0.75em 1.5em;
+    padding: 0;
+}
+
+#main-portal-logo a {
+    display: block;
+    text-decoration: none;
+    overflow: hidden;
+    border: 0;
+    margin: 0;
+    padding: 0;
+    padding-top: 87px;
+    height: 0px !important;
+    height /**/: 57px;
+    width: 252px;
+    cursor: pointer;
+}
+
+#portal-globalnav li a {
+    /* The normal, unselected tabs. They are all links */
+    background-color: transparent;
+    border-color: #8cacab;
+    border-width: 1px;
+    border-style: solid solid none solid;
+    color: #436976;
+    height: auto;
+    margin-right: 0.5em;
+    padding: 0em 1.25em;
+    text-decoration: none;
+    text-transform: lowercase;
+}
+
+#portal-globalnav li.selected a {
+    /* The selected tab. There's only one of this */
+    background-color: #dee7ec;
+    border: 1px solid #8cacbb;
+    border-bottom: #dee7ec 1px solid;
+    color: #436976;
+}
+#portal-globalnav li a:hover {
+    background-color: #dee7ec;
+    border-color: #8cacbb;
+    border-bottom-color: #dee7ec;
+    color: #436976;
+}
+#portal-personaltools {
+    /* Bar with personalized menu (user preferences, favorites etc) */
+    background-color: #dee7ec;
+    border-top-color: #8cacbb;
+    border-top-style: solid;
+    border-top-width: 1px;
+    border-bottom-color: #8cacbb;
+    border-bottom-style: solid;
+    border-bottom-width: 1px;
+    line-height: 1.6em;
+    color: Black;
+    padding: 0em 3em 0em 3em;
+    margin: 0;
+    text-align: right;
+    text-transform: lowercase;
+    list-style: none;
+}
--- conga/luci/site/luci/Extensions/LuciZopeAsync.py	2007/09/24 21:19:42	1.2
+++ conga/luci/site/luci/Extensions/LuciZopeAsync.py	2007/09/25 04:00:24	1.3
@@ -22,9 +22,9 @@
 def result_to_xml(result):
 	import types
 
-	numeric_types = [
+	numeric_types = (
 		types.IntType, types.BooleanType, types.LongType, types.FloatType
-	]
+	)
 
 	root = minidom.Document()
 
--- conga/luci/storage/index_html	2007/09/25 03:50:27	1.11
+++ conga/luci/storage/index_html	2007/09/25 04:00:24	1.12
@@ -31,7 +31,7 @@
     <metal:cssslot fill-slot="css_slot">
       <tal:comment replace="nothing"> A slot where you can insert CSS in the header from a template </tal:comment>
 
-  <style type="text/css"><!-- @import url(/luci/cluster/clusterportlet.css); --></style>
+  <style type="text/css"><!-- @import url(clusterportlet.css); --></style>
       <metal:cssslot define-slot="css_slot" />
     </metal:cssslot>