Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Branch 8 5 x #6

Open
wants to merge 11 commits into
base: branch_9_5_x
Choose a base branch
from
Open

Branch 8 5 x #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
04c7ca7
Fixed issue #156 when creating new container pages from model pages does
Mar 19, 2013
b86fdb8
Improved template for better IE10 compatibility.
tHerrmann May 3, 2013
19d4f27
Adding change listener sample code.
tHerrmann Jun 4, 2013
f02df07
Surrounded Solr parameter values, using special chars, with quotes.
Jun 20, 2013
bb808a5
Improved method comment.
tHerrmann Jul 5, 2013
3f0620f
Fixing issue with not valid HTML.
tHerrmann Jul 8, 2013
37c9ff1
Fixing query parameter issue.
tHerrmann Jul 8, 2013
0eae646
Added release notes for version 8.5.2.
tHerrmann Jul 8, 2013
828488e
Updated version numbers.
tHerrmann Jul 8, 2013
4e009d0
Added further release note information.
tHerrmann Jul 8, 2013
9ecda72
Improved and simplified main navigation.
tHerrmann Jul 8, 2013
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion modules/com.alkacon.opencms.v8.event/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<group>OpenCms 8 types</group>
<class/>
<description><![CDATA[Provides an event resource type that can be used in OpenCms 8 templates.]]></description>
<version>8.5.1</version>
<version>8.5.2</version>
<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
<authoremail><![CDATA[[email protected]]]></authoremail>
<datecreated/>
Expand Down
2 changes: 1 addition & 1 deletion modules/com.alkacon.opencms.v8.news/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<group>OpenCms 8 types</group>
<class/>
<description><![CDATA[Provides an news resource type that can be used in OpenCms 8 templates.]]></description>
<version>8.5.1</version>
<version>8.5.2</version>
<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
<authoremail><![CDATA[[email protected]]]></authoremail>
<datecreated/>
Expand Down
2 changes: 1 addition & 1 deletion modules/com.alkacon.opencms.v8.solr/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<group>OpenCms 8 types</group>
<class/>
<description><![CDATA[Provides a dynamic function to use the Solr search for usage in OpenCms 8 templates.]]></description>
<version>8.5.1</version>
<version>8.5.2</version>
<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
<authoremail><![CDATA[[email protected]]]></authoremail>
<datecreated/>
Expand Down
2 changes: 1 addition & 1 deletion modules/com.alkacon.opencms.v8.template3.demo.shared/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<group>Template 3</group>
<class/>
<description><![CDATA[Contains shared demo contents for the OpenCms 8 template 3.]]></description>
<version>8.5.1</version>
<version>8.5.2</version>
<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
<authoremail><![CDATA[[email protected]]]></authoremail>
<datecreated/>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00001.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[All news]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/news/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/news/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/news/]]></target>
Expand Down Expand Up @@ -40,7 +40,7 @@
<content/>
</TextBottom>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/news/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/news/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/news/]]></target>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00002.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[All events]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/event/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, startdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/event/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, startdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/event/]]></target>
Expand Down Expand Up @@ -36,7 +36,7 @@
<V8List language="de">
<Title><![CDATA[Alle Veranstaltungen im Überblick]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/event/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, startdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/event/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, startdate_%(request.locale)_dt desc&rows=100|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/event/]]></target>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00003.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[Recent news]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/news/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/news/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/news/]]></target>
Expand Down Expand Up @@ -35,7 +35,7 @@
<V8List language="de">
<Title><![CDATA[Aktuelle Meldungen]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/news/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/news/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/news/]]></target>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00004.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[Recent events]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/event/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/event/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/event/]]></target>
Expand Down Expand Up @@ -35,7 +35,7 @@
<V8List language="de">
<Title><![CDATA[Aktuelle Veranstaltungen]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/event/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, startdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8event&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/event/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, startdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)e_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/event/]]></target>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00005.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[Rosaceous Plants]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/rosaceae/&sort=Title_prop asc&rows=50|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:species/rosaceae/&sort=Title_prop asc&rows=50|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand All @@ -22,7 +22,7 @@
<V8List language="de">
<Title><![CDATA[Rosengewächse]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/rosaceae/&sort=Title_prop asc&rows=50|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:species/rosaceae/&sort=Title_prop asc&rows=50|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00006.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[Lilaceous Plants]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/liliaceae/&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:"species/liliaceae/"&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand All @@ -26,7 +26,7 @@
<content/>
</Text>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/liliaceae/&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:"species/liliaceae/"&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand Down
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00007.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[Orchidaceae Plants]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/orchidaceae/&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:"species/orchidaceae/"&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand All @@ -26,7 +26,7 @@
<content/>
</Text>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/orchidaceae/&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:"species/orchidaceae/"&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand Down
12 changes: 7 additions & 5 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00008.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<V8List language="en">
<Title><![CDATA[Most Recent News]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/news/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/news/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/news/]]></target>
<uuid>a348c79b-716b-11e0-87bc-000c2972a6a4</uuid>
</link>
</Links>
<AdditionalLink>
<Text><![CDATA[� See all news...]]></Text>
<Text><![CDATA[&raquo; See all news...]]></Text>
<Link>
<link internal="true" type="WEAK">
<target><![CDATA[/sites/default/flower-en/flower-today/news/]]></target>
Expand Down Expand Up @@ -43,14 +44,15 @@
<V8List language="de">
<Title><![CDATA[Neueste Meldungen]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/news/ OR %(request.siteroot)%(link1))&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8news&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/news/" OR "%(request.siteroot)%(link1)")&sort=collector.priority_prop desc, newsdate_%(request.locale)_dt desc&rows=2|createPath=%(link1)n_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/news/]]></target>
<uuid>a348c79b-716b-11e0-87bc-000c2972a6a4</uuid>
</link>
</Links>
<AdditionalLink>
<Text><![CDATA[� Alle Meldungen...]]></Text>
<Text><![CDATA[&raquo; Alle Meldungen...]]></Text>
<Link>
<link internal="true" type="WEAK">
<target><![CDATA[/sites/default/flower-de/flower-today/news/]]></target>
Expand Down Expand Up @@ -79,4 +81,4 @@
<XmlNode><![CDATA[Paragraph/Image]]></XmlNode>
</Mapping>
</V8List>
</V8Lists>
</V8Lists>
4 changes: 2 additions & 2 deletions modules/com.alkacon.opencms.v8.template3.demo/resources/.content/list/l_00009.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<V8List language="en">
<Title><![CDATA[Fabaceae Plants]]></Title>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/fabaceae/&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:"species/fabaceae/"&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand All @@ -26,7 +26,7 @@
<content/>
</Text>
<Collector><![CDATA[byQuery]]></Collector>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:(/shared/.content/flower/ OR %(request.siteroot)%(link1))&fq=category_exact:species/fabaceae/&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Parameter><![CDATA[fq=type:v8flower&fq=con_locales:%(request.locale)&fq=parent-folders:("/shared/.content/flower/" OR "%(request.siteroot)%(link1)")&fq=category_exact:"species/fabaceae/"&sort=Title_prop asc&rows=100|createPath=%(link1)f_%(number:5).html]]></Parameter>
<Links>
<link type="WEAK">
<target><![CDATA[/sites/default/.content/flower/]]></target>
Expand Down
14 changes: 13 additions & 1 deletion modules/com.alkacon.opencms.v8.template3.demo/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<group>Template 3</group>
<class/>
<description><![CDATA[Contains demo contents for the OpenCms 8 template 3.]]></description>
<version>8.5.0</version>
<version>8.5.2</version>
<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
<authoremail><![CDATA[[email protected]]]></authoremail>
<datecreated/>
Expand Down Expand Up @@ -117,6 +117,10 @@
<name>Title</name>
<value><![CDATA[Blank page]]></value>
</property>
<property>
<name>template</name>
<value><![CDATA[/system/modules/com.alkacon.opencms.v8.template3/templates/main.jsp]]></value>
</property>
</properties>
<relations/>
<accesscontrol/>
Expand All @@ -141,6 +145,10 @@
<name>Title</name>
<value><![CDATA[Default page]]></value>
</property>
<property>
<name>template</name>
<value><![CDATA[/system/modules/com.alkacon.opencms.v8.template3/templates/main.jsp]]></value>
</property>
</properties>
<relations/>
<accesscontrol/>
Expand Down Expand Up @@ -169,6 +177,10 @@
<name>style.columns</name>
<value><![CDATA[2]]></value>
</property>
<property>
<name>template</name>
<value><![CDATA[/system/modules/com.alkacon.opencms.v8.template3/templates/main.jsp]]></value>
</property>
</properties>
<relations/>
<accesscontrol/>
Expand Down
2 changes: 1 addition & 1 deletion modules/com.alkacon.opencms.v8.template3/resources/manifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<group>Template 3</group>
<class/>
<description><![CDATA[The template 3 is a configurable template for use in OpenCms 8.]]></description>
<version>8.5.1</version>
<version>8.5.2</version>
<authorname><![CDATA[Alkacon Software GmbH]]></authorname>
<authoremail><![CDATA[[email protected]]]></authoremail>
<datecreated/>
Expand Down
21 changes: 3 additions & 18 deletions ...ate3/resources/system/modules/com.alkacon.opencms.v8.template3/elements/menu/nav_main.jsp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,26 +4,11 @@
<div id="nav_main" class="gradient">
<c:if test="${not empty nav.items}">
<ul>
<c:set var="oldLevel" value="" />
<c:forEach items="${nav.items}" var="elem">
<c:set var="currentLevel" value="${elem.navTreeLevel}" />

<c:choose>
<c:when test="${empty oldLevel}"></c:when>
<c:when test="${currentLevel > oldLevel}"><ul></c:when>
<c:when test="${currentLevel == oldLevel}"></li></c:when>
<c:when test="${oldLevel > currentLevel}">
<c:forEach begin="${currentLevel + 1}" end="${oldLevel}"></li></ul></c:forEach>
</c:when>
</c:choose>

<li>
<a href="<cms:link>${elem.resourceName}</cms:link>" <c:choose><c:when test="${fn:startsWith(cms.requestContext.uri, elem.resourceName)}">class="gradient current"</c:when><c:otherwise>class="gradient"</c:otherwise></c:choose>>${elem.navText}</a>

<c:set var="oldLevel" value="${currentLevel}" />
<li>
<a href="<cms:link>${elem.resourceName}</cms:link>" <c:choose><c:when test="${fn:startsWith(cms.requestContext.uri, elem.navigationLevel ? elem.parentFolderName : elem.resourceName)}">class="gradient current"</c:when><c:otherwise>class="gradient"</c:otherwise></c:choose>>${elem.navText}</a>
</li>
</c:forEach>

<c:forEach begin="${navStartLevel + 1}" end="${oldLevel}"></li></ul></c:forEach>
</ul>
</c:if>
</div>
Loading