From c9355cb6a53e0fa130ebe8458f9bcda3ef0c4a50 Mon Sep 17 00:00:00 2001
From: =?utf8?q?=C5=81ukasz=20Rekucki?= <lrekucki@gmail.com>
Date: Mon, 15 Mar 2010 15:00:01 +0100
Subject: [PATCH] Fixed search. Changes stylesheet name, so changes can
 propagate faster.

---
 apps/wiki/templates/wiki/document_list.html   | 36 +++++++++----------
 .../{xmlcolors.css => xmlcolors_15032010.css} |  0
 platforma/static/js/main.js                   |  2 +-
 3 files changed, 18 insertions(+), 20 deletions(-)
 rename platforma/static/css/{xmlcolors.css => xmlcolors_15032010.css} (100%)

diff --git a/apps/wiki/templates/wiki/document_list.html b/apps/wiki/templates/wiki/document_list.html
index 558ef55c..415c3bca 100644
--- a/apps/wiki/templates/wiki/document_list.html
+++ b/apps/wiki/templates/wiki/document_list.html
@@ -10,13 +10,10 @@
 <script type="text/javascript" charset="utf-8">
 $(function() {
 	function search(event) {
-        event.preventDefault();
-        
-        var expr = new RegExp(slugify($('#file-list-filter').val()), 'i');
-    	
-        $('#file-list tbody tr').hide().filter(function(index) {
-            console.log(expr.test($(this).attr('title')))
-            return expr.test(slugify($('a', this).html()));
+        event.preventDefault();        
+        var expr = new RegExp(slugify($('#file-list-filter').val()), 'i');    	
+        $('#file-list tbody tr').hide().filter(function(index) {            
+            return expr.test(slugify($('a', this).text()));
         }).show();
     }
 	
@@ -29,25 +26,26 @@ $(function() {
 {% block maincontent %}
 <h1><img src="{{STATIC_URL}}/img/logo.png">Platforma Redakcyjna</h1>
 
-<div id="document-list">    	 
-    <table id="file-list">
-    	<thead><tr><th colspan="2">
-    	<form action="#" method="GET">
-    	Filtr: <input autocomplete="off" name="filter" id="file-list-filter" type="text" size="60" />
-        	<input type="submit" value="Znajdź" id="file-list-find-button"/>
-        	<input type="reset" value="Wyczyść" id="file-list-reset-button"/>
-    	
-    	</form>
-		</th></tr></thead>		
+
+<div id="document-list">
+	<form method="get" action="#">    	 
+    <table  id="file-list">
+    	<thead>    	
+    		<tr><th>Filtr:</th>
+			<th><input autocomplete="off" name="filter" id="file-list-filter" type="text" size="40" /></th>
+			<th><input type="reset" value="Wyczyść" id="file-list-reset-button"/></th>
+			</tr>   	
+		</thead>		
 		<tbody>
     	{% for file in document_list %}
             <tr>
-            	<td><a target="_blank" href="{% url wiki.views.document_detail file|urlencode %}">{{ file }}</a></td>
-				<td><!-- placeholder --></td>
+            	<td colspan="3"><a target="_blank" href="{% url wiki.views.document_detail file|urlencode %}">{{ file }}</a></td>
+				<!-- placeholder </td> -->
 			</tr>
     	{% endfor %}
 		</tbody>
     </table>
+	</form>
 	
 	<div id="last-edited-list">
 		<h2>Twoje ostatnio otwierane dokumenty:</h2>
diff --git a/platforma/static/css/xmlcolors.css b/platforma/static/css/xmlcolors_15032010.css
similarity index 100%
rename from platforma/static/css/xmlcolors.css
rename to platforma/static/css/xmlcolors_15032010.css
diff --git a/platforma/static/js/main.js b/platforma/static/js/main.js
index cdcc21a8..d42af82b 100644
--- a/platforma/static/js/main.js
+++ b/platforma/static/js/main.js
@@ -763,7 +763,7 @@ $(function() {
     CodeMirror.fromTextArea('id_text', {
         parserfile: 'parsexml.js',
         path: STATIC_URL + "js/lib/codemirror/",
-        stylesheet: STATIC_URL + "css/xmlcolors.css",
+        stylesheet: STATIC_URL + "css/xmlcolors_15032010.css",
         parserConfig: {
             useHTMLKludges: false
         },
-- 
2.20.1