trochę porządku w zarządzaniu klasyfikacjami

janek37
1 parent 91d28ed3
Showing 5 changed files with 70 additions and 37 deletions
dictionary/models.py
dictionary/templates/manage_classifications.html
media/css/general.css
media/css/jqgrid.css
media/css/manage_classifications.css
@@ -62,7 +62,8 @@ class Qualifier(Model):
 class Classification(Model):
   name = CharField(
-    unique=True, max_length=64, db_column='nazwa', verbose_name=u'nazwa')
+    unique=True, max_length=64, db_column='nazwa',
+    verbose_name=u'nazwa klasyfikacji')
   def value_tree(self):
     parts = []
@@ -86,11 +87,13 @@ def make_choices(tree):
 class ClassificationValue(Model):
   label = CharField(
-    unique=True, max_length=64, db_column='nazwa', verbose_name=u'nazwa')
+    unique=True, max_length=64, db_column='nazwa',
+    verbose_name=u'nazwa wartości')
   classification = ForeignKey(Classification, db_column='klas_id',
                               related_name='values')
-  parent_node = ForeignKey('self', db_column='rodzic', null=True, blank=True,
-                           verbose_name=u'rodzic', related_name='child_nodes')
+  parent_node = ForeignKey(
+    'self', db_column='rodzic', null=True, blank=True,
+    verbose_name=u'rodzic wartości', related_name='child_nodes')
   lexemes = ManyToManyField('Lexeme', blank=True)
   deleted = BooleanField(db_column='usunieta')
@@ -9,44 +9,50 @@
 {% block title %}Klasyfikacje{% endblock %}
 {% block content %}
-  <form action="" method="post">
+  <form action="" method="post" class="add-classification">
     {% csrf_token %}
     {{ add_form.as_p }}
     <p>
-      <input type="submit" value="Dodaj klasyfikację"/>
+      <button type="submit">Dodaj klasyfikację</button>
     </p>
   </form>
   {% for classification, value_form, vocab_form, using in classification_forms %}
-    <h4>{{ classification.name }}</h4>
-    <p>Wartości:</p>
-    {% with tree=classification.value_tree %}
-      {% if tree %}
-        {% value_tree tree %}
-      {% endif %}
-    {% endwith %}
-    <form action="" method="post">
-      {% csrf_token %}
-      {{ value_form.as_p }}
-      <p>
-        <input type="submit" value="Dodaj wartość"/>
-      </p>
-    </form>
-    <p>Używające słowniki:</p>
-    {% if using %}
-      <ul>
-        {% for vocab in using %}
-          <li>{{ vocab.id }}</li>
-        {% endfor %}
-      </ul>
-    {% else %}
-      <p>brak</p>
-    {% endif %}
-    <form action="" method="post">
-      {% csrf_token %}
-      {{ vocab_form.as_p }}
-      <p>
-        <input type="submit" value="Dodaj słownik"/>
-      </p>
-    </form>
+    <div class="classification">
+      <div class="classification-controls">
+        <form action="" method="post" class="add-value">
+          {% csrf_token %}
+          {{ value_form.as_p }}
+          <p>
+            <button type="submit">Dodaj wartość</button>
+          </p>
+        </form>
+        <div class="vocabs">
+          <p>Używające słowniki:</p>
+          {% if using %}
+            <ul>
+              {% for vocab in using %}
+                <li>{{ vocab.id }}</li>
+              {% endfor %}
+            </ul>
+          {% else %}
+            <p>brak</p>
+          {% endif %}
+          <form action="" method="post">
+            {% csrf_token %}
+            {{ vocab_form.as_p }}
+            <p>
+              <button type="submit">Dodaj słownik"</button>
+            </p>
+          </form>
+        </div>
+      </div>
+      <h4>{{ classification.name }}</h4>
+      <p>Wartości:</p>
+      {% with tree=classification.value_tree %}
+        {% if tree %}
+          {% value_tree tree %}
+        {% endif %}
+      {% endwith %}
+    </div>
   {% endfor %}
 {% endblock %}
@@ -50,6 +50,11 @@ div#user-tools {
 /* layout */
+#content {
+    margin-left: 10px;
+    margin-right: 10px;
+}
+
 body {
     margin: 0;
 }
+#content {
+  margin-left: 0px;
+}
+
 p {
   font-size: 1em;
   margin: 1ex 0;
@@ -9,3 +9,18 @@
 .value-controls form {
     display: inline;
 }
+
+.add-classification, .classification, .add-value, .vocabs {
+    border: solid black 1px;
+    margin: 10px 0 10px 0;
+    padding: 10px;
+}
+
+.classification {
+    overflow: auto;
+    width: auto;
+}
+
+.classification-controls {
+    float: right;
+}