Cosmetics.

diff --git a/src/apiclient/settings.py b/src/apiclient/settings.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/apiclient/urls.py b/src/apiclient/urls.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/__init__.py b/src/catalogue/models/__init__.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/book.py b/src/catalogue/models/book.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/chunk.py b/src/catalogue/models/chunk.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/image.py b/src/catalogue/models/image.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/listeners.py b/src/catalogue/models/listeners.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/project.py b/src/catalogue/models/project.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/models/publish_log.py b/src/catalogue/models/publish_log.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/active_users_list.html b/src/catalogue/templates/catalogue/active_users_list.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/activity.html b/src/catalogue/templates/catalogue/activity.html
old mode 100755 (executable)
new mode 100644 (file)
index 2f9443b..0ab5c0d
--- a/src/catalogue/templates/catalogue/activity.html
+++ b/src/catalogue/templates/catalogue/activity.html
@@ -8,7 +8,7 @@
 
 {% block content %}
 
 
 {% block content %}
 

-<div class="card mt-4">
+<div class="card">

        <div class="card-header">
 <h1>
        <a class="btn btn-light" href='{% url "catalogue_activity" prev_day.isoformat %}'>&lt;</a>
        <div class="card-header">
 <h1>
        <a class="btn btn-light" href='{% url "catalogue_activity" prev_day.isoformat %}'>&lt;</a>

diff --git a/src/catalogue/templates/catalogue/base.html b/src/catalogue/templates/catalogue/base.html
index afc5404..f819c96 100644 (file)
--- a/src/catalogue/templates/catalogue/base.html
+++ b/src/catalogue/templates/catalogue/base.html
@@ -17,21 +17,21 @@
 <!--#include file='/pozor.html'-->
 
 
 <!--#include file='/pozor.html'-->
 
 

-<nav class="navbar navbar-expand-lg bg-light ">
+<nav class="navbar navbar-expand-lg navbar-dark bg-dark">

   <a class="navbar-brand" href="{% url 'catalogue_document_list' %}">
          <img src="{% static "img/wl-orange.png" %}" alt="Platforma">
   </a>
   <a class="navbar-brand" href="{% url 'catalogue_document_list' %}">
          <img src="{% static "img/wl-orange.png" %}" alt="Platforma">
   </a>

-  <ul class="nav nav-pills mr-auto">
+  <ul class="navbar-nav mr-auto">

         {% main_tabs %}
     </ul>
 
         {% main_tabs %}
     </ul>
 

-    <ul class="nav nav-pills">
+    <ul class="navbar-nav">

         {% include "catalogue/head_login.html" %}
     </ul>
 
 </nav>
 
         {% include "catalogue/head_login.html" %}
     </ul>
 
 </nav>
 

-<div class="container">
+<div class="container mt-4 mb-4">

 
 {% block content %}
 <div class="row">
 
 {% block content %}
 <div class="row">

diff --git a/src/catalogue/templates/catalogue/book_append_to.html b/src/catalogue/templates/catalogue/book_append_to.html
old mode 100755 (executable)
new mode 100644 (file)
index 7099639..15a3243
--- a/src/catalogue/templates/catalogue/book_append_to.html
+++ b/src/catalogue/templates/catalogue/book_append_to.html
@@ -5,7 +5,7 @@
 {% block titleextra %}{% trans "Append book" %}{% endblock %}
 
 {% block content %}
 {% block titleextra %}{% trans "Append book" %}{% endblock %}
 
 {% block content %}

-<div class="card mt-4">
+<div class="card">

        <div class="card-body">
        <form enctype="multipart/form-data" method="POST" action="">
     {% csrf_token %}
        <div class="card-body">
        <form enctype="multipart/form-data" method="POST" action="">
     {% csrf_token %}

diff --git a/src/catalogue/templates/catalogue/book_detail.html b/src/catalogue/templates/catalogue/book_detail.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/book_edit.html b/src/catalogue/templates/catalogue/book_edit.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/book_html.html b/src/catalogue/templates/catalogue/book_html.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/book_list/book.html b/src/catalogue/templates/catalogue/book_list/book.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/book_list/book_list.html b/src/catalogue/templates/catalogue/book_list/book_list.html
old mode 100755 (executable)
new mode 100644 (file)
index 0d761b8..4e21323
--- a/src/catalogue/templates/catalogue/book_list/book_list.html
+++ b/src/catalogue/templates/catalogue/book_list/book_list.html
@@ -15,7 +15,7 @@
 </form>
 
 
 </form>
 
 

