svn commit: r834823 - in /ofbiz/trunk: applications/content/template/ framework/example/data/helpdat
Locked
 
|
Author: hansbak
Date: Wed Nov 11 09:50:01 2009 New Revision: 834823 URL: http://svn.apache.org/viewvc?rev=834823&view=rev Log: ordered and itemized list now possible in the help screens and works in all three themes, see for an example in the example help screens: OFBIZ-3170 provided patch partly implemented Added: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml (with props) Modified: ofbiz/trunk/applications/content/template/HelpTemplate.ftl ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Modified: ofbiz/trunk/applications/content/template/HelpTemplate.ftl URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/template/HelpTemplate.ftl?rev=834823&r1=834822&r2=834823&view=diff ============================================================================== --- ofbiz/trunk/applications/content/template/HelpTemplate.ftl (original) +++ ofbiz/trunk/applications/content/template/HelpTemplate.ftl Wed Nov 11 09:50:01 2009 @@ -22,17 +22,18 @@ under the License. --> -<#macro para para> -<p> - <#list para?children as child> +<#macro text text> + <#list text?children as child> <#if child?node_type = "text"> - ${child} + ${child} <#elseif child?node_type = 'element' && child?node_name = "link"> - <a href="${child["@xl:href"]}">${child}</a> + <a href="${child["@xl:href"]}">${child}</a> + <#elseif child?node_type = 'element' && child?node_name = "orderedlist"> + <@orderedlist node=child/> + <#elseif child?node_type = 'element' && child?node_name = "itemizedlist"> + <@itemizedlist node=child/> </#if> </#list> - <br/><br/> -</p> </#macro> <#macro section inSection first="no"> @@ -41,15 +42,42 @@ <#if first = "yes"> <h1>${subSection}</h1> <#else> - <h2>${subSection}</h2> + <br/><h2>${subSection}</h2> </#if> <#elseif subSection?node_name = "para"> - <@para para=subSection/> + <p><@para para=subSection/></p> <#elseif subSection?node_name = "section"> <@section inSection=subSection/> + <#elseif subSection?node_name = "orderedlist"> + <@orderedlist node=subSection/> + <#elseif subSection?node_name = "itemizedlist"> + <@itemizedlist node=subSection/> </#if> </#list> - <br/><br/> +</#macro> + +<#macro listItems node> + <#list node?children as item> + <#if item?node_type = "element" && item?node_name = "listitem"> + <#list item.* as subpara> + <li><@para para=subpara/></li> + </#list> + </#if> + </#list> +</#macro> + +<#macro orderedlist node> + <ol class=numbers><@listItems node=node/></ol> +</#macro> + +<#macro itemizedlist node> + <ul class=dots><@listItems node=node/></ul> +</#macro> + + + +<#macro para para> + <@text text=para/> </#macro> <div class="contentarea"> Added: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml?rev=834823&view=auto ============================================================================== --- ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml (added) +++ ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml Wed Nov 11 09:50:01 2009 @@ -0,0 +1,49 @@ +<?xml version="1.0" encoding="UTF-8"?> +<!-- +Licensed to the Apache Software Foundation (ASF) under one +or more contributor license agreements. See the NOTICE file +distributed with this work for additional information +regarding copyright ownership. The ASF licenses this file +to you under the Apache License, Version 2.0 (the +"License"); you may not use this file except in compliance +with the License. You may obtain a copy of the License at + +http://www.apache.org/licenses/LICENSE-2.0 + +Unless required by applicable law or agreed to in writing, +software distributed under the License is distributed on an +"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +KIND, either express or implied. See the License for the +specific language governing permissions and limitations +under the License. +--> +<section xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="5.0" + xmlns:xl="http://www.w3.org/1999/xlink" + xmlns:xi="http://www.w3.org/2001/XInclude" + xsi:schemaLocation="http://docbook.org/ns/docbook ../../../content/dtd/docbook.xsd" + xmlns="http://docbook.org/ns/docbook"> + + <title>Help on writing docBook documents</title> + <section> + <title>Example of an ordered list</title> + <para>The orderedlist will put numbers in front of each item.</para> + <orderedlist> + <listitem><para>First item of my list</para></listitem> + <listitem><para>Second item</para></listitem> + <listitem><para>Third...</para></listitem> + <listitem><para>4th...</para></listitem> + <listitem><para>and this can go longer...</para></listitem> + </orderedlist> + </section> + <section> + <title>Example of an itemized list</title> + <para>The itemizedlist will put a bullet in front of each item.</para> + <itemizedlist> + <listitem><para>First item of my list</para></listitem> + <listitem><para>Second item</para></listitem> + <listitem><para>Third...</para></listitem> + <listitem><para>4th...</para></listitem> + <listitem><para>and this can go longer...</para></listitem> + </itemizedlist> + </section> +</section> Propchange: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml ------------------------------------------------------------------------------ svn:eol-style = native Propchange: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml ------------------------------------------------------------------------------ svn:keywords = "Date Rev Author URL Id" Propchange: ofbiz/trunk/framework/example/data/helpdata/HELP_EXAMPLE_docbook.xml ------------------------------------------------------------------------------ svn:mime-type = text/xml Modified: ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css?rev=834823&r1=834822&r2=834823&view=diff ============================================================================== --- ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css (original) +++ ofbiz/trunk/themes/bizznesstime/webapp/bizznesstime/css/help.css Wed Nov 11 09:50:01 2009 @@ -33,3 +33,14 @@ float:none; min-height:25em; } + +ol.numbers { + list-style: decimal; + padding-left: 20px; +} +ul.dots { + list-style: circle; + padding-left: 20px; +} + + Modified: ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css?rev=834823&r1=834822&r2=834823&view=diff ============================================================================== --- ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css (original) +++ ofbiz/trunk/themes/bluelight/webapp/bluelight/help.css Wed Nov 11 09:50:01 2009 @@ -49,3 +49,15 @@ #content-main-section .h1 { display: block; } + + +ol.numbers { + list-style: decimal; + padding-left: 20px; +} +ul.dots { + list-style: circle; + padding-left: 20px; +} + + Modified: ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css URL: http://svn.apache.org/viewvc/ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css?rev=834823&r1=834822&r2=834823&view=diff ============================================================================== --- ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css (original) +++ ofbiz/trunk/themes/flatgrey/webapp/flatgrey/maincss.css Wed Nov 11 09:50:01 2009 @@ -63,6 +63,15 @@ list-style: none; } +ol.numbers { + list-style: decimal; + padding-left: 20px; +} +ul.dots { + list-style: circle; + padding-left: 20px; +} + /* ===== Basic Element Styles ===== */ a, a:visited { |
«
Return to OFBiz - Commits
|
1 view|%1 views
| Free forum by Nabble | Edit this page |