advanced search form/results + fix wrong revert

diff --git a/telemeta/htdocs/css/telemeta.css b/telemeta/htdocs/css/telemeta.css
index f83ce89e0c33e8909a4ba921333c1cc355fbe1f8..48da02877b6ccb78a7ca4783cbf48c949c133098 100644 (file)
--- a/telemeta/htdocs/css/telemeta.css
+++ b/telemeta/htdocs/css/telemeta.css
@@ -32,11 +32,20 @@ h3 {
     clear: both;
     height: 5px;
 }
-#content ul, #content ol {
+#content {
+    position: relative;
+    margin-bottom: 2em;
+} 
+#content ul, #content ul ul, #content ol {
     list-style: square;
     padding: .7em;
     padding-left: 2em;
     font-size: 0.8em;
+    clear: both;
+}
+#content ul ul {
+    font-size: 1.1em;
+    padding-left: 0;
 }
 #content li {
     padding: .2em;
@@ -70,16 +79,6 @@ h3 {
     font-size: 0.9em;
     font-weight: bold;
 }
-
-#quick_search { position: absolute; top: 2.5em; right: 1.1em; }
-#quick_search a { font-size: 80%; }
-#quick_search input {
-    vertical-align: middle;
-    font-size: 90%;
-}
-
-#quick_search_pattern { }
-
 #leftcol {
     position: relative;
     margin-right: 345px;
@@ -129,11 +128,12 @@ h3 {
 
 /* Geographic navigator */
 ul.continents, ul.continents ul { list-style: none; margin: 0; padding: 0;}
-ul.continents { margin: 1em 1em; }
+ul.continents { margin: 1em 0; }
 ul.continents ul {margin-left: 0; margin-bottom: 0.9em; padding: 0 1em 1em 0;}
-ul.continents li.name { width: 480px; float: left;}
+ul.continents li.name { width: 460px; float: left; margin-right: 30px;}
 ul.continents li.name b { font-size: 120%; font-weight: bold; }
-ul.continents ul li { display: inline; padding-right: 1ex;}
+ul.continents ul li { display: inline; padding-right: 2em;}
+ul.continents ul li a { line-height: 1.8em; }
 
 /* Collection */
 #leftcol .intro {
@@ -150,75 +150,6 @@ ul.continents ul li { display: inline; padding-right: 1ex;}
 
 }
 