-<div class="card mt-4">
+<div class="card">

        <div class="card-body">
 
 
        <div class="card-body">
 
 

diff --git a/src/catalogue/templates/catalogue/book_list/chunk.html b/src/catalogue/templates/catalogue/book_list/chunk.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/chunk_add.html b/src/catalogue/templates/catalogue/chunk_add.html
old mode 100755 (executable)
new mode 100644 (file)
index 6ad80ce..f447ec6
--- a/src/catalogue/templates/catalogue/chunk_add.html
+++ b/src/catalogue/templates/catalogue/chunk_add.html
@@ -7,7 +7,7 @@
 
 
 {% block content %}
 
 
 {% block content %}

-<div class="card mt-4">
+<div class="card">

        <div class="card-header">
     <h1>{% trans "Split chunk" %}</h1>
        </div>
        <div class="card-header">
     <h1>{% trans "Split chunk" %}</h1>
        </div>

diff --git a/src/catalogue/templates/catalogue/chunk_edit.html b/src/catalogue/templates/catalogue/chunk_edit.html
old mode 100755 (executable)
new mode 100644 (file)
index 180e6d3..971634d
--- a/src/catalogue/templates/catalogue/chunk_edit.html
+++ b/src/catalogue/templates/catalogue/chunk_edit.html
@@ -7,7 +7,7 @@
 
 
 {% block content %}
 
 
 {% block content %}

-<div class="card mt-4">
+<div class="card">

        <div class="card-header">
     <h1>{% trans "Chunk settings" %}</h1>
        </div>
        <div class="card-header">
     <h1>{% trans "Chunk settings" %}</h1>
        </div>

diff --git a/src/catalogue/templates/catalogue/document_create_missing.html b/src/catalogue/templates/catalogue/document_create_missing.html
index aa2ce06..773dd9e 100644 (file)
--- a/src/catalogue/templates/catalogue/document_create_missing.html
+++ b/src/catalogue/templates/catalogue/document_create_missing.html
@@ -1,18 +1,26 @@
 {% extends "catalogue/base.html" %}
 {% load i18n %}
 {% extends "catalogue/base.html" %}
 {% load i18n %}

+{% load bootstrap4 %}

 
 
 {% block titleextra %}{% trans "Create a new book" %}{% endblock %}
 
 
 {% block content %}
 
 
 {% block titleextra %}{% trans "Create a new book" %}{% endblock %}
 
 
 {% block content %}

+<div class="card">
+       <div class="card-header">

     <h1>{% trans "Create a new book" %}</h1>
     <h1>{% trans "Create a new book" %}</h1>

+       </div>
+       <div class="card-body">
+

 
     <form enctype="multipart/form-data" method="POST">
     {% csrf_token %}
 
     <form enctype="multipart/form-data" method="POST">
     {% csrf_token %}

-    <table class='editable'>
-        {{ form.as_table}}
-        <tr><td></td><td><button type="submit">{% trans "Create book" %}</button></td></tr>
-    </table>
+        {% bootstrap_form form %}
+       {% buttons %}
+        <button class="btn btn-primary" type="submit">{% trans "Create book" %}</button>
+       {% endbuttons %}

     </form>
     </form>

+</div>
+</div>

 {% endblock content %}
 {% endblock content %}

diff --git a/src/catalogue/templates/catalogue/document_upload.html b/src/catalogue/templates/catalogue/document_upload.html
index 009d154..e42414e 100644 (file)
--- a/src/catalogue/templates/catalogue/document_upload.html
+++ b/src/catalogue/templates/catalogue/document_upload.html
@@ -1,14 +1,19 @@
 {% extends "catalogue/base.html" %}
 {% load i18n %}
 {% extends "catalogue/base.html" %}
 {% load i18n %}

+{% load bootstrap4 %}

 
 
 {% block titleextra %}{% trans "Bulk document upload" %}{% endblock %}
 
 
 
 
 {% block titleextra %}{% trans "Bulk document upload" %}{% endblock %}
 
 

-{% block leftcolumn %}
+{% block content %}

 
 
 
 

