From cfc7c3f52544af8a71d3fa3988a06fee200d2c24 Mon Sep 17 00:00:00 2001 From: Filipp Lepalaan Date: Wed, 19 Feb 2014 09:29:17 +0200 Subject: better --- apps/it/templates/default.html | 573 ++++++++++++++++++------------------- apps/it/templates/edit_issue.html | 10 +- apps/it/templates/edit_task.html | 2 +- apps/it/templates/list_issues.html | 30 +- apps/it/templates/list_stuff.html | 29 ++ apps/it/templates/view_issue.html | 72 ++++- 6 files changed, 394 insertions(+), 322 deletions(-) create mode 100644 apps/it/templates/list_stuff.html (limited to 'apps/it/templates') diff --git a/apps/it/templates/default.html b/apps/it/templates/default.html index 18498ef..49b818b 100755 --- a/apps/it/templates/default.html +++ b/apps/it/templates/default.html @@ -1,320 +1,301 @@ +{% load bootstrap3 %} - + + - - - - IT - - - - + IT - + + + - - + + + + + -
+
- + - + -
-
-
- New Issue - {% block main %} -

Blank

- {% endblock main %} -
- -
- +
+
+
+ {% block main %} +

Blank

+ {% endblock main %}
- - + +
+ +
- + + +
+ - - - - - + + + + + - + - - + + - - - + + + diff --git a/apps/it/templates/edit_issue.html b/apps/it/templates/edit_issue.html index e1be666..aaedee2 100644 --- a/apps/it/templates/edit_issue.html +++ b/apps/it/templates/edit_issue.html @@ -3,9 +3,9 @@ {% load i18n %} {% block main %} -
- {% csrf_token %} - {% bootstrap_form form %} - -
+
+ {% csrf_token %} + {% bootstrap_form form %} + +
{% endblock main %} diff --git a/apps/it/templates/edit_task.html b/apps/it/templates/edit_task.html index e1be666..30435e4 100644 --- a/apps/it/templates/edit_task.html +++ b/apps/it/templates/edit_task.html @@ -6,6 +6,6 @@
{% csrf_token %} {% bootstrap_form form %} - +
{% endblock main %} diff --git a/apps/it/templates/list_issues.html b/apps/it/templates/list_issues.html index c52058d..56d05b0 100644 --- a/apps/it/templates/list_issues.html +++ b/apps/it/templates/list_issues.html @@ -1,12 +1,26 @@ {% extends "default.html" %} +{% load bootstrap3 %} +{% load i18n %} {% block main %} - - {% for i in issues %} - - - - - {% endfor %} -
{{ i.description }}Me too!
+
    +{% for k, v in states %} + {{ v }} +{% endfor %} +
+ + {% for i in issues %} + + + + {% endfor %} +
{{ i.description }}
{% endblock main %} + +{% block inspector %} +
+ {% csrf_token %} + {% bootstrap_form form %} + +
+{% endblock inspector %} diff --git a/apps/it/templates/list_stuff.html b/apps/it/templates/list_stuff.html new file mode 100644 index 0000000..2ed2d6b --- /dev/null +++ b/apps/it/templates/list_stuff.html @@ -0,0 +1,29 @@ +{% extends "default.html" %} +{% load bootstrap3 %} +{% load i18n %} + +{% block main %} + +
    +{% for k, v in categories %} + {{ v }} +{% endfor %} +
+ + + + {% for i in object_list %} + + + {% endfor %} + +
{{ i.name }}{{ i.description }}
+{% endblock main %} + +{% block inspector %} +
+ {% csrf_token %} + {% bootstrap_form form %} + +
+{% endblock inspector %} diff --git a/apps/it/templates/view_issue.html b/apps/it/templates/view_issue.html index fe36f34..cf33b22 100644 --- a/apps/it/templates/view_issue.html +++ b/apps/it/templates/view_issue.html @@ -1,18 +1,66 @@ {% extends "default.html" %} {% load bootstrap3 %} +{% load humanize %} {% load i18n %} +{% load it_tags %} {% block main %} -

{{ issue.description }}

- {% for i in issue.task_set.all %} -

{{ i.description }}

- {% endfor %} - {% for f in files %} - {{ f.attachment.name }} - {% endfor %} -
-
- Edit - Add Task - Me too! +{{ issue.description|markdown }} +{{ issue.created_by}} @ {{ issue.created_at }} +
+{% bootstrap_icon "pencil" %} Edit +{% bootstrap_icon "star" %} Me too! +{% for i in issue.task_set.all %} +
+
+ {{ i.created_by }} {{ i.created_at|naturaltime }} +
+
+ {{ i.description|markdown }} +
+
+ + +
+
+
+{% endfor %} +
{% endblock main %} + +{% block inspector %} +

Users

+{% for f in issue.users.all %} + {{ f }} + {% bootstrap_icon "trash" %} +{% endfor %} +
+

Files

+{% for f in issue.files.all %} + {{ f }} + {% bootstrap_icon "trash" %} +{% endfor %} +
+
+ {% csrf_token %} +
+
+
+ {% csrf_token %} + {% bootstrap_form form %} + +
+{% endblock inspector %} -- cgit v1.2.3