Author: jeremy
Date: Mon Mar 21 02:08:07 2005
New Revision: 158437
URL: http://svn.apache.org/viewcvs?view=rev&rev=158437
Log:
bug fixes: invalid css classes in screens
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/favourites.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/history.xml
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/results.xml
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/favourites.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/favourites.xml?view=diff&r1=158436&r2=158437
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/favourites.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/favourites.xml
Mon Mar 21 02:08:07 2005
@@ -33,11 +33,11 @@
</p>
<jx:choose>
<jx:when test="${queries!=null}">
- <p class="favourites.title">
+ <p class="favourites-title">
<i18n:text
i18n:catalogue="local">favourites.queries.title</i18n:text>:
- <span class="favourites.count"><jx:out
value="${queries.size()}"/></span>
+ <span class="favourites-count"><jx:out
value="${queries.size()}"/></span>
</p>
- <table width="100%" class="query.favourites"
summary="Query Favourites">
+ <table width="100%" class="query-favourites"
summary="Query Favourites">
<tr>
<th align="left"><i18n:text
i18n:catalogue="local">favourites.date.label</i18n:text></th>
<th align="left"><i18n:text
i18n:catalogue="local">favourites.title.label</i18n:text></th>
@@ -45,16 +45,16 @@
</tr>
<jx:forEach var="item"
items="${queries}">
<tr valign="top">
- <td
class="favourites.date">
+ <td
class="favourites-date">
<jx:formatDate
value="${item.date}" type="date" dateStyle="short"/>
- </td><td
class="favourites.name">
+ </td><td
class="favourites-name">
<a
href="${item.type}.html?fid=${item.id}" title="local:favourites.search.hint"
i18n:attr="title">${item.name}</a>
- </td><td
class="query.description">
+ </td><td
class="query-description">
<i18n:text
i18n:catalogue="local">search.subject.title</i18n:text>
- <span
class="query.bool" title="local:query.bool.hint" i18n:attr="title">
+ <span
class="query-bool" title="local:query.bool.hint" i18n:attr="title">
<i18n:text i18n:catalogue="local">search.${item.bool}.bool</i18n:text>
</span>
- <span
class="query.criteria">
+ <span
class="query-criteria">
<jx:choose>
<jx:when test="${item.criteria.size() == 1}">
<i18n:text i18n:catalogue="local">search.criterion.label</i18n:text>:
@@ -66,13 +66,13 @@
<ul>
<jx:forEach var="crit" items="${item.criteria}">
<li>
-
<span class="query.criterion-field"
title="local:criterion.field.hint" i18n:attr="title">
+
<span class="query-criterion-field"
title="local:criterion.field.hint" i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${crit.field}.field</i18n:text>
</span>
-
<span class="query.criterion-match"
title="local:criterion.match.hint" i18n:attr="title">
+
<span class="query-criterion-match"
title="local:criterion.match.hint" i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${crit.match}.match</i18n:text>
</span>
-
<span class="query.criterion-value"
title="local:criterion.value.hint"
i18n:attr="title">ÃÂÂ${crit.term}ÃÂÂ</span>
+
<span class="query-criterion-value"
title="local:criterion.value.hint"
i18n:attr="title">ÃÂÂ${crit.term}ÃÂÂ</span>
</li>
</jx:forEach>
</ul>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/history.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/history.xml?view=diff&r1=158436&r2=158437
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/history.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/history.xml
Mon Mar 21 02:08:07 2005
@@ -33,11 +33,11 @@
</p>
<jx:choose>
<jx:when test="${history != null &&
history.size()!=0}">
- <p class="history.title">
+ <p class="history-title">
<i18n:text
i18n:catalogue="local">history.queries.title</i18n:text>:
- <span class="history.count"><jx:out
value="${history.size()}"/></span>
+ <span class="history-count"><jx:out
value="${history.size()}"/></span>
</p>
- <table width="100%" class="query.history"
summary="Query History">
+ <table width="100%" class="query-history"
summary="Query History">
<tr>
<th align="left"><i18n:text
i18n:catalogue="local">history.date.label</i18n:text></th>
<th align="left"><i18n:text
i18n:catalogue="local">history.title.label</i18n:text></th>
@@ -46,18 +46,18 @@
</tr>
<jx:forEach var="item"
items="${history}">
<tr valign="top">
- <td
class="history.date">
+ <td
class="history-date">
<jx:if
test="${item.query.date != null}">
<jx:formatDate value="${item.query.date}" type="time"/>
</jx:if>
- </td><td
class="history.name">
+ </td><td
class="history-name">
<a
href="${item.query.type}.html?hid=${item.id}&page=${item.query.page}"
title="local:history.search.hint" i18n:attr="title">${item.query.name}</a>
- </td><td
class="query.description">
+ </td><td
class="query-description">
<i18n:text
i18n:catalogue="local">search.subject.title</i18n:text>
- <span
class="query.bool" title="local:query.bool.hint" i18n:attr="title">
+ <span
class="query-bool" title="local:query.bool.hint" i18n:attr="title">
<i18n:text i18n:catalogue="local">search.${item.query.bool}.bool</i18n:text>
</span>
- <span
class="query.criteria">
+ <span
class="query-criteria">
<jx:choose>
<jx:when test="${item.query.criteria.size() == 1}">
<i18n:text i18n:catalogue="local">search.criterion.label</i18n:text>:
@@ -69,18 +69,18 @@
<ul>
<jx:forEach var="crit" items="${item.query.criteria}">
<li>
-
<span class="query.criterion-field"
title="local:criterion.field.hint" i18n:attr="title">
+
<span class="query-criterion-field"
title="local:criterion.field.hint" i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${crit.field}.field</i18n:text>
</span>
-
<span class="query.criterion-match"
title="local:criterion.match.hint" i18n:attr="title">
+
<span class="query-criterion-match"
title="local:criterion.match.hint" i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${crit.match}.match</i18n:text>
</span>
-
<span class="query.criterion-value"
title="local:criterion.value.hint"
i18n:attr="title">ÃÂÂ${crit.term}ÃÂÂ</span>
+
<span class="query-criterion-value"
title="local:criterion.value.hint"
i18n:attr="title">ÃÂÂ${crit.term}ÃÂÂ</span>
</li>
</jx:forEach>
</ul>
</span>
- </td><td
class="query.hitcount">
+ </td><td
class="query-hitcount">
${item.query.total}
</td><td>
<a
href="${item.query.type}.html?hid=${item.id}" title="local:history.edit.hint"
i18n:attr="title"><i18n:text
i18n:catalogue="local">history.edit.label</i18n:text></a>
@@ -98,7 +98,7 @@
<a href="clear-history.html"><i18n:text
i18n:catalogue="local">search.clearhistory.title</i18n:text></a>
</jx:when>
<jx:otherwise>
- <p class="history.queries-none"><i18n:text
i18n:catalogue="local">history.none</i18n:text></p>
+ <p class="history-queries-none"><i18n:text
i18n:catalogue="local">history.none</i18n:text></p>
</jx:otherwise>
</jx:choose>
</content>
Modified:
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/results.xml
URL:
http://svn.apache.org/viewcvs/cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/results.xml?view=diff&r1=158436&r2=158437
==============================================================================
---
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/results.xml
(original)
+++
cocoon/branches/BRANCH_2_1_X/src/blocks/querybean/samples/screens/results.xml
Mon Mar 21 02:08:07 2005
@@ -23,12 +23,12 @@
<title><i18n:text
i18n:catalogue="local">${result.query.type}.page.title</i18n:text>:
${result.query.name}</title>
<content>
<!-- description of the query -->
- <p class="query.description">
+ <p class="query-description">
<i18n:text
i18n:catalogue="local">search.subject.title</i18n:text>
- <span class="query.bool" title="local:query.bool.hint"
i18n:attr="title">
+ <span class="query-bool" title="local:query.bool.hint"
i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${result.query.bool}.bool</i18n:text>
</span>
- <span class="query.criteria">
+ <span class="query-criteria">
<jx:choose>
<jx:when
test="${result.query.criteria.size() == 1}">
<i18n:text
i18n:catalogue="local">search.criterion.label</i18n:text>:
@@ -40,13 +40,13 @@
<ul>
<jx:forEach var="item"
items="${result.query.criteria}">
<li>
- <span
class="query.criterion-field" title="local:criterion.field.hint"
i18n:attr="title">
+ <span
class="query-criterion-field" title="local:criterion.field.hint"
i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${item.field}.field</i18n:text>
</span>
- <span
class="query.criterion-match" title="local:criterion.match.hint"
i18n:attr="title">
+ <span
class="query-criterion-match" title="local:criterion.match.hint"
i18n:attr="title">
<i18n:text
i18n:catalogue="local">search.${item.match}.match</i18n:text>
</span>
- <span
class="query.criterion-value" title="local:criterion.value.hint"
i18n:attr="title">ÃÂÂ${item.term}ÃÂÂ.</span>
+ <span
class="query-criterion-value" title="local:criterion.value.hint"
i18n:attr="title">ÃÂÂ${item.term}ÃÂÂ.</span>
</li>
</jx:forEach>
</ul>
@@ -78,30 +78,30 @@
<jx:choose>
<jx:when test="#{count(result/results) > 0}">
<jx:if test="#{count(result/nav/index) > 1}">
- <div class="query.paging">
+ <div class="query-paging">
<p>
- <span
class="query.pagenumber"><i18n:text
i18n:catalogue="local">search.pagenumber.label</i18n:text>:
#{format-number(result/nav/page+1,'#')}.</span>
- <span
class="query.pagecount"><i18n:text
i18n:catalogue="local">search.pagecount.label</i18n:text>:
#{result/nav/pages}.</span>
- <span
class="query.hitcount"><i18n:text
i18n:catalogue="local">search.recordcount.label</i18n:text>:
#{result/nav/total}.</span>
- <span
class="query.pagesize"><i18n:text
i18n:catalogue="local">search.pagesize.label</i18n:text>:
#{result/nav/size}.</span>
+ <span
class="query-pagenumber"><i18n:text
i18n:catalogue="local">search.pagenumber.label</i18n:text>:
#{format-number(result/nav/page+1,'#')}.</span>
+ <span
class="query-pagecount"><i18n:text
i18n:catalogue="local">search.pagecount.label</i18n:text>:
#{result/nav/pages}.</span>
+ <span
class="query-hitcount"><i18n:text
i18n:catalogue="local">search.recordcount.label</i18n:text>:
#{result/nav/total}.</span>
+ <span
class="query-pagesize"><i18n:text
i18n:catalogue="local">search.pagesize.label</i18n:text>:
#{result/nav/size}.</span>
</p>
- <p class="query.navigation">
+ <p class="query-navigation">
<jx:if
test="#{result/nav/prev}">
- <span
class="query.prev">
+ <span
class="query-prev">
<a
href="${result.query.type}.html?page=#{result/nav/prev}&hid=${result.id}"><i18n:text
i18n:catalogue="local">search.previous.label</i18n:text></a> 
</span>
</jx:if>
- <jx:if
test="#{result/nav/firstIndex != 0}"><span class="query.prev-dots"> ...
</span></jx:if>
+ <jx:if
test="#{result/nav/firstIndex != 0}"><span class="query-prev-dots"> ...
</span></jx:if>
<jx:set var="THIS"
value="#{result/nav/page}"/>
<jx:forEach
items="#{result/nav/index}">
<jx:choose>
-
<jx:when test="#{$THIS != .}"><span class="query.page-link"> <a
href="${result.query.type}.html?page=#{.}&hid=${result.id}">#{format-number(.+1,'#')}</a>
</span></jx:when>
-
<jx:otherwise><span class="query.this-page"> #{format-number(.+1,'#')}
</span></jx:otherwise>
+
<jx:when test="#{$THIS != .}"><span class="query-page-link"> <a
href="${result.query.type}.html?page=#{.}&hid=${result.id}">#{format-number(.+1,'#')}</a>
</span></jx:when>
+
<jx:otherwise><span class="query-this-page"> #{format-number(.+1,'#')}
</span></jx:otherwise>
</jx:choose>
</jx:forEach>
- <jx:if
test="#{result/nav/lastIndex < result/nav/pages - 1}"><span
class="query.next-dots"> ... </span></jx:if>
+ <jx:if
test="#{result/nav/lastIndex < result/nav/pages - 1}"><span
class="query-next-dots"> ... </span></jx:if>
<jx:if
test="#{result/nav/next}">
- <span
class="query.next">
+ <span
class="query-next">
<a
href="${result.query.type}.html?page=#{result/nav/next}&hid=${result.id}"><i18n:text
i18n:catalogue="local">search.next.label</i18n:text></a>
</span>
</jx:if>
@@ -109,7 +109,7 @@
</div>
</jx:if>
<!-- results -->
- <table class="query.results" summary="search
results">
+ <table class="query-results" summary="search
results">
<tr>
<th align="left"><i18n:text
i18n:catalogue="local">search.rank.label</i18n:text></th>
<th align="left"><i18n:text
i18n:catalogue="local">search.score.label</i18n:text></th>
@@ -120,16 +120,16 @@
<jx:set var="index"
value="${item[Packages.org.apache.cocoon.bean.query.SimpleLuceneQueryBean.INDEX_FIELD]}"/>
<jx:set var="url"
value="${item[Packages.org.apache.cocoon.components.search.LuceneXMLIndexer.URL_FIELD]}"/>
<tr>
- <td
class="query.result-rank">#{format-number($index +1,'#')}</td>
- <td
class="query.result-score">#{format-number($score,'##%')}</td>
- <td
class="query.result-title"><a href="#{$url}"><jx:if test="#{string(title) =
''}"><span class="query.result-url">#{url}</span></jx:if>#{title}</a></td>
+ <td
class="query-result-rank">#{format-number($index +1,'#')}</td>
+ <td
class="query-result-score">#{format-number($score,'##%')}</td>
+ <td
class="query-result-title"><a href="#{$url}"><jx:if test="#{string(title) =
''}"><span class="query-result-url">#{url}</span></jx:if>#{title}</a></td>
</tr>
</jx:forEach>
</table>
</jx:when>
<!-- no results -->
<jx:otherwise>
- <p class="query.results-none"><i18n:text
i18n:catalogue="local">search.norecords.note</i18n:text></p>
+ <p class="query-results-none"><i18n:text
i18n:catalogue="local">search.norecords.note</i18n:text></p>
</jx:otherwise>
</jx:choose>
<jx:if test="${result.tip != null}">