+<div class="card">
+       <div class="card-header">

 <h2>{% trans "Bulk documents upload" %}</h2>
 <h2>{% trans "Bulk documents upload" %}</h2>

+       </div>
+       <div class="card-body">

 
 <p>
 {% trans "Please submit a ZIP with UTF-8 encoded XML files. Files not ending with <code>.xml</code> will be ignored." %}
 
 <p>
 {% trans "Please submit a ZIP with UTF-8 encoded XML files. Files not ending with <code>.xml</code> will be ignored." %}


@@ -16,13 +21,15 @@
 
 <form enctype="multipart/form-data" method="POST" action="{{ request.path }}">
 {% csrf_token %}
 
 <form enctype="multipart/form-data" method="POST" action="{{ request.path }}">
 {% csrf_token %}

-{{ form.as_p }}
-<p><button type="submit">{% trans "Upload" %}</button></p>
+{% bootstrap_form form %}
+{% buttons %}
+<button class="btn btn-primary" type="submit">{% trans "Upload" %}</button>
+{% endbuttons %}

 </form>
 
 </form>
 

-<hr/>

 
 {% if error_list %}
 
 {% if error_list %}

+    <hr>

 
     <p class='error'>{% trans "There have been some errors. No files have been added to the repository." %}
     <h3>{% trans "Offending files" %}</h3>
 
     <p class='error'>{% trans "There have been some errors. No files have been added to the repository." %}
     <h3>{% trans "Offending files" %}</h3>


@@ -64,9 +71,8 @@
     </ul>
 {% endif %}
 
     </ul>
 {% endif %}
 

+       </div>
+</div>

 
 

-{% endblock leftcolumn %}
+{% endblock content %}

 
 

-
-{% block rightcolumn %}
-{% endblock rightcolumn %}

diff --git a/src/catalogue/templates/catalogue/image_detail.html b/src/catalogue/templates/catalogue/image_detail.html
old mode 100755 (executable)
new mode 100644 (file)
index 6d154d0..e3902b8
--- a/src/catalogue/templates/catalogue/image_detail.html
+++ b/src/catalogue/templates/catalogue/image_detail.html
@@ -1,39 +1,52 @@
 {% extends "catalogue/base.html" %}
 {% load book_list i18n %}
 {% extends "catalogue/base.html" %}
 {% load book_list i18n %}

+{% load bootstrap4 %}

 
 
 {% block titleextra %}{{ object.title }}{% endblock %}
 
 
 {% block content %}
 
 
 {% block titleextra %}{{ object.title }}{% endblock %}
 
 
 {% block content %}

+<div class="card mt-4">

 
 

-
+       <div class="card-header">

 <h1>{{ object.title }}</h1>
 <h1>{{ object.title }}</h1>

+       </div>
+       <div class="card-body">

 
 
 {% if editable %}<form method='POST'>{% csrf_token %}{% endif %}
 
 
 {% if editable %}<form method='POST'>{% csrf_token %}{% endif %}

-<table class='editable'><tbody>
-    {{ form.as_table }}
+    {% bootstrap_form form %}

     {% if editable %}
     {% if editable %}

-        <tr><td></td><td><button type="submit">{% trans "Save" %}</button></td></tr>
+    {% buttons %}
+        <button class="btn btn-primary" type="submit">{% trans "Save" %}</button>
+    {% endbuttons %}

     {% endif %}
 </tbody></table>
 {% if editable %}</form>{% endif %}
 
     {% endif %}
 </tbody></table>
 {% if editable %}</form>{% endif %}
 

+       </div>
+</div>

 
 
 
 

-<div class='section'>
+<div class='card mt-4'>
+       <div class="card-header">

     <h2>{% trans "Editor" %}</h2>
     <h2>{% trans "Editor" %}</h2>

+       </div>
+       <div class="card-body">

 
 

-    <p><a href="{% url 'wiki_img_editor' object.slug %}">{% trans "Proceed to the editor." %}</a></p>
+    <p><a class="btn btn-primary" href="{% url 'wiki_img_editor' object.slug %}">{% trans "Proceed to the editor." %}</a></p>
+</div>

 </div>
 
 
 
 </div>
 
 
 

-<div class='section'>
-
+<div class='card mt-4'>
+       <div class="card-header">

 
 <h2>{% trans "Publication" %}</h2>
 
 <h2>{% trans "Publication" %}</h2>

+       </div>
+       <div class="card-body">

 
 <p>{% trans "Last published" %}: 
     {% if object.last_published %}
 
 <p>{% trans "Last published" %}: 
     {% if object.last_published %}


@@ -66,6 +79,7 @@
 {% endif %}
 
 </div>
 {% endif %}
 
 </div>

+</div>

 
 
 {% endblock content %}
 
 
 {% endblock content %}

diff --git a/src/catalogue/templates/catalogue/image_list.html b/src/catalogue/templates/catalogue/image_list.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/image_short.html b/src/catalogue/templates/catalogue/image_short.html
old mode 100755 (executable)
new mode 100644 (file)
index c7ff77b..9b34925
--- a/src/catalogue/templates/catalogue/image_short.html
+++ b/src/catalogue/templates/catalogue/image_short.html
@@ -3,9 +3,10 @@
 
 <tr>
     <td><input type="checkbox" name="select_chunk" value="{{image.id}}"/></td>
 
 <tr>
     <td><input type="checkbox" name="select_chunk" value="{{image.id}}"/></td>

-    <td><a href="{% url 'catalogue_image' image.slug %}" title='{% trans "Image settings" %}'>[B]</a></td>
-    <td><a target="_blank"
+    <td><a href="{% url 'catalogue_image' image.slug %}" class="btn btn-sm btn-secondary"><small>{% trans "Image settings" %}</small></a></td>
+    <td><a class="btn btn-primary" target="_blank"

                 href="{% url 'wiki_img_editor' image.slug %}">
                 href="{% url 'wiki_img_editor' image.slug %}">

+                   {% trans "Edit:" %}

                 {{ image.title }}</a></td>
     <td>{% if image.stage %}
         {{ image.stage }}
                 {{ image.title }}</a></td>
     <td>{% if image.stage %}
         {{ image.stage }}


@@ -13,9 +14,15 @@
     {% endif %}</td>
     <td class='user-column'>{% if image.user %}<a href="{% url 'catalogue_user' image.user.username %}">{{ image.user|username }}</a>{% endif %}</td>
     <td>
     {% endif %}</td>
     <td class='user-column'>{% if image.user %}<a href="{% url 'catalogue_user' image.user.username %}">{{ image.user|username }}</a>{% endif %}</td>
     <td>

-        {% if image.published %}P{% endif %}
-        {% if image.new_publishable %}p{% endif %}
-        {% if image.changed %}+{% endif %}
+        {% if image.published %}
+       <div><small>{% trans "published" %}</small></div>
+       {% endif %}
+       {% if image.new_publishable %}
+       <div><small>{% trans "publishable" %}</small></div>
+       {% endif %}
+        {% if image.changed %}
+       <div><small>{% trans "changed" %}</small></div>
+       {% endif %}

     </td>
     <td>{{ image.project.name }}</td>
 </tr>
     </td>
     <td>{{ image.project.name }}</td>
 </tr>

diff --git a/src/catalogue/templates/catalogue/image_table.html b/src/catalogue/templates/catalogue/image_table.html
old mode 100755 (executable)
new mode 100644 (file)
index be89e71..4f0a425
--- a/src/catalogue/templates/catalogue/image_table.html
+++ b/src/catalogue/templates/catalogue/image_table.html
@@ -2,6 +2,8 @@
 {% load pagination_tags %}
 {% load username from common_tags %}
 
 {% load pagination_tags %}
 {% load username from common_tags %}
 

+<div class="card">
+       <div class="card-body">

 
 
 <form name='filter' action='{{ request.path }}'>
 
 
 <form name='filter' action='{{ request.path }}'>


@@ -14,17 +16,17 @@
 <input type='hidden' name="project" value="{{ request.GET.project }}" />
 </form>
 
 <input type='hidden' name="project" value="{{ request.GET.project }}" />
 </form>
 

-<table id="file-list"{% if viewed_user %} class="book-list-user"{% endif %}>
+<table id="file-list" class="table {% if viewed_user %}book-list-user{% endif %}">

     <thead><tr>
         <th></th>
         <th></th>
         <th class='book-search-column'>
             <form>
             <input title='{% trans "Search in book titles" %}' name="title"
     <thead><tr>
         <th></th>
         <th></th>
         <th class='book-search-column'>
             <form>
             <input title='{% trans "Search in book titles" %}' name="title"

-                class='text-filter' value="{{ request.GET.title }}" />
+                class='form-control text-filter' value="{{ request.GET.title }}" />

             </form>
         </th>
             </form>
         </th>

-        <th><select name="stage" class="filter">
+        <th><select name="stage" class="form-control filter">

             <option value=''>- {% trans "stage" %} -</option>
             <option {% if request.GET.stage == '-' %}selected="selected"
                     {% endif %}value="-">- {% trans "none" %} -</option>
             <option value=''>- {% trans "stage" %} -</option>
             <option {% if request.GET.stage == '-' %}selected="selected"
                     {% endif %}value="-">- {% trans "none" %} -</option>


@@ -35,7 +37,7 @@
         </select></th>
 
         {% if not viewed_user %}
         </select></th>
 
         {% if not viewed_user %}

-            <th><select name="user" class="filter">
+            <th><select name="user" class="form-control filter">

                 <option value=''>- {% trans "editor" %} -</option>
                 <option {% if request.GET.user == '-' %}selected="selected"
                         {% endif %}value="-">- {% trans "none" %} -</option>
                 <option value=''>- {% trans "editor" %} -</option>
                 <option {% if request.GET.user == '-' %}selected="selected"
                         {% endif %}value="-">- {% trans "none" %} -</option>


@@ -46,7 +48,7 @@
             </select></th>
         {% endif %}
 
             </select></th>
         {% endif %}
 

-        <th><select name="status" class="filter">
+        <th><select name="status" class="form-control filter">

             <option value=''>- {% trans "status" %} -</option>
             {% for state, label in states %}
                 <option {% if request.GET.status == state %}selected="selected"
             <option value=''>- {% trans "status" %} -</option>
             {% for state, label in states %}
                 <option {% if request.GET.status == state %}selected="selected"


@@ -54,7 +56,7 @@
             {% endfor %}
         </select></th>
 
             {% endfor %}
         </select></th>
 

-        <th><select name="project" class="filter">
+        <th><select name="project" class="form-control filter">

             <option value=''>- {% trans "project" %} -</option>
                 <option {% if request.GET.project == '-' %}selected="selected"
                         {% endif %}value="-">- {% trans "none" %} -</option>
             <option value=''>- {% trans "project" %} -</option>
                 <option {% if request.GET.project == '-' %}selected="selected"
                         {% endif %}value="-">- {% trans "none" %} -</option>


@@ -66,18 +68,15 @@
 
     </tr></thead>
 
 
     </tr></thead>
 

-    {% with cnt=objects|length %}
-    {% autopaginate objects 100 %}
+    {% autopaginate objects 100 as objects_page %}

     <tbody>
     <tbody>

-    {% for image in objects %}
+    {% for image in objects_page %}

         {% include 'catalogue/image_short.html' %}
     {% endfor %}
         {% include 'catalogue/image_short.html' %}
     {% endfor %}

-    <tr><th class='paginator' colspan="6">
-        {% paginate %}
-        {% blocktrans count c=cnt %}{{c}} image{% plural %}{{c}} images{% endblocktrans %}</th></tr>

     </tbody>
     </tbody>

-    {% endwith %}

 </table>
 </table>

+    {% paginate %}
+    {% blocktrans count c=objects|length %}{{c}} image{% plural %}{{c}} images{% endblocktrans %}</th></tr>

 {% if not objects %}
     <p>{% trans "No images found." %}</p>
 {% endif %}
 {% if not objects %}
     <p>{% trans "No images found." %}</p>
 {% endif %}


@@ -98,3 +97,6 @@
           {% endif %}value="{{ user.username }}">{{ user|username }} ({{ user.count }})</option>
   {% endfor %}
 </select>
           {% endif %}value="{{ user.username }}">{{ user|username }} ({{ user.count }})</option>
   {% endfor %}
 </select>

+
+       </div>
+</div>

diff --git a/src/catalogue/templates/catalogue/main_tabs.html b/src/catalogue/templates/catalogue/main_tabs.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/my_page.html b/src/catalogue/templates/catalogue/my_page.html
old mode 100755 (executable)
new mode 100644 (file)
index e5b1522..4bfbc2d
--- a/src/catalogue/templates/catalogue/my_page.html
+++ b/src/catalogue/templates/catalogue/my_page.html
@@ -20,7 +20,7 @@
 {% endblock leftcolumn %}
 
 {% block rightcolumn %}
 {% endblock leftcolumn %}
 
 {% block rightcolumn %}

-<div class="card mt-4">
+<div class="card">

        <div class="card-header">
         <h2>{% trans "Your last edited documents" %}</h2>
        </div>
        <div class="card-header">
         <h2>{% trans "Your last edited documents" %}</h2>
        </div>

diff --git a/src/catalogue/templates/catalogue/upload_pdf.html b/src/catalogue/templates/catalogue/upload_pdf.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templates/catalogue/user_list.html b/src/catalogue/templates/catalogue/user_list.html
old mode 100755 (executable)
new mode 100644 (file)
index 460a38b..b0607fa
--- a/src/catalogue/templates/catalogue/user_list.html
+++ b/src/catalogue/templates/catalogue/user_list.html
@@ -7,9 +7,13 @@
 {% block titleextra %}{% trans "Users" %}{% endblock %}
 
 
 {% block titleextra %}{% trans "Users" %}{% endblock %}
 
 

-{% block leftcolumn %}
+{% block content %}
+<div class="card">
+       <div class="card-header">

 
 <h1>{% trans "Users" %}</h1>
 
 <h1>{% trans "Users" %}</h1>

+       </div>
+<div class="card-body">

 
 <ul>
 {% for user in users %}
 
 <ul>
 {% for user in users %}


@@ -20,4 +24,7 @@
 {% endfor %}
 </ul>
 
 {% endfor %}
 </ul>
 

-{% endblock leftcolumn %}
+</div>
+</div>
+
+{% endblock content %}

diff --git a/src/catalogue/templates/catalogue/user_page.html b/src/catalogue/templates/catalogue/user_page.html
old mode 100755 (executable)
new mode 100644 (file)
index b49620e..85f3061
--- a/src/catalogue/templates/catalogue/user_page.html
+++ b/src/catalogue/templates/catalogue/user_page.html
@@ -8,12 +8,12 @@
 
 
 {% block leftcolumn %}
 
 
 {% block leftcolumn %}

-    <h1 class="mt-4">{{ viewed_user|nice_name }}</h1>
+    <h1 class="mb-4">{{ viewed_user|nice_name }}</h1>

     {% book_list viewed_user %}
 {% endblock leftcolumn %}
 
 {% block rightcolumn %}
     {% book_list viewed_user %}
 {% endblock leftcolumn %}
 
 {% block rightcolumn %}

-<div class="card mt-4">
+<div class="card">

        <div class="card-header">
     <h2>{% trans "Recent activity for" %} {{ viewed_user|nice_name }}</h2>
        </div>
        <div class="card-header">
     <h2>{% trans "Recent activity for" %} {{ viewed_user|nice_name }}</h2>
        </div>

diff --git a/src/catalogue/templates/catalogue/wall.html b/src/catalogue/templates/catalogue/wall.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templatetags/book_list.py b/src/catalogue/templatetags/book_list.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templatetags/common_tags.py b/src/catalogue/templatetags/common_tags.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templatetags/set_get_parameter.py b/src/catalogue/templatetags/set_get_parameter.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/templatetags/wall.py b/src/catalogue/templatetags/wall.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/tests/files/chunk1.xml b/src/catalogue/tests/files/chunk1.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/tests/files/chunk2.xml b/src/catalogue/tests/files/chunk2.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/catalogue/tests/files/expected.xml b/src/catalogue/tests/files/expected.xml
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/cover/forms.py b/src/cover/forms.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/cover/templates/cover/add_image.html b/src/cover/templates/cover/add_image.html
old mode 100755 (executable)
new mode 100644 (file)
index 293c100..ba98184
--- a/src/cover/templates/cover/add_image.html
+++ b/src/cover/templates/cover/add_image.html
@@ -1,69 +1,34 @@
 {% extends "catalogue/base.html" %}
 {% load i18n %}
 {% extends "catalogue/base.html" %}
 {% load i18n %}

+{% load bootstrap4 %}

 
 {% block titleextra %}{% trans "Add image" %}{% endblock %}
 
 
 {% block titleextra %}{% trans "Add image" %}{% endblock %}
 

-{% block add_js %}
-    {{block.super}}
-    <script>
-        $(function() {
-            var radio_buttons = $('input[type=radio][name=upload_type]'),
-                image_fields = $('.upload_type input[type=text],input[type=file]');
-
-            var enable_image_field = function(field) {
-                field.attr('disabled', false);
-            },
-            disable_image_fields = function() {
-                image_fields.attr('disabled', true);
-            }
-
-            radio_buttons.change(function() {
-                var radio_button = $(this),
-                    related_image_field = $('#'+radio_button.attr('data-for'));
-                disable_image_fields();
-                enable_image_field(related_image_field);
-            });
-
-            /* initial state */
-            disable_image_fields();
-            enable_image_field($('#id_download_url'));
-        });
-    </script>
-{% endblock %}
-

 {% block content %}
 {% block content %}

+<div class="card mt-4 mb-4">
+       <div class="card-header">

 <h1>{% trans "Add image" %}</h1>
 <h1>{% trans "Add image" %}</h1>

-
+       </div>
+       <div class="card-body">

 
 <form method="post">{% csrf_token %}
 <input type="hidden" name='form_id' value="flickr" />
 <table class='editable'><tbody>
 
 <form method="post">{% csrf_token %}
 <input type="hidden" name='form_id' value="flickr" />
 <table class='editable'><tbody>

-    {{ ff.as_table }}
-    <tr><td></td><td><button type="submit">{% trans "Load from Flickr" %}</button></td></tr>
+    {% bootstrap_form ff %}
+    {% buttons %}
+    <button class="btn btn-primary" type="submit">{% trans "Load from Flickr" %}</button>
+    {% endbuttons %}

 </tbody></table>
 </form>
 
 <form method="post" enctype="multipart/form-data">{% csrf_token %}
 </tbody></table>
 </form>
 
 <form method="post" enctype="multipart/form-data">{% csrf_token %}

-{{ form.non_field_errors }}
-<table class='editable'><tbody>
-    {% for field in form %}
-        {% if field.name != 'download_url' and field.name != 'file' %}
-        <tr>
-            <th>{{field.errors}} {{field.label}}</th>
-            <td>{{field}}</td>
-        </tr>
-        {% endif %}
-    {% endfor %}
-    <tr class="upload_type">
-        <th>{{ form.download_url.errors }} <input style="width: auto;" checked data-for="id_download_url" type="radio" name="upload_type" value="url"/>{{form.download_url.label}}</th>
-        <td>{{form.download_url}}</td>
-        <th>{{ form.file.errors }} <input style="width: auto;" data-for="id_file" type="radio" name="upload_type" value="file"/> Lub {{form.file.label}}</th>
-        <td>{{form.file}}</td>
-
-    </tr>
-    <tr><td></td><td><button type="submit">{% trans "Add image" %}</button></td></tr>
-</tbody></table>
+    {% bootstrap_form form %}
+    {% buttons %}
+    <button class="btn btn-primary" type="submit">{% trans "Add image" %}</button>
+    {% endbuttons %}

 </form>
 
 </form>
 

+       </div>
+</div>

 
 {% endblock %}
 
 {% endblock %}

diff --git a/src/cover/templates/cover/image_detail.html b/src/cover/templates/cover/image_detail.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/cover/templates/cover/image_list.html b/src/cover/templates/cover/image_list.html
old mode 100755 (executable)
new mode 100644 (file)
index 50443ed..87971df
--- a/src/cover/templates/cover/image_list.html
+++ b/src/cover/templates/cover/image_list.html
@@ -5,27 +5,39 @@
 {% block titleextra %}{% trans "Cover images" %}{% endblock %}
 
 {% block content %}
 {% block titleextra %}{% trans "Cover images" %}{% endblock %}
 
 {% block content %}

+<div class="card mt-4 mb-4">
+       <div class="card-header">

 <h1>{% trans "Cover images" %}</h1>
 <h1>{% trans "Cover images" %}</h1>

+       </div>
+       <div class="card-body">

 
 {% if can_add %}
 
 {% if can_add %}

-    <a href="{% url 'cover_add_image' %}">{% trans "Add new" %}</a>
+    <a class="btn btn-primary" href="{% url 'cover_add_image' %}">{% trans "Add new" %}</a>

 {% endif %}
 
 {% endif %}
 

-<ul>
+<div class="row">

 {% autopaginate object_list 100 %}
 {% for image in object_list %}
 {% autopaginate object_list 100 %}
 {% for image in object_list %}

-    <a href="{{ image.get_absolute_url }}" style="display:inline-block; width:200px;">
-    
-    <img style="height: 100px"
-        src="{% thumbnail image.file "x100" as thumb %}
+<div class="col-md-3">
+<div class="card">
+        <a href="{{ image.get_absolute_url }}">
+       <img style="height: 100px; width: auto;" class="card-img-top" src="{% thumbnail image.file "x100" as thumb %}

                 {{ thumb.url }}
              {% empty %}
                 {{ image.file.url }}
              {% endthumbnail %}" />
                 {{ thumb.url }}
              {% empty %}
                 {{ image.file.url }}
              {% endthumbnail %}" />

-        <br/>
-        {{ image }}</a>
+       <div class="card-body">
+    
+        {{ image }}
+       </div>
+</a>
+</div>
+</div>

 {% endfor %}
 {% endfor %}

+</div>
+

 {% paginate %}
 {% paginate %}

-</ul>
+       </div>
+</div>

 
 {% endblock %}
 
 {% endblock %}

diff --git a/src/cover/utils.py b/src/cover/utils.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/dvcs/signals.py b/src/dvcs/signals.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/email_mangler/templatetags/email.py b/src/email_mangler/templatetags/email.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/fileupload/static/fileupload/js/locale-pl.js b/src/fileupload/static/fileupload/js/locale-pl.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/images/cut.png b/src/redakcja/static/contextmenu/images/cut.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/images/door.png b/src/redakcja/static/contextmenu/images/door.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/images/page_white_copy.png b/src/redakcja/static/contextmenu/images/page_white_copy.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/images/page_white_delete.png b/src/redakcja/static/contextmenu/images/page_white_delete.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/images/page_white_edit.png b/src/redakcja/static/contextmenu/images/page_white_edit.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/images/page_white_paste.png b/src/redakcja/static/contextmenu/images/page_white_paste.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/jquery.contextMenu.css b/src/redakcja/static/contextmenu/jquery.contextMenu.css
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/jquery.contextMenu.js b/src/redakcja/static/contextmenu/jquery.contextMenu.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/contextmenu/jquery.ui.position.js b/src/redakcja/static/contextmenu/jquery.ui.position.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/css/filelist.css b/src/redakcja/static/css/filelist.css
index a4686e1..e79530b 100644 (file)
--- a/src/redakcja/static/css/filelist.css
+++ b/src/redakcja/static/css/filelist.css
@@ -7,7 +7,7 @@
 */
 
 body {
 */
 
 body {

-       background: #eee;
+       background: #f7f7f7;

 }
 
 img {
 }
 
 img {

diff --git a/src/redakcja/static/email_mangler/email_mangler.js b/src/redakcja/static/email_mangler/email_mangler.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/icons/revert_.png b/src/redakcja/static/icons/revert_.png
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/js/catalogue/catalogue.js b/src/redakcja/static/js/catalogue/catalogue.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/js/wiki/dialog_pubmark.js b/src/redakcja/static/js/wiki/dialog_pubmark.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/static/js/wiki_img/loader_readonly.js b/src/redakcja/static/js/wiki_img/loader_readonly.js
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/templates/error_base.html b/src/redakcja/templates/error_base.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/templates/pagination/pagination.html b/src/redakcja/templates/pagination/pagination.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/redakcja/wsgi.py b/src/redakcja/wsgi.py
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/wiki/templates/admin/wiki/theme/change_list.html b/src/wiki/templates/admin/wiki/theme/change_list.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/wiki/templates/wiki/pubmark_dialog.html b/src/wiki/templates/wiki/pubmark_dialog.html
old mode 100755 (executable)
new mode 100644 (file)

diff --git a/src/wiki_img/templates/wiki_img/tabs/history_view.html b/src/wiki_img/templates/wiki_img/tabs/history_view.html
old mode 100755 (executable)
new mode 100644 (file)