nicer curriculum errors

diff --git a/curriculum/static/curriculum/curriculum.css b/curriculum/static/curriculum/curriculum.css
index e1b5f90..9ae2e35 100644 (file)
--- a/curriculum/static/curriculum/curriculum.css
+++ b/curriculum/static/curriculum/curriculum.css
@@ -4,6 +4,16 @@
   border-radius: 0.688em;
   background: #ADAEAF;
   color: white; }
   border-radius: 0.688em;
   background: #ADAEAF;
   color: white; }

+  .curriculum-form a {
+    cursor: pointer; }
+  .curriculum-form a:hover {
+    text-decoration: underline; }
+  .curriculum-form .error {
+    padding-left: 1em;
+    border-radius: .5em;
+    background: #ed7831;
+    color: white;
+    font-weight: bold; }

   .curriculum-form h2 {
     margin: 0; }
     .curriculum-form h2 a {
   .curriculum-form h2 {
     margin: 0; }
     .curriculum-form h2 a {


@@ -26,4 +36,5 @@
       display: inline-block;
       width: 13em; }
   .curriculum-form .curriculum-section-toggler {
       display: inline-block;
       width: 13em; }
   .curriculum-form .curriculum-section-toggler {

-    display: none; }
+    display: none;
+    color: white; }

diff --git a/curriculum/static/curriculum/curriculum.scss b/curriculum/static/curriculum/curriculum.scss
index a99dc6f..355a6c5 100755 (executable)
--- a/curriculum/static/curriculum/curriculum.scss
+++ b/curriculum/static/curriculum/curriculum.scss
@@ -1,4 +1,7 @@
 $px: 0.0625em;
 $px: 0.0625em;

+$oranji: #ed7831;
+$ciemny: #363a3e;
+$zielony: #16a487;

 
 .curriculum-form {
     border: 1px solid #ddd;
 
 .curriculum-form {
     border: 1px solid #ddd;


@@ -6,7 +9,23 @@ $px: 0.0625em;
     border-radius: 11*$px;
     background: #ADAEAF;
     color: white;
     border-radius: 11*$px;
     background: #ADAEAF;
     color: white;

-    
+
+    a {
+        cursor: pointer;
+    }
+    a:hover {
+        text-decoration: underline;
+    }
+
+    .error {
+        padding-left: 1em;
+        border-radius: .5em;
+        background: $oranji;
+        color: white;
+        font-weight: bold;
+        
+    }
+

     h2 {
         margin: 0;
         a {
     h2 {
         margin: 0;
         a {


@@ -38,6 +57,7 @@ $px: 0.0625em;
 
     .curriculum-section-toggler {
         display: none;
 
     .curriculum-section-toggler {
         display: none;

+        color: white;

     }
 
     .categories {
     }
 
     .categories {

diff --git a/curriculum/views.py b/curriculum/views.py
index e5d30c7..b643ae2 100644 (file)
--- a/curriculum/views.py
+++ b/curriculum/views.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8

 from django.db import models
 from django.views.generic import DetailView, ListView
 from django.utils.datastructures import SortedDict
 from django.db import models
 from django.views.generic import DetailView, ListView
 from django.utils.datastructures import SortedDict


@@ -45,9 +46,9 @@ class CompetencesView(ListView):
 
         if not (comp_ids or sect_ids):
             if level:
 
         if not (comp_ids or sect_ids):
             if level:

-                errors["competences"] = "Please!"
+                errors["competences"] = u"Proszę wybrać kompetencje z listy."

         elif level is None:
         elif level is None:

-            errors["level"] = "Please!"
+            errors["level"] = u"Proszę wybrać poziom edukacyjny."

         else:
             chosen_competences = SortedDict()
             for competence in Competence.objects.filter(
         else:
             chosen_competences = SortedDict()
             for competence in Competence.objects.filter(