-/* Item table */
-#item_elements {
-}
-#item_elements .item_block {
-    width: 100%;
-    padding: .5em 1.5em 0;
-    border: 1px solid #ddd;
-    margin-bottom: 15px;
-}
-
-/* Styles for tabular listings (stolen from trac) */
-table.listing {
-    clear: both;
-    border-spacing: 0;
-    width: 100%;
-}
-table.listing th {
-    text-align: left;
-    padding: 0 14em .1em 0;
-    font-size: 1em;
-}
-table.listing th, table.listing td {
-    font-size: 0.8em;
-    border-bottom: 1px solid #dfdfdf;
-}
-table.listing thead { background: #e8eaf0 }
-table.listing thead th {
-    font-size: 0.9em;
-    padding: 3px .5em 3px;
-}
-table.listing thead th :link:hover, table.listing thead th :visited:hover {
-    background-color: transparent;
-}
-table.listing thead th a {
-    border: none;
-    padding-right: 12px;
-}
-table.listing th.asc a, table.listing th.desc a { font-weight: bold }
-table.listing th.asc a, table.listing th.desc a {
- background-position: 100% 50%;
- background-repeat: no-repeat;
-}
-table.listing th.asc a { background-image: url(../images/asc.png) }
-table.listing th.desc a { background-image: url(../images/desc.png) }
-table.listing tbody td, table.listing tbody th {
-    padding: .33em .5em;
-    vertical-align: top;
-    font-weight: normal;
-}
-table.listing tbody td {
-    font-weight: bold;
-}
-table.listing tbody td.tmp {
-    width: 100%;
-}
-table.listing tbody td a:hover, table.listing tbody th a:hover {
- background-color: transparent;
-}
-table.listing tbody tr { border-top: 1px solid #ddd }
-table.listing tbody tr.even { background-color: #fcfcfc }
-table.listing tbody tr.odd { background-color: #f7f7f7 }
-table.listing tbody tr:hover { background: #f7f8fa !important }
-
-
-#content {
-    position: relative;
-    margin-bottom: 2em;
-} 
-
 /* Forms */
 input, textarea, select { margin: 2px }
 input, select { vertical-align: middle }
@@ -240,10 +171,10 @@ input[type=reset][disabled] {
  border-style: solid;
  color: #999;
 }
-input[type=text], input.textwidget, textarea { border: 1px solid #d7d7d7 }
-input[type=text], input.textwidget { padding: .25em .5em }
+input[type=text], input.textwidget, textarea { border: 1px solid #ccc; }
+input[type=text], input.textwidget { padding: .25em .1em }
 input[type=text]:focus, input.textwidget:focus, textarea:focus {
-   border-color: #bb0000;
+   border-color: #aaa;
 }
 option { border-bottom: 1px dotted #d7d7d7; }
 fieldset { border: 1px solid #d7d7d7; padding: .5em; margin: 0 }
@@ -264,8 +195,38 @@ label.disabled { color: #d7d7d7 }
  background: none;
 }
 
-/* searchform */
+/* Quick search */
+#quick_search {
+    position: absolute;
+    top: 2.5em;
+    right: 1.1em;
+}
+#quick_search form {
+    float: left;
+    margin-right: 12px;
+}
+#quick_search p {
+    margin-top: .3em;
+}
+#quick_search a {
+    font-size: .8em;
+    font-weight: bold;
+}
+#quick_search input {
+    vertical-align: middle;
+    font-size: .8em;
+    margin-right: 0;
+}
+#quick_search_pattern {
+    background: #FFF url(search_bg.png) no-repeat;
+    padding: .4em .1em;
+    padding-left: 25px;
+    width: 150px;
+    color: #555;
+    font-weight: bold;
+}
 
+/* Search form */
 #searchform {
     margin: 15px 0;
 }
@@ -380,7 +341,6 @@ label.disabled { color: #d7d7d7 }
 }
 
 /* Homepage */
-
 .homelinks a { font-size: 120%;}
 
 
@@ -508,4 +468,78 @@ dl.dublincore dd.caption {
 .extraInfos h4.on a {
     color: #FFF;
     background-position: 0 -17px;
-}
\ No newline at end of file
+}
+
+/* Pagination */
+.pagination {
+    margin-top: .7em;
+    margin-bottom: .3em;
+    padding: .3em;
+    padding-left: .5em;
+    float: left;
+    font-size: .9em;
+    background-color: #333;
+    color: #fff;
+    font-weight: bold;
+}
+.pagination a {
+    background-color: #eee;
+    border-bottom: none;
+    font-size: .9em;
+    padding: .3em;
+}
+
+
+
+/* Styles for tabular listings (stolen from trac) */
+table.listing {
+    clear: both;
+    border-spacing: 0;
+    width: 100%;
+}
+table.listing th {
+    text-align: left;
+    padding: 0 14em .1em 0;
+    font-size: 1em;
+}
+table.listing th, table.listing td {
+    font-size: 0.8em;
+    border-bottom: 1px solid #dfdfdf;
+}
+table.listing thead { background: #e8eaf0 }
+table.listing thead th {
+    font-size: 0.9em;
+    padding: 3px .5em 3px;
+}
+table.listing thead th :link:hover, table.listing thead th :visited:hover {
+    background-color: transparent;
+}
+table.listing thead th a {
+    border: none;
+    padding-right: 12px;
+}
+table.listing th.asc a, table.listing th.desc a { font-weight: bold }
+table.listing th.asc a, table.listing th.desc a {
+ background-position: 100% 50%;
+ background-repeat: no-repeat;
+}
+table.listing th.asc a { background-image: url(../images/asc.png) }
+table.listing th.desc a { background-image: url(../images/desc.png) }
+table.listing tbody td, table.listing tbody th {
+    padding: .33em .5em;
+    vertical-align: top;
+    font-weight: normal;
+}
+table.listing tbody td {
+    font-weight: bold;
+}
+table.listing tbody td.tmp {
+    width: 100%;
+}
+table.listing tbody td a:hover, table.listing tbody th a:hover {
+ background-color: transparent;
+}
+table.listing tbody tr { border-top: 1px solid #ddd }
+table.listing tbody tr.even { background-color: #fcfcfc }
+table.listing tbody tr.odd { background-color: #f7f7f7 }
+table.listing tbody tr:hover { background: #f7f8fa !important }
\ No newline at end of file

diff --git a/telemeta/templates/base.html b/telemeta/templates/base.html
index 83cf2bcfe8d822e2660956b8031f98863d2c3e58..e2a12a4a988d2590225b78da33ec53b83a5416ee 100644 (file)
--- a/telemeta/templates/base.html
+++ b/telemeta/templates/base.html
@@ -27,10 +27,10 @@
 
 <div id="quick_search">
 <form action="{% url telemeta-search %}" method="GET">
-<input id="quick_search_pattern" name="pattern" />
+<input type="text" id="quick_search_pattern" name="pattern" />
 <input type="submit" value="Search" />
 </form>        
-<a href="{% url telemeta-search-criteria %}">Advanced search</a>
+<p><a href="{% url telemeta-search-criteria %}">Advanced search</a></p>
 </div>
 
 <div id="menu" class="nav">

diff --git a/telemeta/templates/inc/collection_list.html b/telemeta/templates/inc/collection_list.html
index 699456fb3b48a2cd430082128d612a02c06ebc54..70dea2b87acc4070aac8fd8a66b274aa0efbcd4e 100644 (file)
--- a/telemeta/templates/inc/collection_list.html
+++ b/telemeta/templates/inc/collection_list.html
@@ -1,10 +1,9 @@
-{% load telemeta_utils %}
 {% if collections %}
     {% if hits %}
-    <p>Records {{ first_on_page }} to {{ last_on_page }} on {{ hits }} 
+    <p class="pagination">Records {{ first_on_page }} to {{ last_on_page }} on {{ hits }} 
     &nbsp;&nbsp;
-    {% if has_previous %} <a href="?page={{ previous }}&amp;{{criteria|build_query_string}}">&lt;&lt;</a> {% endif %}
-    {% if has_next %} <a href="?page={{ next }}&amp;{{criteria|build_query_string}}">&gt;&gt;</a> {% endif %}
+    {% if has_previous %} <a href="?page={{ previous }}">&lt;&lt;</a> {% endif %}
+    {% if has_next %} <a href="?page={{ next }}">&gt;&gt;</a> {% endif %}
     </p>
     {% endif %}
     <ul>

diff --git a/telemeta/templates/inc/mediaitem_list.html b/telemeta/templates/inc/mediaitem_list.html
index fcb9dd419386b95feb316390f662c09f6bb5fe7f..9f0324813c224d8277e8e980cc85d46862699423 100644 (file)
--- a/telemeta/templates/inc/mediaitem_list.html
+++ b/telemeta/templates/inc/mediaitem_list.html
@@ -1,10 +1,9 @@
-{% load telemeta_utils %}
 {% if items %}
     {% if hits %}
-    <p>Records {{ first_on_page }} to {{ last_on_page }} on {{ hits }} 
+    <p class="pagination">Records {{ first_on_page }} to {{ last_on_page }} on {{ hits }} 
     &nbsp;&nbsp;
-    {% if has_previous %} <a href="?page={{ previous }}&amp;{{criteria|build_query_string}}">&lt;&lt;</a> {% endif %}
-    {% if has_next %} <a href="?page={{ next }}&amp;{{criteria|build_query_string}}">&gt;&gt;</a> {% endif %}
+    {% if has_previous %} <a href="?page={{ previous }}">&lt;&lt;</a> {% endif %}
+    {% if has_next %} <a href="?page={{ next }}">&gt;&gt;</a> {% endif %}
     </p>
     {% endif %}
     <ul>

diff --git a/telemeta/templates/search_criteria.html b/telemeta/templates/search_criteria.html
index e8e6bb0c46e2b57301c5f3bbb5152518533ca9fa..bfd32e05f163e8fd52e189a3324a745ee18d41cc 100644 (file)
--- a/telemeta/templates/search_criteria.html
+++ b/telemeta/templates/search_criteria.html
@@ -9,8 +9,8 @@
 <h3>Advanced search</h3>
 
 <form action="{% url telemeta-search %}" id="searchform">
-
 <fieldset>
+
     <p>
     <label for="continent">Continent</label>
     <select id="continent" name="continent" onchange="update_countries(this, document.getElementById('country'));">
@@ -20,6 +20,7 @@
     {% endfor %}
     </select>
     </p>
+
     <p>
     <label for="country">Country</label>
     <select name="country" id="country">
@@ -39,8 +40,10 @@
     {% endfor %}
     </select>
     </p>
+
 </fieldset>
 <fieldset>
+
     <p>
     <label for="creator">Creator</label>
     <input type="text" id="creator" name="creator" />
@@ -60,10 +63,13 @@
     <label for="pub_date">Publishing date</label>
     <input type="text" id="pub_date" name="pub_date" />
     </p>
+
 </fieldset>
-<p class="submit">
-<input type="submit" value="Search &gt;&gt;" />
+
+<p class="input">
+<input type="submit" value="Search" />
 </p>
+
 </form>
 <!--
 {% if continents %}
@@ -87,4 +93,4 @@
 <p>No data</p>
 {% endif %}
 -->
-{% endblock %}
+{% endblock %}
\ No newline at end of file