Anpassungen ccm-ldn-aplaws, insbesondere an Umbenennung ccm-navigation.

git-svn-id: https://svn.libreccm.org/ccm/trunk@1239 8810af33-2d31-482b-a856-94f89814c4df
master
pb 2011-11-10 23:08:41 +00:00
parent 85b3fce594
commit 4a944bc641
54 changed files with 2831 additions and 2967 deletions

View File

@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
; atoz ; atoz
com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
# ccm-ldn-navigation application # ccm-navigation application
; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 ; com.arsdigita.navigation.category_menu_show_grand_children_min=1
; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive ; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 ; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 ; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
com.arsdigita.london.navigation.category_menu_show_grand_children=false com.arsdigita.navigation.category_menu_show_grand_children=false
; com.arsdigita.london.navigation.category_menu_show_nephews=false ; com.arsdigita.navigation.category_menu_show_nephews=false
com.arsdigita.london.navigation.default_cat_root_path=/navigation/ com.arsdigita.navigation.default_cat_root_path=/navigation/
com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
# ccm-ldn-search application # ccm-ldn-search application

View File

@ -36,7 +36,6 @@
<ccm:application name="ccm-ldn-aplaws"/> <ccm:application name="ccm-ldn-aplaws"/>
<ccm:application name="ccm-ldn-atoz"/> <ccm:application name="ccm-ldn-atoz"/>
<ccm:application name="ccm-ldn-dublin"/> <ccm:application name="ccm-ldn-dublin"/>
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-search"/> <ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/> <ccm:application name="ccm-ldn-shortcuts"/>
<ccm:application name="ccm-ldn-subsite"/> <ccm:application name="ccm-ldn-subsite"/>
@ -44,6 +43,7 @@
<ccm:application name="ccm-ldn-terms"/> <ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-util"/> <ccm:application name="ccm-ldn-util"/>
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalworkspace"/> <ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-themedirector"/> <ccm:application name="ccm-themedirector"/>

View File

