forrest-svn mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rgard...@apache.org
Subject svn commit: r481669 - in /forrest/trunk/whiteboard/forrest2/wicket-demo/src: java/org/apache/forrest/examples/wicket/ webapp/ webapp/images/ xdocs/ xslt/
Date Sat, 02 Dec 2006 23:56:08 GMT
Author: rgardler
Date: Sat Dec  2 15:56:06 2006
New Revision: 481669

URL: http://svn.apache.org/viewvc?view=rev&rev=481669
Log:
Add sub-items in the naviagtion document

Added:
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/images/
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/images/blue-bullet.gif   (with
props)
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/nav.css   (with props)
Modified:
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml
    forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html?view=diff&rev=481669&r1=481668&r2=481669
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html
(original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/java/org/apache/forrest/examples/wicket/WelcomePage.html
Sat Dec  2 15:56:06 2006
@@ -11,8 +11,10 @@
 			FIXME: Header goes here
 		</div>
 		
-			<div wicket:id="mainNavigation" id="leftbar">
-				FIXME: mainNavigation goes here
+		    <div id="leftbar">
+				<div wicket:id="mainNavigation" id="nav-section">
+					FIXME: mainNavigation goes here
+				</div>
 			</div>
 			
 			<div wicket:id="body" id="content">

Added: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/images/blue-bullet.gif
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/images/blue-bullet.gif?view=auto&rev=481669
==============================================================================
Binary file - no diff available.

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/images/blue-bullet.gif
------------------------------------------------------------------------------
    svn:mime-type = application/octet-stream

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css?view=diff&rev=481669&r1=481668&r2=481669
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/layout.css Sat Dec  2 15:56:06
2006
@@ -33,10 +33,6 @@
    left: -999em;
 }
 
-hr#content-start {
-   display: none;
-}
-
 /* header */
 #header {
    width: 100%;
@@ -46,7 +42,6 @@
    clear: both;
 }
 
-/* apache logo */
 #header #group-logo {
    clear: both;
    position: relative;

Added: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/nav.css
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/nav.css?view=auto&rev=481669
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/nav.css (added)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/nav.css Sat Dec  2 15:56:06 2006
@@ -0,0 +1,59 @@
+/*
+ * all stuff related to the design of the navigation
+ * this doesn't include the positioning of the nav-section block itself
+ *************************************/
+ 
+/* menu */
+#nav-section ul {
+   padding-left: 5px;
+   margin : 5px 0px 5px 5px;
+}
+
+#nav-section a {
+   color: #000;
+   text-decoration: none;
+}
+
+#nav-section a:visited,
+#nav-section a:hover {
+   text-decoration: underline;
+}
+
+#nav-section li  {
+   list-style: none;
+   line-height: 1.2em;
+   font-size: 0.95em;
+}
+
+#nav-section li li {
+   list-style: url(images/blue-bullet.gif);
+/*
+   padding-left: 10px;
+  background: url(images/blue-bullet.gif) no-repeat left 0.3em;
+*/
+}
+
+/* titles of the first levels */
+#nav-section li.pagegroup span,
+#nav-section li.pagegroupselected span  {
+   display: block;
+   width: 100%;
+   border-bottom: 1px solid #ccc;
+   font-weight: bold;
+   color: #66c;
+   font-variant: small-caps; 
+}
+
+/* lower levels are reversed */
+#nav-section li.pagegroup li span,
+#nav-section li.pagegroupselected li span {
+   display: inline;
+   width: auto;
+   border: 0;
+}
+
+.menupagetitle {
+    color: #66c;
+    display: inline;
+    font-weight: bold;
+}

Propchange: forrest/trunk/whiteboard/forrest2/wicket-demo/src/webapp/nav.css
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml?view=diff&rev=481669&r1=481668&r2=481669
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xdocs/navigation.xml Sat Dec  2 15:56:06
2006
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <navigation>
   <item label="Subdir" href="subdir/index.html"/>
-  <item label="Item 2"/>
+  <item label="Item 2">
+    <item label="Item 2.1">
+	    <item label="Item 2.1.1"/>
+	    <item label="Item 2.1.2"/>
+    </item>
+    <item label="Item 2.2"/>
+  </item>
   <item label="Item 3"/>
 </navigation>

Modified: forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl
URL: http://svn.apache.org/viewvc/forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl?view=diff&rev=481669&r1=481668&r2=481669
==============================================================================
--- forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl (original)
+++ forrest/trunk/whiteboard/forrest2/wicket-demo/src/xslt/navigation-to-internal.xsl Sat
Dec  2 15:56:06 2006
@@ -38,7 +38,7 @@
 	<!-- The item element provides a link to some otehr item in the
 	content object. -->
 	<xsl:template match="item">
-	  <li>
+	  <li class="menuitem">
 	    <xsl:choose>
 	    <xsl:when test="@href">
 	    <a>
@@ -50,6 +50,11 @@
 	      <xsl:value-of select="@label"/>
 	    </xsl:otherwise>
 	    </xsl:choose>
+	    <xsl:if test="item">
+	      <ul>
+	        <xsl:apply-templates/>
+	      </ul>
+	    </xsl:if>
 	  </li>
 	</xsl:template>
 	



Mime
View raw message