[zopeorg-checkins] CVS: Products/ZopeOrg-NV/skins/nzo -
logo.gif:1.1 header.pt:1.2 ploneCustom.css.dtml:1.4 search.pt:1.6
Brian Lloyd
brian at zope.com
Thu Aug 21 16:32:56 EDT 2003
Update of /cvs-zopeorg/Products/ZopeOrg-NV/skins/nzo
In directory cvs.zope.org:/tmp/cvs-serv14366
Modified Files:
header.pt ploneCustom.css.dtml search.pt
Added Files:
logo.gif
Log Message:
Fix search, logo, css
=== Added File Products/ZopeOrg-NV/skins/nzo/logo.gif ===
<Binary-ish file>
=== Products/ZopeOrg-NV/skins/nzo/header.pt 1.1 => 1.2 ===
</form>
</div>
- <a href="/"
- tal:attributes="href portal_url"
- tal:define="logo here/logo.jpg;
- uri logo/absolute_url" >
- <img src="/logo.jpg"
- class="logo"
+ <a href="http://www.zope.org/"
+ tal:attributes="href portal_url">
+ <img src="http://www.zope.org/logo.gif"
+ class="logo" width="201" height="54"
border="0"
- alt=""
- tal:attributes="width logo/width;
- height logo/height;
- src string:${logo/absolute_url}" />
+ alt="" />
</a>
</div>
=== Products/ZopeOrg-NV/skins/nzo/ploneCustom.css.dtml 1.3 => 1.4 ===
div.searchResults {
background: #e0e0e0;
- padding: 0.5em;
- margin: 0.5em;
display: block;
clear: both;
+ border: #000000 1px solid;
+ padding: 0.5em 0em 0.5em 0em;
+
}
div.searchNav {
padding: 0.5em;
- margin: 0.5em;
+ /* margin: 0.5em; */
display: block;
clear: both;
- text-align: center;
+ text-align: left;
}
+/*
div.searchNav div{
padding: 0.5em;
}
+*/
div.searchResults span.right {
text-align: right;
=== Products/ZopeOrg-NV/skins/nzo/search.pt 1.5 => 1.6 ===
-<html xmlns:tal="http://xml.zope.org/namespaces/tal"
- xmlns:metal="http://xml.zope.org/namespaces/metal"
- metal:use-macro="here/main_template/macros/master">
-<body>
-<div metal:fill-slot="main"
- tal:define="global results python:(request.get('SearchableText', None) or request.get('review_state', None)) and here.doFormSearch( REQUEST=request ) or [];
- global pss modules/Products.PythonScripts.standard;
- global SearchableText request/SearchableText|nothing">
-
-<div class="searchNav" tal:condition="SearchableText">
- <form method="get" action="#"
- tal:attributes="action string: ${portal_url}/search">
-
- You searched for:
- <input type="text" name="SearchableText" size="25"
- value="Type your search here ..."
- tal:attributes="value SearchableText" />
- <input type="submit" name="Submit" value="Search Zope.org" />
- </form>
-
-</div>
-
-<div class="searchResults">
-<span class="right">
-Results 1-10 of <span
- tal:replace="python:pss.thousands_commas(len(results))">290</span>.
-</span>
-<span tal:condition="SearchableText">
-Searching Zope.org for <strong
- tal:content="SearchableText">search term</strong>
-</span>
-
-</div>
-
-<!-- Result Page Batches (Tom) --->
-<div>
-Result Page:
-
-<span tal:define="b_start request/b_start |python:0;
- batch python:modules['ZTUtils'].Batch(results, size=10, start=b_start, orphan=1);
- previous python:batch.previous;
- next python:batch.next;
- mq python:modules['ZTUtils'].make_query;
- global pages python:here.returnPageResults(batch,10)">
-
- <span tal:define="p batch/previous" tal:condition="p">
- <a href=""
- tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=p.first )">Previous</a>
- </span>
-
- <span tal:repeat="page pages" tal:omit-tag="">
- <a tal:condition="not:page/active"
- tal:define="x page/batch" tal:content="page/number"
- tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=x.first )"
- href="page_url">X</a>
- <span tal:condition="page/active"
- tal:content="page/number" tal:omit-tag="">X</span>
- </span>
-
- <span tal:define="n batch/next" tal:condition="n">
- <a href=""
- tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=n.first )">Next</a>
- </span>
-
-
-</span>
-</div>
-
-<!--- End Result Page Batches --->
-
-<br />
-
-<div tal:define="b_start python:0;b_start request/b_start | b_start;
- Batch python:modules['ZTUtils'].Batch;
- global batch python:Batch(results, 10, b_start, orphan=1);
- ">
-
- <div tal:repeat="hit batch">
-
- <div tal:define="objURL python: hit.getURL() + '/view'">
- <div>
- <span tal:condition="hit/getIcon|nothing">
- <a href="" tal:attributes="href objURL"><img
- src="" border="0" alt="" title=""
- tal:define="alt hit/Type"
- tal:attributes="src hit/getIcon; alt alt; title alt" /></a></span>
-
- <a href="" tal:attributes="href objURL"><span
- tal:condition="hit/Title"
- tal:content="hit/Title">Title</span><span
- tal:condition="not:hit/Title"
- tal:content="hit/getURL"></span></a>
- </div>
-
- <div tal:condition="hit/Description">
- Description:
- <span tal:content="python: here.truncate(hit.Description,150)">Description</span>
- </div>
-
- <div tal:condition="hit/Subject"
- tal:define="subjects hit/Subject">
- Related subjects:
- <span tal:repeat="this_subject python:subjects[:10]">
- <a href="#" tal:content="this_subject">somesubject</a>
- </span>
- </div>
-
- <div>
- <span class="resultURL"
- tal:content="hit/getURL">http://some.url/</span>
- <span tal:content="hit/Date">12-Apr-2002</span>
- </div>
-<br />
- </div>
- </div>
-
- <div tal:condition="not:results"
- tal:replace="string:There are no items matching your specified criteria"></div>
-
- </div>
-
-<!-- Result Page Batches (Tom) --->
-<div>
-Result Page:
-
-<span tal:define="b_start request/b_start |python:0;
- batch python:modules['ZTUtils'].Batch(results, size=10, start=b_start, orphan=1);
- previous python:batch.previous;
- next python:batch.next;
- mq python:modules['ZTUtils'].make_query;
- global pages python:here.returnPageResults(batch,10)">
-
- <span tal:define="p batch/previous" tal:condition="p">
- <a href=""
- tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=p.first )">Previous</a>
- </span>
-
- <span tal:repeat="page pages" tal:omit-tag="">
- <a tal:condition="not:page/active"
- tal:define="x page/batch" tal:content="page/number"
- tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=x.first )"
- href="page_url">X</a>
- <span tal:condition="page/active"
- tal:content="page/number" tal:omit-tag="">X</span>
- </span>
-
- <span tal:define="n batch/next" tal:condition="n">
- <a href=""
- tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=n.first )">Next</a>
- </span>
-
-
-</span>
-</div>
-
-<!--- End Result Page Batches --->
-
-<div class="searchNav" tal:condition="SearchableText">
-
- <form method="get" action="#"
- tal:attributes="action string: ${portal_url}/search">
-
- You searched for:
- <input type="text" name="SearchableText" size="25"
- value="Type your search here ..."
- tal:attributes="value SearchableText" />
- <input type="submit" name="Submit" value="Search Zope.org" />
- </form>
-
-</div>
-
-</div>
-
-</body>
-</html>
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+ xmlns:metal="http://xml.zope.org/namespaces/metal"
+ metal:use-macro="here/main_template/macros/master">
+<body>
+<div metal:fill-slot="main"
+ tal:define="global results python:(request.get('SearchableText', None) or request.get('review_state', None)) and here.doFormSearch( REQUEST=request ) or [];
+ global pss modules/Products.PythonScripts.standard;
+ global SearchableText request/SearchableText|nothing;
+ global start_num python: request.get('b_start', 0) + 1;
+ global end_num python: start_num + 9">
+
+<br />
+
+<div class="searchResults" tal:condition="results">
+ Search results <strong><span
+tal:replace="start_num" /> - <span tal:replace="end_num" /></strong>
+of <strong><span
+tal:replace="python:pss.thousands_commas(len(results))">290</span></strong>
+for "<strong tal:content="SearchableText">search term</strong>"
+</div>
+
+<!--
+<form method="get" action="#"
+ tal:attributes="action string: ${portal_url}/search">
+<div class="searchNav" tal:condition="SearchableText"> <input type="text" name="SearchableText" size="25"
+ value="Type your search here ..."
+ tal:attributes="value SearchableText" />
+ <input type="submit" name="Submit" value=" Search " />
+</div>
+</form>
+-->
+
+<br />
+
+<!-- Result Page Batches (Tom) --->
+<div tal:condition="results">
+Result Page:
+
+<span tal:define="b_start request/b_start |python:0;
+ batch python:modules['ZTUtils'].Batch(results, size=10, start=b_start, orphan=1);
+ previous python:batch.previous;
+ next python:batch.next;
+ mq python:modules['ZTUtils'].make_query;
+ global pages python:here.returnPageResults(batch,10)">
+
+ <span tal:define="p batch/previous" tal:condition="p">
+ <a href=""
+ tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=p.first )">Previous</a>
+ </span>
+
+ <span tal:repeat="page pages" tal:omit-tag="">
+ <a tal:condition="not:page/active"
+ tal:define="x page/batch" tal:content="page/number"
+ tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=x.first )"
+ href="page_url">X</a>
+ <span tal:condition="page/active"
+ tal:content="page/number" tal:omit-tag="">X</span>
+ </span>
+
+ <span tal:define="n batch/next" tal:condition="n">
+ <a href=""
+ tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=n.first )">Next</a>
+ </span>
+
+
+</span>
+</div>
+
+<!--- End Result Page Batches --->
+
+<br />
+
+<div tal:define="b_start python:0;b_start request/b_start | b_start;
+ Batch python:modules['ZTUtils'].Batch;
+ global batch python:Batch(results, 10, b_start, orphan=1);
+ ">
+
+ <div tal:repeat="hit batch">
+
+ <div tal:define="objURL python: hit.getURL() + '/view'">
+ <div>
+ <span tal:condition="hit/getIcon|nothing">
+ <a href="" tal:attributes="href objURL"><img
+ src="" border="0" alt="" title=""
+ tal:define="alt hit/Type"
+ tal:attributes="src hit/getIcon; alt alt; title alt" /></a></span>
+ <strong>
+ <a href="" tal:attributes="href objURL"><span
+ tal:condition="hit/Title"
+ tal:content="hit/Title">Title</span><span
+ tal:condition="not:hit/Title"
+ tal:content="hit/getURL"></span></a>
+ </strong>
+ </div>
+
+ <div tal:condition="hit/Description">
+ Description:
+ <span tal:content="python: here.truncate(hit.Description,150)">Description</span>
+ </div>
+
+ <!--
+ <div tal:condition="hit/Subject"
+ tal:define="subjects hit/Subject">
+ Keywords:
+ <span tal:repeat="this_subject python:subjects[:10]">
+ <a href=""
+ tal:attributes="href python:'http://www.zope.org/search?Subject=%s' % this_subject"
+ tal:content="this_subject">subject</a>
+ </span>
+ </div>
+ -->
+
+ <div>
+ <span class="resultURL"
+ tal:content="hit/getURL">http://some.url/</span>
+ </div>
+ <div>
+ <span tal:content="hit/Date">12-Apr-2002</span>
+ </div>
+<br />
+ </div>
+ </div>
+
+ <div tal:condition="not:results">
+ There were no items found matching your search.
+ </div>
+
+ </div>
+
+<!-- Result Page Batches (Tom) --->
+<div tal:condition="results">
+Result Page:
+
+<span tal:define="b_start request/b_start |python:0;
+ batch python:modules['ZTUtils'].Batch(results, size=10, start=b_start, orphan=1);
+ previous python:batch.previous;
+ next python:batch.next;
+ mq python:modules['ZTUtils'].make_query;
+ global pages python:here.returnPageResults(batch,10)">
+
+ <span tal:define="p batch/previous" tal:condition="p">
+ <a href=""
+ tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=p.first )">Previous</a>
+ </span>
+
+ <span tal:repeat="page pages" tal:omit-tag="">
+ <a tal:condition="not:page/active"
+ tal:define="x page/batch" tal:content="page/number"
+ tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=x.first )"
+ href="page_url">X</a>
+ <span tal:condition="page/active"
+ tal:content="page/number" tal:omit-tag="">X</span>
+ </span>
+
+ <span tal:define="n batch/next" tal:condition="n">
+ <a href=""
+ tal:attributes="href python: portal_url + '/search?' + mq( request.form, b_start=n.first )">Next</a>
+ </span>
+
+
+</span>
+</div>
+
+<!--- End Result Page Batches --->
+
+
+</div>
+
+</body>
+</html>
More information about the zopeorg-checkins
mailing list