fnp / edumed.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9c20766)
Overdue fixes.
authorRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 20 Jun 2013 10:11:18 +0000 (12:11 +0200)
committerRadek Czajka <radoslaw.czajka@nowoczesnapolska.org.pl>
Thu, 20 Jun 2013 10:11:18 +0000 (12:11 +0200)
edumed/contact_forms.py patch | blob | history
edumed/settings.d/50-static.py patch | blob | history
edumed/templates/base.html patch | blob | history
requirements.txt patch | blob | history

diff --git a/edumed/contact_forms.py b/edumed/contact_forms.py
index d969929..da669e4 100644 (file)
--- a/edumed/contact_forms.py
+++ b/edumed/contact_forms.py
@@ -27,7 +27,7 @@ class CooperateForm(ContactForm):
 class ContestForm(ContactForm):
     form_tag = 'konkurs'
     form_title = u"Zgłoś się do konkursu"
 class ContestForm(ContactForm):
     form_tag = 'konkurs'
     form_title = u"Zgłoś się do konkursu"
-    admin_list = ['name', 'organization', 'title']
+    admin_list = ['nazwisko', 'instytucja', 'tytul']
 
     nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=128)
     contact = forms.EmailField(label=u'Adres e-mail', max_length=128)
 
     nazwisko = forms.CharField(label=u'Imię i nazwisko', max_length=128)
     contact = forms.EmailField(label=u'Adres e-mail', max_length=128)
diff --git a/edumed/settings.d/50-static.py b/edumed/settings.d/50-static.py
index 835c8a5..4013a66 100644 (file)
--- a/edumed/settings.d/50-static.py
+++ b/edumed/settings.d/50-static.py
@@ -25,8 +25,6 @@ PIPELINE_CSS = {
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
           'catalogue/css/section_list.scss',
           'curriculum/curriculum.scss',
           'jquery/colorbox/colorbox.css',
-
-          'css/annoy.css',
         ),
         'output_filename': 'compressed/base.css',
     },
         ),
         'output_filename': 'compressed/base.css',
     },
@@ -42,8 +40,6 @@ PIPELINE_JS = {
             'catalogue/js/lesson.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
             'catalogue/js/lesson.js',
             'sponsors/js/sponsors.js',
             'curriculum/curriculum.js',
-
-            'js/annoy.js',
         ),
         'output_filename': 'compressed/base.js',
     },
         ),
         'output_filename': 'compressed/base.js',
     },
diff --git a/edumed/templates/base.html b/edumed/templates/base.html
index 4e2554c..83f7e0d 100644 (file)
--- a/edumed/templates/base.html
+++ b/edumed/templates/base.html
@@ -25,8 +25,6 @@
         <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script></script><![endif]-->
     </head>
     <body id="{% block body-id %}body{% endblock %}">
         <!--[if lt IE 9]><script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script></script><![endif]-->
     </head>
     <body id="{% block body-id %}body{% endblock %}">
-        {% include "annoy.html" %}
-
         <div id="header-wrapper">
         <header class="main" style="position:relative;">
             <!--img
         <div id="header-wrapper">
         <header class="main" style="position:relative;">
             <!--img
diff --git a/requirements.txt b/requirements.txt
index a8b89af..b26724b 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,6 +3,7 @@
 Django>=1.4,<1.5
 South>=0.7.4
 django-pipeline>=1.2,<1.3
 Django>=1.4,<1.5
 South>=0.7.4
 django-pipeline>=1.2,<1.3
+python-memcached
 piwik
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss
 piwik
 #pyScss
 #git+git://github.com/Kronuz/pyScss.git@d8f4da23a3c87696a75b3830ed4ab49b75550a93#egg=pyScss