forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From thors...@apache.org
Subject svn commit: rev 22666 - in forrest/trunk/src/core/context/skins: common/scripts css-style-dev/css css-style-dev/xslt/html
Date Wed, 07 Jul 2004 05:48:41 GMT
Author: thorsten
Date: Tue Jul  6 22:48:40 2004
New Revision: 22666

Added:
   forrest/trunk/src/core/context/skins/common/scripts/getBlank.js
Modified:
   forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt
   forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css
   forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl
Log:
Changed the overall design and added more color support

Added: forrest/trunk/src/core/context/skins/common/scripts/getBlank.js
==============================================================================
--- (empty file)
+++ forrest/trunk/src/core/context/skins/common/scripts/getBlank.js	Tue Jul  6 22:48:40 2004
@@ -0,0 +1,8 @@
+<!--
+function getBlank (form, stdValue){
+if (form.value == stdValue){
+	form.value = '';
+	}
+return true;
+}
+//-->
\ No newline at end of file

Modified: forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt	(original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/css/profile.css.xslt	Tue Jul  6 22:48:40
2004
@@ -34,7 +34,6 @@
 #top .header .current a:visited { color: <xsl:value-of select="@vlink"/>; }
 #top .header .current a:hover { color: <xsl:value-of select="@hlink"/>; }
 #main      { border-top: solid <xsl:value-of select="@value"/> 15px; }
-<!--#menu { background-color: <xsl:value-of select="@value"/>; }-->
 </xsl:template> 
 
 <xsl:template match="color[@name='tab-unselected']"> 
@@ -86,23 +85,31 @@
 .menu           { border-color: <xsl:value-of select="@value"/>;}
 .menu .menupagetitle  { border-color: <xsl:value-of select="@value"/>;}
 .menu .menupageitemgroup  { border-color: <xsl:value-of select="@value"/>;}
-</xsl:template> 
+</xsl:template--> 
 
 <xsl:template match="color[@name='menu']">
-.menu      { background-color: <xsl:value-of select="@value"/>;} 
-.menu  {  color: <xsl:value-of select="@font"/>;} 
-.menu a:link {  color: <xsl:value-of select="@link"/>;} 
-.menu a:visited {  color: <xsl:value-of select="@vlink"/>;} 
-.menu a:hover {  background-color: <xsl:value-of select="@value"/>;
-                 color: <xsl:value-of select="@hlink"/>;} 
-.menu .menupagetitle  { color: <xsl:value-of select="@hlink"/>;}     
-</xsl:template> 
-
-<xsl:template match="color[@name='dialog']"> 
-.dialog      { background-color: <xsl:value-of select="@value"/>;} 
-</xsl:template> 
+#menu { background-color: <xsl:value-of select="@value"/>; }
+#menu li li h1 {  color: <xsl:value-of select="@font"/>;} 
+#menu li a:link {  color: <xsl:value-of select="@link"/>;} 
+#menu li a:visited {  color: <xsl:value-of select="@vlink"/>;} 
+#menu li a:hover {  color: <xsl:value-of select="@hlink"/>;} 
+#menu li .current {  color: <xsl:value-of select="@current"/>;}     
+</xsl:template> 
+
+<xsl:template match="color[@name='menuheading']">
+#menu h1 {
+    color: <xsl:value-of select="@font"/>;
+    background-color: <xsl:value-of select="@value"/>;
+}   
+</xsl:template> 
+<xsl:template match="color[@name='searchbox']"> 
+#top .searchbox { 
+background: <xsl:value-of select="@value"/> url("images/tab-right.gif") no-repeat right
top;
+color: <xsl:value-of select="@font"/>;
+} 
+</xsl:template>
 
-<xsl:template match="color[@name='body']">
+<!--xsl:template match="color[@name='body']">
 body         { background-color: <xsl:value-of select="@value"/>;
                color: <xsl:value-of select="@font"/>;} 
 a:link { color:<xsl:value-of select="@link"/>} 

Modified: forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css	(original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/css/screen.css	Tue Jul  6 22:48:40
2004
@@ -29,12 +29,16 @@
 	background: url("images/header_white_line.gif") repeat-x bottom;
 }
 
-#top .grouplogo,
+#top .grouplogo {
+	padding: 7px 0 10px 10px;
+	float: left;
+	text-align: left;
+}
 #top .projectlogo {
 	padding: 7px 0 10px 10px;
 	float: left;
 	width: 33%;
-	text-align: center;
+	text-align: right;
 }
 #top .projectlogoA1 {
 	padding: 7px 0 10px 10px;
