You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@forrest.apache.org by ni...@apache.org on 2003/11/30 13:05:05 UTC
cvs commit: xml-forrest/src/forrestbar/xpi/content/forrestbar forrestbar.css forrestbarOverlay.xul
nicolaken 2003/11/30 04:05:05
Modified: src/forrestbar build.xml
src/forrestbar/xpi/content/forrestbar forrestbar.css
forrestbarOverlay.xul
Log:
Update Forrestbar links and remove source filtering.
Revision Changes Path
1.3 +1 -12 xml-forrest/src/forrestbar/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/xml-forrest/src/forrestbar/build.xml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- build.xml 20 Oct 2003 10:05:16 -0000 1.2
+++ build.xml 30 Nov 2003 12:05:05 -0000 1.3
@@ -18,18 +18,7 @@
<mkdir dir="${build.dir}/work/forrestbar" />
<mkdir dir="${build.dir}/work/forrestbar-jar" />
<copy todir="${build.dir}/work/forrestbar-jar" overwrite="true">
- <fileset dir="${xpi.dir}"
- includes="content/**/*.xul" />
- <filterset>
- <filter token="EMBEDDED_NAME" value="${forrestbot.links.forrest.local-embedded.name}"/>
- <filter token="EMBEDDED_URL" value="${forrestbot.links.forrest.local-embedded.url}"/>
- <filter token="WEBAPP_NAME" value="${forrestbot.links.forrest.local-webapp.name}"/>
- <filter token="WEBAPP_URL" value="${forrestbot.links.forrest.local-webapp.url}"/>
- </filterset>
- </copy>
- <copy todir="${build.dir}/work/forrestbar-jar" overwrite="true">
- <fileset dir="${xpi.dir}"
- excludes="content/**/*.xul" />
+ <fileset dir="${xpi.dir}" />
</copy>
<jar jarfile="${build.dir}/work/forrestbar/forrestbar.jar">
<fileset dir="${build.dir}/work/forrestbar-jar" includes="content/**/*" />
1.2 +2 -2 xml-forrest/src/forrestbar/xpi/content/forrestbar/forrestbar.css
Index: forrestbar.css
===================================================================
RCS file: /home/cvs/xml-forrest/src/forrestbar/xpi/content/forrestbar/forrestbar.css,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- forrestbar.css 20 Oct 2003 08:54:16 -0000 1.1
+++ forrestbar.css 30 Nov 2003 12:05:05 -0000 1.2
@@ -63,10 +63,10 @@
list-style-image: url("images/tools.png");
}
-#forrestbar-asksam:hover {
+#forrestbar-faqs:hover {
list-style-image: url("images/faq-down.png");
}
-#forrestbar-asksam {
+#forrestbar-faqs {
list-style-image: url("images/faq.png");
}
1.3 +15 -15 xml-forrest/src/forrestbar/xpi/content/forrestbar/forrestbarOverlay.xul
Index: forrestbarOverlay.xul
===================================================================
RCS file: /home/cvs/xml-forrest/src/forrestbar/xpi/content/forrestbar/forrestbarOverlay.xul,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- forrestbarOverlay.xul 11 Nov 2003 11:00:10 -0000 1.2
+++ forrestbarOverlay.xul 30 Nov 2003 12:05:05 -0000 1.3
@@ -31,13 +31,16 @@
<toolbarbutton class="forrestbar" label="Projects" type="menu" id="forrestbar-projects" hidden="false">
<menupopup>
+ <menuitem label="Apache" onclick="navigate('http://www.apache.org/');" />
+ <menuseparator/>
<menuitem label="Conferences" onclick="navigate('http://www.apache.org/foundation/conferences.html');" />
<menuitem label="Foundation" onclick="navigate('http://www.apache.org/foundation/');" />
<menuitem label="Incubator" onclick="navigate('http://incubator.apache.org/');" />
<menuseparator/>
- <menuitem label="Apache" onclick="navigate('http://www.apache.org/');" />
- <menuitem label="HTTP Server " onclick="navigate('http://httpd.apache.org/');" />
+ <menuitem label="HTTP Server" onclick="navigate('http://httpd.apache.org/');" />
+ <menuitem label="Ant" onclick="navigate('http://ant.apache.org/');" />
<menuitem label="APR" onclick="navigate('http://apr.apache.org/');" />
+ <menuitem label="Cocoon" onclick="navigate('http://cocoon.apache.org/');" />
<menu label="Jakarta">
<menupopup>
<menuitem label="Home" onclick="navigate('http://jakarta.apache.org/');"/>
@@ -67,6 +70,8 @@
<menuitem onclick="navigate('http://jakarta.apache.org/watchdog/index.html')" label="Watchdog"/>
</menupopup>
</menu>
+ <menuitem label="James" onclick="navigate('http://james.apache.org/');" />
+ <menuitem label="Maven" onclick="navigate('http://maven.apache.org/');" />
<menuitem label="PERL" onclick="navigate('http://perl.apache.org/');" />
<menuitem label="PHP" onclick="navigate('http://php.apache.org/');" />
<menuitem label="TCL" onclick="navigate('http://tcl.apache.org/');" />
@@ -94,13 +99,8 @@
<menupopup>
<menuitem label="Home" onclick="navigate('http://xml.apache.org/forrest/');" />
<menuseparator />
- <menuitem label="@EMBEDDED_NAME@" onclick="navigate('@EMBEDDED_URL@');" hidden="false" />
- <menuitem label="@WEBAPP_NAME@" onclick="navigate('@WEBAPP_URL@');" hidden="false" />
- <menuitem label="Browse" onclick="navigate('http://127.0.0.1:8888/edit/');" hidden="false" />
- <menuseparator />
- <menuitem label="Edit Page Content-View" onclick="editPage(window._content.document.location.href+'?cocoon-view=content', window, false);" hidden="false" />
- <menuitem label="Edit Page" onclick="editPage(window._content.document.location.href, window, false);" hidden="false" />
- <menuitem label="Edit Page OnDisk" onclick="editPage('file:///C:/jbprojects/test/build/webapp/content/xdocs/'+window._content.document.location.pathname, window, false);" hidden="false" />
+ <menuitem label="Local Forrest (embedded)" onclick="navigate('http://127.0.0.1:8888/');" hidden="false" />
+ <menuitem label="Local Forrest (webapp)" onclick="navigate('http://127.0.0.1:8080/');" hidden="false" />
</menupopup>
</toolbarbutton>
@@ -108,24 +108,24 @@
<toolbarbutton class="forrestbar" id="forrestbar-gump-nightly" label="Gump" hidden="false" type="menu">
<menupopup>
<menuitem label="Home" onclick="navigate('http://jakarta.apache.org/gump/');" />
- <menuseparator/>
+ <!--<menuseparator/>
<menuitem label="Javadocs" onclick="navigate('http://nagoya.apache.org/~rubys/gump/javadoc.html');" />
<menuitem label="Binaries" onclick="navigate('http://gump.covalent.net/jars/');" />
<menuseparator/>
- <!--<menuitem label="0400 GMT - Rubix" onclick="navigate('http://cvs.apache.org/builds/gump/latest');" />
+ <menuitem label="0400 GMT - Rubix" onclick="navigate('http://cvs.apache.org/builds/gump/latest');" />
<menuitem label="1200 GMT - Nagoya" onclick="navigate('http://nagoya.apache.org/~rubys/gump/');" />
- <menuitem label="Java 1.4" onclick="navigate('http://nagoya.apache.org/~rubys/gump/java14/');" />-->
- <menuitem label="2000 GMT - Covalent" onclick="navigate('http://gump.covalent.net/log/index.html');" />
+ <menuitem label="Java 1.4" onclick="navigate('http://nagoya.apache.org/~rubys/gump/java14/');" />
+ <menuitem label="2000 GMT - Covalent" onclick="navigate('http://gump.covalent.net/log/index.html');" />-->
</menupopup>
</toolbarbutton>
- <toolbarbutton class="forrestbar" label="Ask Sam" type="menu" id="forrestbar-asksam" hidden="false">
+ <toolbarbutton class="forrestbar" label="FAQs" type="menu" id="forrestbar-faqs" hidden="false">
<menupopup>
<menuitem label="FAQ" onclick="navigate('http://www.apache.org/foundation/faq.html');" />
<menuitem label="Search" onclick="navigate('http://search.apache.org/');" />
<menuitem label="Apache Developer Resources" onclick="navigate('http://www.apache.org/dev/');" />
<menuseparator/>
- <menuitem label="Java 1.4.1 API" onclick="navigate('http://java.sun.com/j2se/1.4.1/docs/api/');" />
+ <menuitem label="Java 1.4.2 API" onclick="navigate('http://java.sun.com/j2se/1.4.2/docs/api/');" />
<menuitem label="Ant manual" onclick="navigate('http://ant.apache.org/manual/index.html');" />
</menupopup>
</toolbarbutton>