You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@continuum.apache.org by ws...@apache.org on 2008/08/31 01:42:11 UTC
svn commit: r690616 - in /continuum/branches/continuum-1.2.x:
continuum-docs/src/site/apt/administrator_guides/index.apt
continuum-docs/src/site/site.xml
continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Author: wsmoak
Date: Sat Aug 30 16:42:10 2008
New Revision: 690616
URL: http://svn.apache.org/viewvc?rev=690616&view=rev
Log:
CONTINUUM-1831 Restore Appearance feature to menu and docs.
reverted commit r690463
Modified:
continuum/branches/continuum-1.2.x/continuum-docs/src/site/apt/administrator_guides/index.apt
continuum/branches/continuum-1.2.x/continuum-docs/src/site/site.xml
continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
Modified: continuum/branches/continuum-1.2.x/continuum-docs/src/site/apt/administrator_guides/index.apt
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-docs/src/site/apt/administrator_guides/index.apt?rev=690616&r1=690615&r2=690616&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-docs/src/site/apt/administrator_guides/index.apt (original)
+++ continuum/branches/continuum-1.2.x/continuum-docs/src/site/apt/administrator_guides/index.apt Sat Aug 30 16:42:10 2008
@@ -26,8 +26,7 @@
* {{{monitoring.html}Monitoring Continuum}}
-~~ TODO: CONTINUUM-1831 NPE in Appearance configuration
-~~ * {{{appearance.html}Appearance Configuration}}
+ * {{{appearance.html}Appearance Configuration}}
* {{{builddefTemplate.html}Build Definition Templates}}
Modified: continuum/branches/continuum-1.2.x/continuum-docs/src/site/site.xml
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-docs/src/site/site.xml?rev=690616&r1=690615&r2=690616&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-docs/src/site/site.xml (original)
+++ continuum/branches/continuum-1.2.x/continuum-docs/src/site/site.xml Sat Aug 30 16:42:10 2008
@@ -79,7 +79,7 @@
<item name="Managing General Configuration" href="administrator_guides/configuration.html"/> <!-- (configuration and appearance) -->
<item name="External databases" href="administrator_guides/external-db.html"/>
<item name="Monitoring Continuum" href="administrator_guides/monitoring.html"/>
- <!-- TODO: CONTINUUM-1831 <item name="Appearance Configuration" href="administrator_guides/appearance.html"/> -->
+ <item name="Appearance Configuration" href="administrator_guides/appearance.html"/>
<item name="Build Definition Template" href="administrator_guides/builddefTemplate.html"/>
<item name="Shutdown Continuum" href="administrator_guides/shutdown.html"/>
</item>
Modified: continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp
URL: http://svn.apache.org/viewvc/continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp?rev=690616&r1=690615&r2=690616&view=diff
==============================================================================
--- continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp (original)
+++ continuum/branches/continuum-1.2.x/continuum-webapp/src/main/webapp/WEB-INF/jsp/navigations/Menu.jsp Sat Aug 30 16:42:10 2008
@@ -151,14 +151,12 @@
<ww:text name="menu.administration.configuration"/>
</ww:a>
</div>
- <!-- TODO: CONTINUUM-1831 NPE in Appearance configuration
<ww:url id="configurationUrl" action="configureAppearance" namespace="/admin" includeParams="none"/>
<div class="body">
<ww:a href="%{configurationUrl}">
<ww:text name="menu.administration.appearance"/>
</ww:a>
</div>
- -->
</redback:ifAuthorized>
<redback:ifAuthorized permission="continuum-manage-users">
<ww:url id="userListUrl" action="userlist" namespace="/security" includeParams="none"/>