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

Comparing hippo-documentation/hst_docs/trunk/site/src/main/webapp/jsp/components/main/folder_overview.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

56 <h1 id='title'>${folderinfo.normalizedTitle}</h1> 56 <h1 id='title'>${folderinfo.normalizedTitle}</h1>
57 <hst:head-contribution keyHint="page.title"><title>${folderinfo.normalizedTitle}</title></hst:head-contribution> 57 <hst:head-contribution keyHint="page.title"><title>${folderinfo.normalizedTitle}</title></hst:head-contribution>
58 </c:when> 58 </c:when>
59 <c:otherwise> 59 <c:otherwise>
60 <hst:head-contribution keyHint="page.title"><title>${folder.normalizedName}</title></hst:head-contribution> 60 <hst:head-contribution keyHint="page.title"><title>${folder.normalizedName}</title></hst:head-contribution>
61 <h1 id='title'>${folder.normalizedName}</h1> 61 <h1 id='title'>${folder.normalizedName}</h1>
62 </c:otherwise> 62 </c:otherwise>
63 </c:choose> 63 </c:choose>
64 64
65 <c:if test="${not empty docinfo}"> 65 <c:if test="${not empty docinfo}">
66 <jsp:include page="../../parts/docinfo.jspx"/> 66 <jsp:include page="../../parts/docinfo.jspx"/>
143 </c:choose> 143 </c:choose>
144 </td> 144 </td>
145 </tr> 145 </tr>
146 </c:forEach> 146 </c:forEach>
147 147
148 <c:if test="${!empty folderinfo.extraLinks}" >
149 <c:forEach var="referenced" items="${folderinfo.extraLinks}" varStatus="indexer">
150 <tr>
151 <td class='counter'></td>
152 <td class="title">
153 <c:choose>
154 <c:when test="${! empty referenced.URL}"> <!-- TODO URL or Url -->
155 <c:choose>
156 <c:when test="${! empty referenced.description}">
157 <a class='external' href='${referenced.URL}'>${referenced.description}</a>
158 </c:when>
159 <c:otherwise>
160 <a class='external' href='${referenced.URL}'>External URL</a>
161 </c:otherwise>
162 </c:choose>
163 </c:when>
164 <c:when test="${! empty referenced.documentLink}">
165 <hst:link var="link" hippobean="${referenced.documentLink}"/>
166 <c:choose>
167 <c:when test='${! empty referenced.documentLink.referencedBean.normalizedTitle}'>
168 <a href='${link}'>${referenced.documentLink.referencedBean.normalizedTitle}</a>
169 </c:when>
170 <c:otherwise>
171 <a href='${link}'>${referenced.documentLink.referencedBean.normalizedName}</a>
172 </c:otherwise>
173 </c:choose>
174 </c:when>
175 </c:choose>
176 </td>
177 <td>
178 <c:choose>
179 <c:when test="${! empty referenced.URL}">
180 <a class='external' href='${referenced.URL}'>${referenced.URL}</a>
181 </c:when>
182 <c:when test="${! empty referenced.documentLink}">
183 <hst:link var="link" hippobean="${referenced.documentLink}"/>
184 <c:choose>
185 <c:when test='${not empty referenced.description}'>${referenced.description}</c:when>
186 <c:when test='${not empty referenced.documentLink.referencedBean.shortDescription}'>
187 <hst:html hippohtml="${referenced.documentLink.referencedBean.shortDescription}"/>
188 </c:when>
189 <c:otherwise>-</c:otherwise>
190 </c:choose>
191 </c:when>
192 <c:otherwise>${referenced.description}</c:otherwise>
193 </c:choose>
194 </td>
195 </tr>
196 </c:forEach>
197 </c:if>
198
148 </table> 199 </table>
149 </div> 200 </div>
150 <!-- TODO In java test on containing only spaces and do not use? 201 <!-- TODO In java test on containing only spaces and do not use?
151 However, I did that already in the import. That should be enough. 202 However, I did that already in the import. That should be enough.
152 --> 203 -->
157 <c:if test="${! empty folderinfo.closing}"> 208 <c:if test="${! empty folderinfo.closing}">
158 <hst:html hippohtml="${folderinfo.closing}"/> 209 <hst:html hippohtml="${folderinfo.closing}"/>
159 </c:if> 210 </c:if>
160 </c:if> 211 </c:if>
161 212
162 <!-- TODO call file, but solve name problem. --> 213 <!-- TODO call file, but solve name problem. -->
163 <c:if test="${!empty folderinfo.altDocuments}" > 214 <c:if test="${!empty folderinfo.altDocuments}" >
164 <div class='related'> 215 <div class='related'>
165 <h1 class='sectiontitle' title='Related documents to read instead of this one.'>Alternative</h1> 216 <h1 class='sectiontitle' title='Related documents to read instead of this one.'>Alternative</h1>
166 <ul> 217 <ul>
167 <c:forEach var="referenced" items="${document.altDocuments}" varStatus="indexer"> 218 <c:forEach var="referenced" items="${folderinfo.altDocuments}" varStatus="indexer">
168 <li> 219 <li>
169 <c:choose> 220 <c:choose>
170 <c:when test="${! empty referenced.Url}"> <!-- TODO URL or Url --> 221 <c:when test="${! empty referenced.URL}"> <!-- TODO URL or Url -->
222 <c:choose>
223 <c:when test='${! empty referenced.description}'>
171 <a class='external' href='${referenced.Url}'>${referenced.description}</a> 224 <a class='external' href='${referenced.URL}'>${referenced.description}</a>
225 </c:when>
226 <c:otherwise>
227 <a class='external' href='${referenced.URL}'>Alternative document</a>
228 </c:otherwise>
229 </c:choose>
172 </c:when> 230 </c:when>
173 <c:when test="${! empty referenced.documentLink}"> 231 <c:when test="${! empty referenced.documentLink}">
174 <hst:link var="link" hippobean="${referenced.documentLink}"/> 232 <hst:link var="link" hippobean="${referenced.documentLink}"/>
233 <c:choose>
234 <c:when test='${not empty referenced.description}'>
175 <a href='${link}'>${referenced.description}</a> 235 <a href='${link}'>${referenced.description}</a>
236 </c:when>
237 <c:when test='${not empty referenced.documentLink.referencedBean.shortDescription}'>
238 <a href='${link}'>
239 <hst:html hippohtml="${referenced.documentLink.referencedBean.shortDescription}"/>
240 </a>
241 </c:when>
242 <c:otherwise>
243 <a href='${link}'>Alternative document</a>
244 </c:otherwise>
245 </c:choose>
176 </c:when> 246 </c:when>
177 <c:otherwise> 247 <c:otherwise>
178 ${referenced.description} 248 ${referenced.description}
179 </c:otherwise> 249 </c:otherwise>
180 </c:choose> 250 </c:choose>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines