Various fixes.

diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
index d689371..a47acff 100644 (file)
--- a/requirements/requirements-dev.txt
+++ b/requirements/requirements-dev.txt
@@ -1,4 +1,4 @@
--i https://py.mdrn.pl:8443/simple/
+-i https://py.mdrn.pl/simple/

 
 django-debug-toolbar<1.10
 django-debug-toolbar-template-timings
 
 django-debug-toolbar<1.10
 django-debug-toolbar-template-timings

diff --git a/src/catalogue/templates/catalogue/snippets/jplayer.html b/src/catalogue/templates/catalogue/snippets/jplayer.html
index c82c1e8..647f42d 100644 (file)
--- a/src/catalogue/templates/catalogue/snippets/jplayer.html
+++ b/src/catalogue/templates/catalogue/snippets/jplayer.html
@@ -36,7 +36,7 @@
                     {% trans "Artist:" %}&nbsp;<span class='artist'>{{ extra_info.artist_name }}</span>,
                     {% trans "director:" %}&nbsp;<span class='director'>{{ extra_info.director_name }}</span>
                     {% if extra_info.license %}{% license_icon extra_info.license %}{% endif %}
                     {% trans "Artist:" %}&nbsp;<span class='artist'>{{ extra_info.artist_name }}</span>,
                     {% trans "director:" %}&nbsp;<span class='director'>{{ extra_info.director_name }}</span>
                     {% if extra_info.license %}{% license_icon extra_info.license %}{% endif %}

-                    {% if i.mp3.project_icon %}<img src="{{ i.mp3.project_icon }}">{% endif %}
+                    {% if i.mp3.project_icon %}<img class="project-icon" src="{{ i.mp3.project_icon }}">{% endif %}

                     <p>
                      {% if i.mp3.project_description %}{{ i.mp3.project_description }}{% else %}
                       {% with fb=extra_info.funded_by %}
                     <p>
                      {% if i.mp3.project_description %}{{ i.mp3.project_description }}{% else %}
                       {% with fb=extra_info.funded_by %}

diff --git a/src/club/views.py b/src/club/views.py
index ce76d6b..dc1bef0 100644 (file)
--- a/src/club/views.py
+++ b/src/club/views.py
@@ -193,6 +193,7 @@ def member_verify(request):
         emails = request.POST.get('emails').strip().split('\n')
         rows = ['email;członek;nazwa użytkownika;aktywny;co najmniej do']
         for email in emails:
         emails = request.POST.get('emails').strip().split('\n')
         rows = ['email;członek;nazwa użytkownika;aktywny;co najmniej do']
         for email in emails:

+            email = email.strip()

             row = [email]
             schedules = models.Schedule.objects.filter(email=email).exclude(payed_at=None)
             if schedules.exists():
             row = [email]
             schedules = models.Schedule.objects.filter(email=email).exclude(payed_at=None)
             if schedules.exists():

diff --git a/src/wolnelektury/static/scss/main/book_box.scss b/src/wolnelektury/static/scss/main/book_box.scss
index 8e47bfe..9cec607 100644 (file)
--- a/src/wolnelektury/static/scss/main/book_box.scss
+++ b/src/wolnelektury/static/scss/main/book_box.scss
@@ -185,6 +185,12 @@
       @include size(margin-top, 5px);
     }
 
       @include size(margin-top, 5px);
     }
 

+    .project-icon {
+      @include size(max-width, 100px);
+      @include size(max-height, 100px);
+    }
+
+

     @include min-screen($S_BOOK_SHORT_FULL) {
       // Show full title on the work's page.
 
     @include min-screen($S_BOOK_SHORT_FULL) {
       // Show full title on the work's page.
 

diff --git a/src/wolnelektury/static/scss/main/form.scss b/src/wolnelektury/static/scss/main/form.scss
index 8518df3..3a79737 100644 (file)
--- a/src/wolnelektury/static/scss/main/form.scss
+++ b/src/wolnelektury/static/scss/main/form.scss
@@ -8,10 +8,6 @@ form table {
         padding-bottom: 1em;
     }
 
         padding-bottom: 1em;
     }
 

-    .required th:before {
-        content: "* ";
-    }
-

     .errorlist {
         color: red;
         margin: 0;
     .errorlist {
         color: red;
         margin: 0;