@ -218,11 +218,11 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>
<param-name>template-path</param-name> <param-name>template-path</param-name>
<param-value>/templates/ccm-ldn-navigation</param-value> <param-value>/templates/ccm-navigation</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>file-resolver</param-name> <param-name>file-resolver</param-name>
<param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
</init-param> </init-param>
</servlet> </servlet>
@ -361,7 +361,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>navigation-files</servlet-name> <servlet-name>navigation-files</servlet-name>
<url-pattern>/ccm-ldn-navigation/files/*</url-pattern> <url-pattern>/ccm-navigation/files/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- module ccm-ldn-rss - servlet mappings --> <!-- module ccm-ldn-rss - servlet mappings -->

View File

@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
; atoz ; atoz
com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
# ccm-ldn-navigation application # ccm-navigation application
; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 ; com.arsdigita.navigation.category_menu_show_grand_children_min=1
; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive ; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 ; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 ; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
com.arsdigita.london.navigation.category_menu_show_grand_children=false com.arsdigita.navigation.category_menu_show_grand_children=false
; com.arsdigita.london.navigation.category_menu_show_nephews=false ; com.arsdigita.navigation.category_menu_show_nephews=false
com.arsdigita.london.navigation.default_cat_root_path=/navigation/ com.arsdigita.navigation.default_cat_root_path=/navigation/
com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
# ccm-ldn-search application # ccm-ldn-search application

View File

@ -67,7 +67,6 @@
<ccm:application name="ccm-ldn-exporter"/> <ccm:application name="ccm-ldn-exporter"/>
<ccm:application name="ccm-ldn-freeform"/> <ccm:application name="ccm-ldn-freeform"/>
<ccm:application name="ccm-ldn-importer"/> <ccm:application name="ccm-ldn-importer"/>
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-rss"/> <ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/> <ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/> <ccm:application name="ccm-ldn-shortcuts"/>
@ -80,6 +79,7 @@
<ccm:application name="ccm-faq"/> <ccm:application name="ccm-faq"/>
<ccm:application name="ccm-forum"/> <ccm:application name="ccm-forum"/>
<ccm:application name="ccm-forum-categorised"/> <ccm:application name="ccm-forum-categorised"/>
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalserver"/> <ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/> <ccm:application name="ccm-portalworkspace"/>
<ccm:application name="ccm-themedirector"/> <ccm:application name="ccm-themedirector"/>

View File

@ -196,11 +196,11 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>
<param-name>template-path</param-name> <param-name>template-path</param-name>
<param-value>/templates/ccm-ldn-navigation</param-value> <param-value>/templates/ccm-navigation</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>file-resolver</param-name> <param-name>file-resolver</param-name>
<param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
</init-param> </init-param>
</servlet> </servlet>
@ -339,7 +339,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>navigation-files</servlet-name> <servlet-name>navigation-files</servlet-name>
<url-pattern>/ccm-ldn-navigation/files/*</url-pattern> <url-pattern>/ccm-navigation/files/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- module ccm-ldn-rss - servlet mappings --> <!-- module ccm-ldn-rss - servlet mappings -->

View File

@ -119,15 +119,15 @@ com.arsdigita.forum.disable_page_caching=true
; atoz ; atoz
com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
# ccm-ldn-navigation application # ccm-navigation application
; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 ; com.arsdigita.navigation.category_menu_show_grand_children_min=1
; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive ; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 ; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 ; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
com.arsdigita.london.navigation.category_menu_show_grand_children=false com.arsdigita.navigation.category_menu_show_grand_children=false
; com.arsdigita.london.navigation.category_menu_show_nephews=false ; com.arsdigita.navigation.category_menu_show_nephews=false
com.arsdigita.london.navigation.default_cat_root_path=/navigation/ com.arsdigita.navigation.default_cat_root_path=/navigation/
com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
# ccm-ldn-search application # ccm-ldn-search application

View File

@ -78,7 +78,6 @@
<ccm:application name="ccm-ldn-exporter"/> <ccm:application name="ccm-ldn-exporter"/>
<ccm:application name="ccm-ldn-freeform"/> <ccm:application name="ccm-ldn-freeform"/>
<ccm:application name="ccm-ldn-importer"/> <ccm:application name="ccm-ldn-importer"/>
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-rss"/> <ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/> <ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/> <ccm:application name="ccm-ldn-shortcuts"/>
@ -86,6 +85,7 @@
<ccm:application name="ccm-ldn-terms"/> <ccm:application name="ccm-ldn-terms"/>
<ccm:application name="ccm-ldn-util"/> <ccm:application name="ccm-ldn-util"/>
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalserver"/> <ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/> <ccm:application name="ccm-portalworkspace"/>
<!-- Currently broken. <!-- Currently broken.

View File

@ -218,11 +218,11 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>
<param-name>template-path</param-name> <param-name>template-path</param-name>
<param-value>/templates/ccm-ldn-navigation</param-value> <param-value>/templates/ccm-navigation</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>file-resolver</param-name> <param-name>file-resolver</param-name>
<param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
</init-param> </init-param>
</servlet> </servlet>
@ -361,7 +361,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>navigation-files</servlet-name> <servlet-name>navigation-files</servlet-name>
<url-pattern>/ccm-ldn-navigation/files/*</url-pattern> <url-pattern>/ccm-navigation/files/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- module ccm-ldn-rss - servlet mappings --> <!-- module ccm-ldn-rss - servlet mappings -->

View File

@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
; atoz ; atoz
com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
# ccm-ldn-navigation application # ccm-navigation application
; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 ; com.arsdigita.navigation.category_menu_show_grand_children_min=1
; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive ; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 ; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 ; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
com.arsdigita.london.navigation.category_menu_show_grand_children=false com.arsdigita.navigation.category_menu_show_grand_children=false
; com.arsdigita.london.navigation.category_menu_show_nephews=false ; com.arsdigita.navigation.category_menu_show_nephews=false
com.arsdigita.london.navigation.default_cat_root_path=/navigation/ com.arsdigita.navigation.default_cat_root_path=/navigation/
com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
# ccm-ldn-search application # ccm-ldn-search application

View File

@ -60,7 +60,6 @@
<ccm:application name="ccm-ldn-exporter"/> <ccm:application name="ccm-ldn-exporter"/>
<ccm:application name="ccm-ldn-freeform"/> <ccm:application name="ccm-ldn-freeform"/>
<ccm:application name="ccm-ldn-importer"/> <ccm:application name="ccm-ldn-importer"/>
<ccm:application name="ccm-ldn-navigation"/>
<ccm:application name="ccm-ldn-rss"/> <ccm:application name="ccm-ldn-rss"/>
<ccm:application name="ccm-ldn-search"/> <ccm:application name="ccm-ldn-search"/>
<ccm:application name="ccm-ldn-shortcuts"/> <ccm:application name="ccm-ldn-shortcuts"/>
@ -81,6 +80,7 @@
<!-- <ccm:application name="ccm-formbuilder-pdf"/> --> <!-- <ccm:application name="ccm-formbuilder-pdf"/> -->
<ccm:application name="ccm-forum"/> <ccm:application name="ccm-forum"/>
<ccm:application name="ccm-forum-categorised"/> <ccm:application name="ccm-forum-categorised"/>
<ccm:application name="ccm-navigation"/>
<ccm:application name="ccm-portalserver"/> <ccm:application name="ccm-portalserver"/>
<ccm:application name="ccm-portalworkspace"/> <ccm:application name="ccm-portalworkspace"/>
<!-- Completely untested --> <!-- Completely untested -->

View File

@ -218,11 +218,11 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>
<param-name>template-path</param-name> <param-name>template-path</param-name>
<param-value>/templates/ccm-ldn-navigation</param-value> <param-value>/templates/ccm-navigation</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>file-resolver</param-name> <param-name>file-resolver</param-name>
<param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
</init-param> </init-param>
</servlet> </servlet>
@ -361,7 +361,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>navigation-files</servlet-name> <servlet-name>navigation-files</servlet-name>
<url-pattern>/ccm-ldn-navigation/files/*</url-pattern> <url-pattern>/ccm-navigation/files/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- module ccm-ldn-rss - servlet mappings --> <!-- module ccm-ldn-rss - servlet mappings -->

View File

@ -114,15 +114,15 @@ com.arsdigita.forum.disable_page_caching=true
; atoz ; atoz
com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker com.arsdigita.london.atoz.root_category_picker=com.arsdigita.london.terms.ui.RootCategoryPicker
# ccm-ldn-navigation application # ccm-navigation application
; com.arsdigita.london.navigation.category_menu_show_grand_children_min=1 ; com.arsdigita.navigation.category_menu_show_grand_children_min=1
; com.arsdigita.london.navigation.category_menu_show_grand_children=adaptive ; com.arsdigita.navigation.category_menu_show_grand_children=adaptive
; com.arsdigita.london.navigation.category_menu_show_grand_children_limit=1 ; com.arsdigita.navigation.category_menu_show_grand_children_limit=1
; com.arsdigita.london.navigation.category_menu_show_grand_children_max=65536 ; com.arsdigita.navigation.category_menu_show_grand_children_max=65536
com.arsdigita.london.navigation.category_menu_show_grand_children=false com.arsdigita.navigation.category_menu_show_grand_children=false
; com.arsdigita.london.navigation.category_menu_show_nephews=false ; com.arsdigita.navigation.category_menu_show_nephews=false
com.arsdigita.london.navigation.default_cat_root_path=/navigation/ com.arsdigita.navigation.default_cat_root_path=/navigation/
com.arsdigita.london.navigation.default_template=/packages/navigation/templates/default.jsp com.arsdigita.navigation.default_template=/packages/navigation/templates/default.jsp
# ccm-ldn-search application # ccm-ldn-search application

View File

@ -218,11 +218,11 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>
<param-name>template-path</param-name> <param-name>template-path</param-name>
<param-value>/templates/ccm-ldn-navigation</param-value> <param-value>/templates/ccm-navigation</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>file-resolver</param-name> <param-name>file-resolver</param-name>
<param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
</init-param> </init-param>
</servlet> </servlet>
@ -361,7 +361,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>navigation-files</servlet-name> <servlet-name>navigation-files</servlet-name>
<url-pattern>/ccm-ldn-navigation/files/*</url-pattern> <url-pattern>/ccm-navigation/files/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- module ccm-ldn-rss - servlet mappings --> <!-- module ccm-ldn-rss - servlet mappings -->

View File

@ -120,7 +120,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Root&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Root&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -139,7 +139,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.TopLevel&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.TopLevel&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -158,7 +158,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Siblings&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Siblings&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -176,7 +176,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Children&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Children&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -195,7 +195,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Path&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Path&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -216,7 +216,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Menu&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Menu&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -235,7 +235,7 @@ etc.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.category.Hierarchy&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.category.Hierarchy&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;
@ -298,7 +298,7 @@ contains a summary of top two levels of navigation categories.
&lt;/xs:documentation&gt; &lt;/xs:documentation&gt;
&lt;xs:appinfo&gt; &lt;xs:appinfo&gt;
&lt;gen:class&gt;com.arsdigita.london.navigation.ui.DirectoryComponent&lt;/gen:class&gt; &lt;gen:class&gt;com.arsdigita.navigation.ui.DirectoryComponent&lt;/gen:class&gt;
&lt;/xs:appinfo&gt; &lt;/xs:appinfo&gt;
&lt;/xs:annotation&gt; &lt;/xs:annotation&gt;

View File

@ -15,7 +15,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.DirectoryComponent</gen:class> <gen:class>com.arsdigita.navigation.ui.DirectoryComponent</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>

View File

@ -12,7 +12,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.Root</gen:class> <gen:class>com.arsdigita.navigation.ui.category.Root</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -31,7 +31,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.TopLevel</gen:class> <gen:class>com.arsdigita.navigation.ui.category.TopLevel</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -50,7 +50,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.Siblings</gen:class> <gen:class>com.arsdigita.navigation.ui.category.Siblings</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -68,7 +68,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.Children</gen:class> <gen:class>com.arsdigita.navigation.ui.category.Children</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -87,7 +87,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.Path</gen:class> <gen:class>com.arsdigita.navigation.ui.category.Path</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -108,7 +108,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.Menu</gen:class> <gen:class>com.arsdigita.navigation.ui.category.Menu</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>
@ -127,7 +127,7 @@
</xs:documentation> </xs:documentation>
<xs:appinfo> <xs:appinfo>
<gen:class>com.arsdigita.london.navigation.ui.category.Hierarchy</gen:class> <gen:class>com.arsdigita.navigation.ui.category.Hierarchy</gen:class>
</xs:appinfo> </xs:appinfo>
</xs:annotation> </xs:annotation>

View File

@ -1,5 +1,10 @@
<?xml version="1.0"?> <?xml version="1.0"?>
<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml" key="APLAWS-NAV" title="APLAWS Navigation List" version="1.03" released="2004-03-24"> <terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
about="http://www.aplaws.org.uk/standards/nav/1.03/termslist.xml"
key="APLAWS-NAV"
title="APLAWS Navigation List"
version="1.03"
released="2004-03-24">
<terms:term id="1" name="Business" inAtoZ="false"/> <terms:term id="1" name="Business" inAtoZ="false"/>
<terms:term id="1007" name="Jobs and careers" inAtoZ="false"/> <terms:term id="1007" name="Jobs and careers" inAtoZ="false"/>
<terms:term id="1021" name="Legal services" inAtoZ="false"/> <terms:term id="1021" name="Legal services" inAtoZ="false"/>

View File

@ -1,5 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" about="http://www.aplaws.org.uk/standards/rss/1.00/termslist.xml" key="APLAWS-RSS" title="APLAWS RSS Feed List" version="1.00" released="2003-01-21"> <terms:domain xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
about="http://www.aplaws.org.uk/standards/rss/1.00/termslist.xml"
key="APLAWS-RSS"
title="APLAWS RSS Feed List"
version="1.00"
released="2003-01-21">
<terms:term id="1" name="Press Releases" inAtoZ="false"/> <terms:term id="1" name="Press Releases" inAtoZ="false"/>
<terms:term id="2" name="News" inAtoZ="false"/> <terms:term id="2" name="News" inAtoZ="false"/>
<terms:term id="3" name="Events" inAtoZ="false"/> <terms:term id="3" name="Events" inAtoZ="false"/>

View File

@ -1,44 +0,0 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:define="/WEB-INF/bebop-define.tld"
xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2">
<jsp:directive.page
import="com.arsdigita.london.navigation.NavigationModel,
com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
<jsp:declaration>
NavigationModel model = new CMSNavigationModel();
</jsp:declaration>
<define:page name="itemPage" application="content-section"
title="APLAWS" cache="true">
<define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/>
<jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
.setModel(model);
</jsp:scriptlet>
<define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/>
<jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
.setModel(model);
</jsp:scriptlet>
<define:component name="itemXML"
classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
<define:component name="sectionXML"
classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
<define:component name="relatedItems"
classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
<define:component name="assignedTerms"
classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
</define:page>
<show:all/>
</jsp:root>

View File

@ -1,44 +0,0 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:define="/WEB-INF/bebop-define.tld"
xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2">
<jsp:directive.page
import="com.arsdigita.london.navigation.NavigationModel,
com.arsdigita.london.navigation.cms.CMSNavigationModel"/>
<jsp:declaration>
NavigationModel model = new CMSNavigationModel();
</jsp:declaration>
<define:page name="SiteProxyItemPage" application="content"
title="CMS" cache="true">
<define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/>
<jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Path)categoryPath)
.setModel(model);
</jsp:scriptlet>
<define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/>
<jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu)
.setModel(model);
</jsp:scriptlet>
<define:component name="itemXML"
classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
<define:component name="siteProxyItemXML"
classname="com.arsdigita.cms.dispatcher.SiteProxyPanel"/>
<define:component name="relatedItems"
classname="com.arsdigita.london.navigation.ui.RelatedItems"/>
<define:component name="assignedTerms"
classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>
</define:page>
<show:all/>
</jsp:root>

View File

@ -5,8 +5,8 @@
<initializer class="com.arsdigita.core.Initializer"/> <initializer class="com.arsdigita.core.Initializer"/>
<table name="cms_items"/> <table name="cms_items"/>
<initializer class="com.arsdigita.cms.Initializer"/> <initializer class="com.arsdigita.cms.Initializer"/>
<initializer class="com.arsdigita.navigation.Initializer"/>
<initializer class="com.arsdigita.portalworkspace.Initializer"/> <initializer class="com.arsdigita.portalworkspace.Initializer"/>
<initializer class="com.arsdigita.london.navigation.Initializer"/>
<initializer class="com.arsdigita.london.search.Initializer"/> <initializer class="com.arsdigita.london.search.Initializer"/>
<initializer class="com.arsdigita.london.subsite.Initializer"/> <initializer class="com.arsdigita.london.subsite.Initializer"/>
<initializer class="com.arsdigita.london.terms.Initializer"/> <initializer class="com.arsdigita.london.terms.Initializer"/>

View File

@ -40,8 +40,8 @@ import com.arsdigita.domain.DomainServiceInterfaceExposer;
import com.arsdigita.kernel.Kernel; import com.arsdigita.kernel.Kernel;
import com.arsdigita.kernel.KernelExcursion; import com.arsdigita.kernel.KernelExcursion;
import com.arsdigita.london.cms.dublin.DublinCoreItem; import com.arsdigita.london.cms.dublin.DublinCoreItem;
import com.arsdigita.london.navigation.Navigation; import com.arsdigita.navigation.Navigation;
import com.arsdigita.london.navigation.NavigationFileResolver; import com.arsdigita.navigation.NavigationFileResolver;
import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Domain;
import com.arsdigita.london.terms.Term; import com.arsdigita.london.terms.Term;
import com.arsdigita.london.util.Transaction; import com.arsdigita.london.util.Transaction;

View File

@ -37,9 +37,9 @@ import com.arsdigita.util.parameter.StringParameter;
import com.arsdigita.util.parameter.URLParameter; import com.arsdigita.util.parameter.URLParameter;
import com.arsdigita.web.Application; import com.arsdigita.web.Application;
import com.arsdigita.london.navigation.Navigation; import com.arsdigita.navigation.Navigation;
import com.arsdigita.london.navigation.Template; import com.arsdigita.navigation.Template;
import com.arsdigita.london.navigation.TemplateMapping; import com.arsdigita.navigation.TemplateMapping;
import com.arsdigita.london.terms.Domain; import com.arsdigita.london.terms.Domain;
import com.arsdigita.london.terms.importer.Parser; import com.arsdigita.london.terms.importer.Parser;
// import com.arsdigita.portalworkspace.PageLayout; // import com.arsdigita.portalworkspace.PageLayout;
@ -55,7 +55,8 @@ import java.util.Set;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
/** /**
* Loader. * Loader executes nonrecurring at install time and loads (installs and
* initializes) the APLAWS integration module persistently into database.
* *
* Creates category domains in the terms application according to * Creates category domains in the terms application according to
* configuration files and adds jsp templates to navigation. * configuration files and adds jsp templates to navigation.
@ -204,14 +205,19 @@ public class Loader extends PackageLoader {
public void run(final ScriptContext ctx) { public void run(final ScriptContext ctx) {
/* */
Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE, Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE,
"services", "services",
"Services", "Services",
null); null);
/* Create an additional Navigation application instance used as an
* custom navigation tree in addition or as an alternative to the
* standard APLAWS LGL navigation tree.
*/
String customNavPath = (String)get(m_customNavPath); String customNavPath = (String)get(m_customNavPath);
String customNavTitle = (String)get(m_customNavTitle); String customNavTitle = (String)get(m_customNavTitle);
Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE, Application.createApplication(Navigation.BASE_DATA_OBJECT_TYPE,
customNavPath, customNavPath,
customNavTitle, customNavTitle,
@ -221,11 +227,13 @@ public class Loader extends PackageLoader {
s_esdFilesLite : s_esdFiles; s_esdFilesLite : s_esdFiles;
final Parser parser = new Parser(); final Parser parser = new Parser();
// for each filename in the array of files containing categories
for (int i = 0 ; i < files.length ; i++) { for (int i = 0 ; i < files.length ; i++) {
final String file = files[i]; final String file = files[i];
if (s_log.isInfoEnabled()) { if (s_log.isInfoEnabled()) {
s_log.info("Process " + file); s_log.info("Process " + file);
} }
/* Import a Terms category domain. */
parser.parse(Thread.currentThread().getContextClassLoader parser.parse(Thread.currentThread().getContextClassLoader
().getResourceAsStream ().getResourceAsStream
(file)); (file));
@ -307,6 +315,17 @@ public class Loader extends PackageLoader {
"/packages/navigation/templates/aplaws-portal.jsp"); "/packages/navigation/templates/aplaws-portal.jsp");
} }
/**
* Determines the Terms domain using domainKey as well as the application
* instance using appURL and then creates a domain mapping using context
* as domain context.
*
* Uses Package com.arsdigita.london.terms.Domain (!)
*
* @param domainKey
* @param appURL
* @param context
*/
public void registerDomain(String domainKey, public void registerDomain(String domainKey,
String appURL, String appURL,
String context) { String context) {
@ -316,9 +335,14 @@ public class Loader extends PackageLoader {
" in context " + context); " in context " + context);
} }
/* Determine Domain and Application objects, both MUST exist! */
Domain domain = Domain.retrieve(domainKey); // package com.arsdigita.london.terms Domain domain = Domain.retrieve(domainKey); // package com.arsdigita.london.terms
Application app = Application.retrieveApplicationForPath(appURL); Application app = Application.retrieveApplicationForPath(appURL);
/* Create domain mapping */
domain.setAsRootForObject(app, context); domain.setAsRootForObject(app, context);
/* Create permissions and roles for content-center applications only */
if (app instanceof ContentSection) { if (app instanceof ContentSection) {
RoleCollection coll = ((ContentSection) app).getStaffGroup().getOrderedRoles(); RoleCollection coll = ((ContentSection) app).getStaffGroup().getOrderedRoles();
Set adminRoles = new HashSet(); Set adminRoles = new HashSet();

View File

@ -24,7 +24,7 @@ import com.arsdigita.cms.ContentBundle;
import com.arsdigita.cms.ContentItem; import com.arsdigita.cms.ContentItem;
import com.arsdigita.cms.ContentPage; import com.arsdigita.cms.ContentPage;
import com.arsdigita.kernel.ACSObject; import com.arsdigita.kernel.ACSObject;
import com.arsdigita.london.navigation.Navigation; import com.arsdigita.navigation.Navigation;
import com.arsdigita.london.terms.ui.AbstractAssignedTerms; import com.arsdigita.london.terms.ui.AbstractAssignedTerms;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;

View File

@ -18,8 +18,8 @@
package com.arsdigita.aplaws.ui; package com.arsdigita.aplaws.ui;
import com.arsdigita.london.navigation.Navigation; import com.arsdigita.navigation.Navigation;
import com.arsdigita.london.navigation.NavigationModel; import com.arsdigita.navigation.NavigationModel;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;

View File

@ -22,7 +22,7 @@ import com.arsdigita.london.terms.Term;
import com.arsdigita.london.terms.ui.AbstractTermDetails; import com.arsdigita.london.terms.ui.AbstractTermDetails;
import com.arsdigita.persistence.DataCollection; import com.arsdigita.persistence.DataCollection;
import com.arsdigita.persistence.SessionManager; import com.arsdigita.persistence.SessionManager;
import com.arsdigita.london.navigation.Navigation; import com.arsdigita.navigation.Navigation;
import com.arsdigita.categorization.Category; import com.arsdigita.categorization.Category;
import com.arsdigita.bebop.PageState; import com.arsdigita.bebop.PageState;
import com.arsdigita.domain.DomainObjectFactory; import com.arsdigita.domain.DomainObjectFactory;

View File

@ -222,11 +222,11 @@
<servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class> <servlet-class>com.arsdigita.web.ApplicationFileServlet</servlet-class>
<init-param> <init-param>
<param-name>template-path</param-name> <param-name>template-path</param-name>
<param-value>/templates/ccm-ldn-navigation</param-value> <param-value>/templates/ccm-navigation</param-value>
</init-param> </init-param>
<init-param> <init-param>
<param-name>file-resolver</param-name> <param-name>file-resolver</param-name>
<param-value>com.arsdigita.london.navigation.NavigationFileResolver</param-value> <param-value>com.arsdigita.navigation.NavigationFileResolver</param-value>
</init-param> </init-param>
</servlet> </servlet>
@ -365,7 +365,7 @@
<servlet-mapping> <servlet-mapping>
<servlet-name>navigation-files</servlet-name> <servlet-name>navigation-files</servlet-name>
<url-pattern>/ccm-ldn-navigation/files/*</url-pattern> <url-pattern>/ccm-navigation/files/*</url-pattern>
</servlet-mapping> </servlet-mapping>
<!-- module ccm-ldn-rss - servlet mappings --> <!-- module ccm-ldn-rss - servlet mappings -->

View File

@ -4,8 +4,8 @@
version="1.2"> version="1.2">
<jsp:directive.page <jsp:directive.page
import="com.arsdigita.london.navigation.NavigationModel, import="com.arsdigita.navigation.NavigationModel,
com.arsdigita.london.navigation.cms.CMSNavigationModel"/> com.arsdigita.navigation.cms.CMSNavigationModel"/>
<jsp:declaration> <jsp:declaration>
NavigationModel model = new CMSNavigationModel(); NavigationModel model = new CMSNavigationModel();
@ -15,22 +15,22 @@
title="APLAWS" cache="true"> title="APLAWS" cache="true">
<define:component name="categoryPath" <define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/> classname="com.arsdigita.navigation.ui.category.Path"/>
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Path)categoryPath) ((com.arsdigita.navigation.ui.category.Path)categoryPath)
.setModel(model); .setModel(model);
</jsp:scriptlet> </jsp:scriptlet>
<define:component name="categoryMenu" <define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/> classname="com.arsdigita.navigation.ui.category.Menu"/>
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Menu)categoryMenu) ((com.arsdigita.navigation.ui.category.Menu)categoryMenu)
.setModel(model); .setModel(model);
</jsp:scriptlet> </jsp:scriptlet>
<define:component name="itemXML" <define:component name="itemXML"
classname="com.arsdigita.cms.dispatcher.ContentPanel"/> classname="com.arsdigita.cms.dispatcher.ContentPanel"/>
<define:component name="relatedItems" <define:component name="relatedItems"
classname="com.arsdigita.london.navigation.ui.RelatedItems"/> classname="com.arsdigita.navigation.ui.RelatedItems"/>
<define:component name="assignedTerms" <define:component name="assignedTerms"
classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/> classname="com.arsdigita.aplaws.ui.AssignedItemTerms"/>

View File

@ -6,9 +6,9 @@
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/> <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/> <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
<jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/> <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/> <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/> <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
<jsp:directive.page import="org.apache.log4j.Logger"/> <jsp:directive.page import="org.apache.log4j.Logger"/>
<jsp:scriptlet> <jsp:scriptlet>
@ -23,24 +23,24 @@
<define:page name="defaultItemPage" application="navigation" <define:page name="defaultItemPage" application="navigation"
title="Navigation" cache="false"> title="Navigation" cache="false">
<define:component name="greetingItem" <define:component name="greetingItem"
classname="com.arsdigita.london.navigation.ui.GreetingItem"/> classname="com.arsdigita.navigation.ui.GreetingItem"/>
<define:component name="categoryPath" <define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/> classname="com.arsdigita.navigation.ui.category.Path"/>
<define:component name="categoryMenu" <define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/> classname="com.arsdigita.navigation.ui.category.Menu"/>
<define:component name="itemList" <define:component name="itemList"
classname="com.arsdigita.london.navigation.ui.object.ComplexObjectList"/> classname="com.arsdigita.navigation.ui.object.ComplexObjectList"/>
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey"); ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20); ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setPageSize(20);
((com.arsdigita.london.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true); ((com.arsdigita.navigation.ui.object.ComplexObjectList) itemList).getRenderer().setSpecializeObjects(true);
</jsp:scriptlet> </jsp:scriptlet>
<define:component name="assignedTerms" <define:component name="assignedTerms"
classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/> classname="com.arsdigita.navigation.ui.CategoryIndexAssignedTerms"/>
</define:page> </define:page>
<show:all/> <show:all/>
</jsp:root> </jsp:root>

View File

@ -5,9 +5,9 @@
<jsp:directive.page import=" <jsp:directive.page import="
com.arsdigita.cms.contenttypes.Article, com.arsdigita.cms.contenttypes.Article,
com.arsdigita.london.navigation.ui.CategoryItemNav, com.arsdigita.navigation.ui.CategoryItemNav,
com.arsdigita.london.navigation.ui.CategoryNav, com.arsdigita.navigation.ui.CategoryNav,
com.arsdigita.london.navigation.ui.ItemList"/> com.arsdigita.navigation.ui.ItemList"/>
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/> <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:scriptlet>DispatcherHelper.cacheForWorld( response );</jsp:scriptlet> <jsp:scriptlet>DispatcherHelper.cacheForWorld( response );</jsp:scriptlet>
@ -16,25 +16,25 @@
title="APLAWS" cache="true"> title="APLAWS" cache="true">
<define:component name="categoryNav" <define:component name="categoryNav"
classname="com.arsdigita.london.navigation.ui.CategoryNav"> classname="com.arsdigita.navigation.ui.CategoryNav">
<jsp:scriptlet> <jsp:scriptlet>
((CategoryNav) categoryNav).setUseItemID(false); ((CategoryNav) categoryNav).setUseItemID(false);
</jsp:scriptlet> </jsp:scriptlet>
</define:component> </define:component>
<define:component name="categoryItemNav" <define:component name="categoryItemNav"
classname="com.arsdigita.london.navigation.ui.CategoryItemNav"> classname="com.arsdigita.navigation.ui.CategoryItemNav">
<jsp:scriptlet> <jsp:scriptlet>
((CategoryItemNav) categoryItemNav).setUseItemID(false); ((CategoryItemNav) categoryItemNav).setUseItemID(false);
</jsp:scriptlet> </jsp:scriptlet>
</define:component> </define:component>
<define:component name="greetingComponent" <define:component name="greetingComponent"
classname="com.arsdigita.london.navigation.ui.GreetingItem"> classname="com.arsdigita.navigation.ui.GreetingItem">
</define:component> </define:component>
<define:component name="fixedPromoComponent" <define:component name="fixedPromoComponent"
classname="com.arsdigita.london.navigation.ui.ItemList"> classname="com.arsdigita.navigation.ui.ItemList">
<jsp:scriptlet> <jsp:scriptlet>
ItemList fixedPromo = (ItemList) fixedPromoComponent; ItemList fixedPromo = (ItemList) fixedPromoComponent;
fixedPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE ); fixedPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE );
@ -47,7 +47,7 @@
</define:component> </define:component>
<define:component name="dynamicPromoComponent" <define:component name="dynamicPromoComponent"
classname="com.arsdigita.london.navigation.ui.ItemList"> classname="com.arsdigita.navigation.ui.ItemList">
<jsp:scriptlet> <jsp:scriptlet>
ItemList dynamicPromo = (ItemList) dynamicPromoComponent; ItemList dynamicPromo = (ItemList) dynamicPromoComponent;
dynamicPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE ); dynamicPromo.setObjectType( Article.BASE_DATA_OBJECT_TYPE );
@ -61,11 +61,11 @@
</define:component> </define:component>
<define:component name="L3ContentPane" <define:component name="L3ContentPane"
classname="com.arsdigita.london.navigation.ui.L3ContentPane"> classname="com.arsdigita.navigation.ui.L3ContentPane">
</define:component> </define:component>
<define:component name="relatedItemsComponent" <define:component name="relatedItemsComponent"
classname="com.arsdigita.london.navigation.ui.RelatedItems"> classname="com.arsdigita.navigation.ui.RelatedItems">
</define:component> </define:component>
</define:page> </define:page>

View File

@ -5,7 +5,7 @@
version="1.2"> version="1.2">
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/> <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/> <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/> <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
<jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/> <jsp:directive.page import="com.arsdigita.aplaws.ui.CategoryPortalSelectionModel"/>
@ -22,13 +22,13 @@
title="Navigation" cache="true"> title="Navigation" cache="true">
<define:component name="categoryPath" <define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/> classname="com.arsdigita.navigation.ui.category.Path"/>
<define:component name="categoryMenu" <define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/> classname="com.arsdigita.navigation.ui.category.Menu"/>
<define:component name="portalWorkspace" <define:component name="portalWorkspace"
classname="com.arsdigita.london.portal.ui.WorkspaceViewer"/> classname="com.arsdigita.portalworkspace.ui.WorkspaceViewer"/>
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.portal.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel()); ((com.arsdigita.portalworkspace.ui.WorkspaceViewer) portalWorkspace).setWorkspaceModel(new CategoryPortalSelectionModel());
</jsp:scriptlet> </jsp:scriptlet>
</define:page> </define:page>

View File

@ -6,9 +6,9 @@
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/> <jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/> <jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
<jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/> <jsp:directive.page import="com.arsdigita.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/> <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionDefinition"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/> <jsp:directive.page import="com.arsdigita.navigation.cms.CMSDataCollectionRenderer"/>
<jsp:scriptlet> <jsp:scriptlet>
long age = Navigation.getConfig().getIndexPageCacheLifetime(); long age = Navigation.getConfig().getIndexPageCacheLifetime();
@ -23,25 +23,25 @@
title="Navigation" cache="true"> title="Navigation" cache="true">
<define:component name="greetingItem" <define:component name="greetingItem"
classname="com.arsdigita.london.navigation.ui.GreetingItem"/> classname="com.arsdigita.navigation.ui.GreetingItem"/>
<define:component name="categoryPath" <define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/> classname="com.arsdigita.navigation.ui.category.Path"/>
<define:component name="categoryMenu" <define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/> classname="com.arsdigita.navigation.ui.category.Menu"/>
<define:component name="categoryTermDetails" <define:component name="categoryTermDetails"
classname="com.arsdigita.aplaws.ui.CategoryTermDetails"/> classname="com.arsdigita.aplaws.ui.CategoryTermDetails"/>
<define:component name="itemList" <define:component name="itemList"
classname="com.arsdigita.london.navigation.ui.object.AtoZObjectList"/> classname="com.arsdigita.navigation.ui.object.AtoZObjectList"/>
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition()); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer()); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage"); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getDefinition().setDescendCategories(false);
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().setPageSize(30);
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType"); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute("objectType");
((com.arsdigita.london.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title"); ((com.arsdigita.navigation.ui.object.AtoZObjectList) itemList).getRenderer().addAttribute( "title");
</jsp:scriptlet> </jsp:scriptlet>
</define:page> </define:page>

View File

@ -1,65 +0,0 @@
<jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
xmlns:define="/WEB-INF/bebop-define.tld"
xmlns:show="/WEB-INF/bebop-show.tld"
version="1.2">
<jsp:directive.page import="com.arsdigita.dispatcher.DispatcherHelper"/>
<jsp:directive.page import="com.arsdigita.bebop.parameters.BigDecimalParameter"/>
<jsp:directive.page import="com.arsdigita.london.navigation.Navigation"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionDefinition"/>
<jsp:directive.page import="com.arsdigita.london.navigation.cms.CMSDataCollectionRenderer"/>
<jsp:scriptlet>
long age = Navigation.getConfig().getIndexPageCacheLifetime();
if (age == 0) {
DispatcherHelper.cacheDisable(response);
} else {
DispatcherHelper.cacheForWorld(response, (int)age);
}
</jsp:scriptlet>
<define:page name="defaultItemPage" application="navigation"
title="Navigation" cache="true">
<define:component name="greetingItem"
classname="com.arsdigita.london.navigation.ui.GreetingItem"/>
<define:component name="sectionXML"
classname="com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel"/>
<jsp:scriptlet>
com.arsdigita.cms.ContentItem item = (com.arsdigita.cms.ContentItem)((com.arsdigita.london.navigation.ui.GreetingItem) greetingItem).getObject();
((com.arsdigita.cms.contenttypes.ui.mparticle.ArticleSectionPanel) sectionXML).setContentItem(item);
</jsp:scriptlet>
<define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/>
<define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/>
<define:component name="itemList"
classname="com.arsdigita.london.navigation.ui.object.SimpleObjectList"/>
<jsp:scriptlet>
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setDefinition(new CMSDataCollectionDefinition());
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).setRenderer(new CMSDataCollectionRenderer());
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setObjectType("com.arsdigita.cms.ContentPage");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().setDescendCategories(false);
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getDefinition().addOrder("parent.categories.link.sortKey");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().setPageSize(30);
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("objectType");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute("title");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "definition");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "summary");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "lead");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "description");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "eventDate");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "startDate" );
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "endDate");
((com.arsdigita.london.navigation.ui.object.SimpleObjectList) itemList).getRenderer().addAttribute( "newsDate");
</jsp:scriptlet>
<define:component name="assignedTerms"
classname="com.arsdigita.london.navigation.ui.CategoryIndexAssignedTerms"/>
</define:page>
<show:all/>
</jsp:root>

View File

@ -13,9 +13,9 @@
title="APLAWS" cache="true"> title="APLAWS" cache="true">
<define:component name="categoryNav" <define:component name="categoryNav"
classname="com.arsdigita.london.navigation.ui.category.Hierarchy"> classname="com.arsdigita.navigation.ui.category.Hierarchy">
<jsp:scriptlet> <jsp:scriptlet>
((com.arsdigita.london.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false); ((com.arsdigita.navigation.ui.category.Hierarchy) categoryNav).setShowItems(false);
</jsp:scriptlet> </jsp:scriptlet>
</define:component> </define:component>

View File

@ -13,9 +13,9 @@
title="APLAWS" cache="true"> title="APLAWS" cache="true">
<define:component name="categoryPath" <define:component name="categoryPath"
classname="com.arsdigita.london.navigation.ui.category.Path"/> classname="com.arsdigita.navigation.ui.category.Path"/>
<define:component name="categoryMenu" <define:component name="categoryMenu"
classname="com.arsdigita.london.navigation.ui.category.Menu"/> classname="com.arsdigita.navigation.ui.category.Menu"/>
<define:component name="itemSummary" <define:component name="itemSummary"
classname="com.arsdigita.aplaws.ui.TermItemSummary"/> classname="com.arsdigita.aplaws.ui.TermItemSummary"/>

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
xmlns:atoz="http://xmlns.redhat.com/atoz/1.0" xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz" exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
version="1.0"> version="1.0">
<!-- <!--

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop aplaws ui cms nav" exclude-result-prefixes="xsl bebop aplaws ui cms nav"
version="1.0"> version="1.0">

View File

@ -1,19 +1,13 @@
<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0" <xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
exclude-result-prefixes="xsl bebop nav search portal forum cms" exclude-result-prefixes="xsl bebop nav search portal forum cms"
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
<xsl:import href="../../../../ROOT/__ccm__/themes/aplaws/category-step.xsl"/>
<xsl:import href="../../../../ROOT/__ccm__/static/cms/admin/category-step/category-step.xsl"/>
-->
<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-->
<xsl:import href="../../../__ccm__/themes/aplaws/category-step.xsl"/> <xsl:import href="../../../__ccm__/themes/aplaws/category-step.xsl"/>
<xsl:import href="../../../__ccm__/static/cms/admin/category-step/category-step.xsl"/> <xsl:import href="../../../__ccm__/static/cms/admin/category-step/category-step.xsl"/>

View File

@ -2,20 +2,13 @@
<xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0" <xsl:stylesheet xmlns:forum="http://www.arsdigita.com/forum/1.0"
xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
exclude-result-prefixes="xsl bebop nav search portal forum cms" exclude-result-prefixes="xsl bebop nav search portal forum cms"
version="1.0"> version="1.0">
<!-- IMPORT DEFINITIONS ccm-forum installed as separate web application
<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
<xsl:import href="../../../../ROOT/packages/ui/xsl/ui.xsl" />
<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl" />
-->
<!-- IMPORT DEFINITIONS ccm-forum installed into the main CCM webapp
-->
<xsl:import href="../../../packages/bebop/xsl/bebop.xsl" /> <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />
<xsl:import href="../../../packages/ui/xsl/ui.xsl" /> <xsl:import href="../../../packages/ui/xsl/ui.xsl" />
<xsl:import href="../../../packages/bebop/xsl/bebop.xsl" /> <xsl:import href="../../../packages/bebop/xsl/bebop.xsl" />

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop aplaws ui cms nav" exclude-result-prefixes="xsl bebop aplaws ui cms nav"
version="1.0"> version="1.0">

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop aplaws ui cms nav" exclude-result-prefixes="xsl bebop aplaws ui cms nav"
version="1.0"> version="1.0">

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:terms="http://xmlns.redhat.com/london/terms/1.0" xmlns:terms="http://xmlns.redhat.com/london/terms/1.0"
exclude-result-prefixes="xsl bebop aplaws ui nav cms terms" exclude-result-prefixes="xsl bebop aplaws ui nav cms terms"
version="1.0"> version="1.0">
@ -293,7 +293,7 @@
<xsl:value-of select="nav:attribute[@name='launchDate']"/> - <xsl:value-of select="nav:attribute[@name='launchDate']"/> -
<!-- line above displays the locale specific version of the date - personally I think <!-- line above displays the locale specific version of the date - personally I think
the default long version looks awful - maybe short format can be specified in the default long version looks awful - maybe short format can be specified in
com.arsdigita.london.navigation.DataCollectionRenderer. Alternative approach com.arsdigita.navigation.DataCollectionRenderer. Alternative approach
is to construct short date with the available attributes eg UK version below is to construct short date with the available attributes eg UK version below
(which could do with some left padding on day & month so that the dates align correctly) (which could do with some left padding on day & month so that the dates align correctly)
<xsl:value-of select="nav:attribute[@name='launchDate']/@day"/>/ <xsl:value-of select="nav:attribute[@name='launchDate']/@day"/>/

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop aplaws ui cms nav" exclude-result-prefixes="xsl bebop aplaws ui cms nav"
version="1.0"> version="1.0">

View File

@ -4,7 +4,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
xmlns:atoz="http://xmlns.redhat.com/atoz/1.0" xmlns:atoz="http://xmlns.redhat.com/atoz/1.0"
exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz" exclude-result-prefixes="xsl bebop aplaws ui cms nav search atoz"

View File

@ -5,7 +5,7 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
xmlns:portal="http://www.uk.arsdigita.com/portal/1.0" xmlns:portal="http://www.uk.arsdigita.com/portal/1.0"
exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal" exclude-result-prefixes="xsl bebop aplaws ui cms nav search portal"

View File

@ -6,16 +6,11 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
exclude-result-prefixes="xsl bebop aplaws ui cms nav search" exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
version="1.0"> version="1.0">
<!-- path if installed in its own web context ccm-ldn-search
<xsl:import href="../../../../ccm-ldn-search/__ccm__/apps/search/xsl/index.xsl"/>
-->
<!-- path to xsl if installed in the main (common) web context
-->
<xsl:import href="../../../__ccm__/apps/search/xsl/index.xsl"/> <xsl:import href="../../../__ccm__/apps/search/xsl/index.xsl"/>
</xsl:stylesheet> </xsl:stylesheet>

View File

@ -6,22 +6,22 @@
xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0" xmlns:aplaws="http://www.arsdigita.com/aplaws/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
xmlns:search="http://rhea.redhat.com/search/1.0" xmlns:search="http://rhea.redhat.com/search/1.0"
exclude-result-prefixes="xsl bebop aplaws ui cms nav search" exclude-result-prefixes="xsl bebop aplaws ui cms nav search"
version="1.0"> version="1.0">
<xsl:import href="lib/header.xsl"/> <xsl:import href="lib/header.xsl"/>
<xsl:import href="lib/lib.xsl"/> <xsl:import href="lib/lib.xsl"/>
<!-- path if installed in its own web context ccm-ldn-shortcuts <!-- path if installed in its own web context ccm-ldn-shortcuts
<xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/> <xsl:import href="../../../../ROOT/packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../../ROOT/__ccm__/apps/content-section/xsl/index.xsl"/>
-->
<!-- path to xsl if installed in the main (common) web context
--> -->
<!-- path to xsl if installed in the main (common) web context
-->
<xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/> <xsl:import href="../../../packages/bebop/xsl/bebop.xsl"/>
<xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/> <xsl:import href="../../../__ccm__/apps/content-section/xsl/index.xsl"/>
<xsl:param name="context-prefix"/> <xsl:param name="context-prefix"/>
<xsl:param name="dispatcher-prefix" /> <xsl:param name="dispatcher-prefix" />
@ -80,17 +80,17 @@
<xsl:choose> <xsl:choose>
<xsl:when test="@id='search'"> <xsl:when test="@id='search'">
<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span> <a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search</a><span class="hide">|</span>
<a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
</a><span class="hide">|</span> </a><span class="hide">|</span>
</xsl:when> </xsl:when>
<xsl:when test="@id='advanced'"> <xsl:when test="@id='advanced'">
<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span> <a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
<a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search <a href="{$dispatcher-prefix}/search/remote.jsp" title="Search other borough's LAWs websites">Remote search
</a><span class="hide">|</span> </a><span class="hide">|</span>
</xsl:when> </xsl:when>
<xsl:when test="@id='remote'"> <xsl:when test="@id='remote'">
<a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span> <a href="{$dispatcher-prefix}/search/" title="Basic search">Search</a><span class="hide">|</span>
<a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search <a href="{$dispatcher-prefix}/search/advanced.jsp" title="Search with more options">Advanced search
</a><span class="hide">|</span> </a><span class="hide">|</span>
</xsl:when> </xsl:when>
<xsl:otherwise /> <xsl:otherwise />
@ -101,7 +101,7 @@
</td> </td>
</tr> </tr>
</table> </table>
<xsl:call-template name="footer"/> <xsl:call-template name="footer"/>
</xsl:template> </xsl:template>
@ -125,7 +125,7 @@
</p> </p>
</div> </div>
</xsl:template> </xsl:template>
<xsl:template name="searchNav"> <xsl:template name="searchNav">
<div id="nav"> <div id="nav">
@ -149,7 +149,8 @@
</xsl:choose> </xsl:choose>
<a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span> <a href="/searchhelp" class="navChild" title="Hints and tips" >Hints and Tips</a><span class="hide">|</span>
</div> </div>
</xsl:template> </xsl:template>
<xsl:template name="searchMain"> <xsl:template name="searchMain">
<xsl:choose> <xsl:choose>

View File

@ -6,7 +6,7 @@
xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop cms ui" exclude-result-prefixes="xsl bebop cms ui"
version="1.0"> version="1.0">

View File

@ -6,7 +6,7 @@
xmlns:bebop="http://www.arsdigita.com/bebop/1.0" xmlns:bebop="http://www.arsdigita.com/bebop/1.0"
xmlns:cms="http://www.arsdigita.com/cms/1.0" xmlns:cms="http://www.arsdigita.com/cms/1.0"
xmlns:ui="http://www.arsdigita.com/ui/1.0" xmlns:ui="http://www.arsdigita.com/ui/1.0"
xmlns:nav="http://ccm.redhat.com/london/navigation" xmlns:nav="http://ccm.redhat.com/navigation"
exclude-result-prefixes="xsl bebop cms ui" exclude-result-prefixes="xsl bebop cms ui"
version="1.0"> version="1.0">