@@ -44,9 +48,10 @@
 #top .searchbox {
 	position: absolute;
 	right: 10px;
+	top: 100px;
 	font-size: 70%;
 	white-space: nowrap;
-	text-align: left;
+	text-align: right;
 	color: white;
 	background: #4C6C8F url("images/tab-right.gif") no-repeat right top;
 	bottom: -1px; /* compensate for IE rendering issue */
@@ -110,7 +115,7 @@
 #main {
 	position: relative;
 	clear: both;
-	background: white url("images/sidebar_bg.gif") repeat-y left;
+	background: white;
 	border-top: solid #4C6C8F 15px;
 }
 #main .breadtrail {
@@ -126,12 +131,19 @@
 /**
  * Side menu
  */
- /* padding-top: 15px; padding-right: 15px; top:-15px; left:10px; z-index: 10; */
+ /* padding-top: 15px; padding-right: 15px; top:-15px; left:10px; z-index: 10;  */
  
 #menu {
 	position: relative;
 	float: left;
-	width: 150px;
+	width: 160px;
+padding-top: 15px;
+top:-15px; 
+left:10px; 
+z-index: 10;
+	border-left: solid black 1px;
+	border-bottom: solid black 1px;
+	border-right: solid black 1px;
 }
 #menu h1 {
 	display: block;
@@ -151,9 +163,10 @@
 }
 #menu ul ul ul {
 	padding: 0;
+	width: 145px;
 }
 #menu li li {
-	padding: 3px 12px;
+	padding: 3px 0px 3px 12px;
 	margin: 0;
 }
 #menu li li h1 {

Modified: forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl
==============================================================================
--- forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl	(original)
+++ forrest/trunk/src/core/context/skins/css-style-dev/xslt/html/site2xhtml.xsl	Tue Jul  6
22:48:40 2004
@@ -47,17 +47,17 @@
 	|HTML-head
 	+-->
         <head>
-<!--+
+            <!--+
    	|generator meta
    	+-->
             <xsl:call-template name="html-meta"/>
-<!--+
+            <!--+
 	|title
 	+-->
             <title>
                 <xsl:value-of select="div[@id='content']/h1"/>
             </title>
-<!--+
+            <!--+
 	|stylesheets
 	+-->
             <link rel="stylesheet" href="{$root}skin/basic.css" type="text/css" 
@@ -69,6 +69,11 @@
             <link rel="stylesheet" href="{$root}skin/profile.css" 
                 type="text/css" />
 <!--+
+    |Javascripts
+    +-->
+            <script type="text/javascript" language="javascript" 
+                src="{$root}skin/getBlank.js"></script>
+            <!--+
 	|favicon
 	+-->
             <xsl:if test="//skinconfig/favicon-url">
@@ -168,12 +173,12 @@
     +</xsl:comment> 
             <div class="searchbox">
                 <form method="get" action="http://www.google.com/search"> 
-                    <p><label for="query">Search the <xsl:value-of 
-                    select="$config/searchsite-name"/> site:</label></p> <input

-                    type="hidden" name="sitesearch" 
-                    value="{$config/searchsite-domain}"/> <input type="text" 
-                    id="query" name="q" size="15"/>&#160; <input type="submit"

-                    value="Search" name="Search"/> </form>
+                    <input type="hidden" 
+                    name="sitesearch" value="{$config/searchsite-domain}"/> 
+                    <input type="text" id="query" name="q" size="15" 
+                    value="Search the site:" 
+                    onFocus="getBlank (this, 'Search the site:');"/>&#160; 
+                    <input type="submit" value="Search" name="Search"/> </form>
             </div>
 <xsl:comment>+
     |end search
@@ -193,15 +198,22 @@
    	|centerstrip with menu and mainarea
    	+-->
     <div id="main">
-<!--breadtrail location='alt'-->
-        <xsl:if test="$config/trail/@location='alt'">
+        <xsl:choose>
+        <xsl:when test="$config/trail/@location='alt'">
+            <!--breadtrail location='alt'-->
 <xsl:comment>+
     |breadtrail
     +</xsl:comment>
-      <div class="breadtrail">
-          <xsl:call-template name="breadcrumbs"/>
-      </div>
-        </xsl:if>
+              <div class="breadtrail">
+                  <xsl:call-template name="breadcrumbs"/>
+              </div>    
+        </xsl:when>
+        <xsl:otherwise>
+            <!--*NO* breadtrail-->
+            <div class="breadtrail" >&#160;</div>
+        </xsl:otherwise>
+</xsl:choose>
+
 <xsl:comment>+
     |start Menu, mainarea
     +</xsl:comment>

Mime
View raw message