View File | Revision Log | Show Annotations | Download File | View Changeset
/hippo/hippo-documentation/hst_docs/trunk/site/src/main/webapp/jsp/components/doctypes/alternative_list.jspx
(Generate patch)

Comparing hippo-documentation/hst_docs/trunk/site/src/main/webapp/jsp/components/doctypes/alternative_list.jspx (file contents):
Revision 22103 by rbijlsma, Thu Mar 11 16:14:14 2010 UTC vs.
Revision 22104 by rbijlsma, Fri Mar 12 12:03:24 2010 UTC

11 Unless required by applicable law or agreed to in writing, software 11 Unless required by applicable law or agreed to in writing, software
12 distributed under the License is distributed on an "AS IS" 12 distributed under the License is distributed on an "AS IS"
13 BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. 13 BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14 See the License for the specific language governing permissions and 14 See the License for the specific language governing permissions and
15 limitations under the License. 15 limitations under the License.
16 <c:when test='${not empty referenced.documentLink.shortDescription}'>
17 <a href='${link}'>${referenced.documentLink.shortDescription}</a>
18 <c:when test='${not empty document.shortDescription}'>
19 <a href='${link}'>${document.shortDescription}</a>
20 </c:when>
16--> 21-->
17<jsp:root 22<jsp:root
18 xmlns="http://www.w3.org/1999/xhtml" 23 xmlns="http://www.w3.org/1999/xhtml"
19 xmlns:jsp="http://java.sun.com/JSP/Page" 24 xmlns:jsp="http://java.sun.com/JSP/Page"
20 xmlns:c="http://java.sun.com/jsp/jstl/core" 25 xmlns:c="http://java.sun.com/jsp/jstl/core"
33 <ul> 38 <ul>
34 <c:forEach var="referenced" items="${document.altDocuments}" varStatus="indexer"> 39 <c:forEach var="referenced" items="${document.altDocuments}" varStatus="indexer">
35 <li> 40 <li>
36 <c:choose> 41 <c:choose>
37 <c:when test="${not empty referenced.URL}"> 42 <c:when test="${not empty referenced.URL}">
43 <c:choose>
44 <c:when test='${! empty referenced.description}'>
38 <a class='external' href='${referenced.URL}'>${referenced.description}</a> 45 <a class='external' href='${referenced.URL}'>${referenced.description}</a>
46 </c:when>
47 <c:otherwise>
48 <a class='external' href='${referenced.URL}'>Alternative document</a>
49 </c:otherwise>
50 </c:choose>
39 </c:when> 51 </c:when>
40 <c:when test="${not empty referenced.documentLink}"> 52 <c:when test="${not empty referenced.documentLink}">
41 <hst:link var="link" hippobean="${referenced.documentLink}"/> 53 <hst:link var="link" hippobean="${referenced.documentLink}"/>
54 <c:choose>
55 <c:when test='${not empty referenced.description}'>
42 <a href='${link}'>${referenced.description}</a> 56 <a href='${link}'>${referenced.description}</a>
57 </c:when>
58 <c:when test='${not empty referenced.documentLink.referencedBean.shortDescription}'>
59 <a href='${link}'><hst:html hippohtml="${referenced.documentLink.referencedBean.shortDescription}"/></a>
60 </c:when>
61 <c:otherwise>
62 <a href='${link}'>Alternative document</a>
63 </c:otherwise>
64 </c:choose>
43 </c:when> 65 </c:when>
44 <c:otherwise> 66 <c:otherwise>
45 ${referenced.description} 67 ${referenced.description}
46 </c:otherwise> 68 </c:otherwise>
47 </c:choose> 69 </c:choose>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines