Fixed the list filter.

diff --git a/apps/wiki/templates/wiki/document_details.html b/apps/wiki/templates/wiki/document_details.html
index ac95245..c54ff15 100644 (file)
--- a/apps/wiki/templates/wiki/document_details.html
+++ b/apps/wiki/templates/wiki/document_details.html
@@ -1,6 +1,8 @@
 {% extends "base.html" %}
 {% load toolbar_tags %}
 
 {% extends "base.html" %}
 {% load toolbar_tags %}
 

+{% block title %}{{ document.name }} - {{ block.super }}{% endblock %}
+

 {% block extrahead %}
        {% load compressed %}
        {% compressed_css 'detail' %}
 {% block extrahead %}
        {% load compressed %}
        {% compressed_css 'detail' %}

diff --git a/apps/wiki/templates/wiki/document_list.html b/apps/wiki/templates/wiki/document_list.html
index 1b0662b..558ef55 100644 (file)
--- a/apps/wiki/templates/wiki/document_list.html
+++ b/apps/wiki/templates/wiki/document_list.html
@@ -14,7 +14,7 @@ $(function() {
         
         var expr = new RegExp(slugify($('#file-list-filter').val()), 'i');
        
         
         var expr = new RegExp(slugify($('#file-list-filter').val()), 'i');
        

-        $('#file-list p').hide().filter(function(index) {
+        $('#file-list tbody tr').hide().filter(function(index) {

             console.log(expr.test($(this).attr('title')))
             return expr.test(slugify($('a', this).html()));
         }).show();
             console.log(expr.test($(this).attr('title')))
             return expr.test(slugify($('a', this).html()));
         }).show();


@@ -30,17 +30,24 @@ $(function() {
 <h1><img src="{{STATIC_URL}}/img/logo.png">Platforma Redakcyjna</h1>
 
 <div id="document-list">        
 <h1><img src="{{STATIC_URL}}/img/logo.png">Platforma Redakcyjna</h1>
 
 <div id="document-list">        

-    <div id="file-list">
+    <table id="file-list">
+       <thead><tr><th colspan="2">

        <form action="#" method="GET">
        <form action="#" method="GET">

-       <p>Filtr: <input autocomplete="off" name="filter" id="file-list-filter" type="text" size="60" />
+       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"/>
                <input type="submit" value="Znajdź" id="file-list-find-button"/>
                <input type="reset" value="Wyczyść" id="file-list-reset-button"/>

-       </p>
+       

        </form>
        </form>

+               </th></tr></thead>              
+               <tbody>

        {% for file in document_list %}
        {% for file in document_list %}

-               <p><a target="_blank" href="{% url wiki.views.document_detail file|urlencode %}">{{ file }}</a></p>
+            <tr>
+               <td><a target="_blank" href="{% url wiki.views.document_detail file|urlencode %}">{{ file }}</a></td>
+                               <td><!-- placeholder --></td>
+                       </tr>

        {% endfor %}
        {% endfor %}

-    </div>
+               </tbody>
+    </table>

        
        <div id="last-edited-list">
                <h2>Twoje ostatnio otwierane dokumenty:</h2>
        
        <div id="last-edited-list">
                <h2>Twoje ostatnio otwierane dokumenty:</h2>

diff --git a/platforma/static/css/filelist.css b/platforma/static/css/filelist.css
index 0afc954..a0b4995 100644 (file)
--- a/platforma/static/css/filelist.css
+++ b/platforma/static/css/filelist.css
@@ -64,5 +64,4 @@ a, a:visited, a:active {
 
 a:hover {
        text-decoration: underline;
 
 a:hover {
        text-decoration: underline;

-}
-}
+}
\ No newline at end of file

diff --git a/platforma/static/css/master.css b/platforma/static/css/master.css
index 619d3fd..d41a73c 100644 (file)
--- a/platforma/static/css/master.css
+++ b/platforma/static/css/master.css
@@ -1,8 +1,13 @@
 a, a:visited, a:active {
 a, a:visited, a:active {

-       color: gold;
+       color: blue;

        text-decoration: none;  
 }
 
        text-decoration: none;  
 }
 

+a:hover {
+       text-decoration: underline;
+}
+
+

 body {
     margin: 0;
     overflow: hidden;
 body {
     margin: 0;
     overflow: hidden;