From c0b6aa5c1ca491ba21d204dd95d854bbc59c46dc Mon Sep 17 00:00:00 2001
From: janek37 <none@none>
Date: Tue, 2 Oct 2012 17:10:36 +0200
Subject: [PATCH] trochę porządku w zarządzaniu klasyfikacjami
---
dictionary/models.py | 11 +++++++----
dictionary/templates/manage_classifications.html | 72 +++++++++++++++++++++++++++++++++++++++---------------------------------
media/css/general.css | 5 +++++
media/css/jqgrid.css | 4 ++++
media/css/manage_classifications.css | 15 +++++++++++++++
5 files changed, 70 insertions(+), 37 deletions(-)
diff --git a/dictionary/models.py b/dictionary/models.py
index e80f64a..e92d507 100644
--- a/dictionary/models.py
+++ b/dictionary/models.py
@@ -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')
diff --git a/dictionary/templates/manage_classifications.html b/dictionary/templates/manage_classifications.html
index 483a4ee..719709b 100644
--- a/dictionary/templates/manage_classifications.html
+++ b/dictionary/templates/manage_classifications.html
@@ -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 %}
diff --git a/media/css/general.css b/media/css/general.css
index ab766d1..a8dad89 100644
--- a/media/css/general.css
+++ b/media/css/general.css
@@ -50,6 +50,11 @@ div#user-tools {
/* layout */
+#content {
+ margin-left: 10px;
+ margin-right: 10px;
+}
+
body {
margin: 0;
}
diff --git a/media/css/jqgrid.css b/media/css/jqgrid.css
index cebb968..69e358b 100644
--- a/media/css/jqgrid.css
+++ b/media/css/jqgrid.css
@@ -1,3 +1,7 @@
+#content {
+ margin-left: 0px;
+}
+
p {
font-size: 1em;
margin: 1ex 0;
diff --git a/media/css/manage_classifications.css b/media/css/manage_classifications.css
index 9096e79..7685a20 100644
--- a/media/css/manage_classifications.css
+++ b/media/css/manage_classifications.css
@@ -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;
+}
--
libgit2 0.22.2