diff --git a/issues/templates/issues/detail.html b/issues/templates/issues/detail.html index e25b70d..42ea47c 100644 --- a/issues/templates/issues/detail.html +++ b/issues/templates/issues/detail.html @@ -1,12 +1,6 @@ -{% extends "base.html" %} - -{% block title %}Issue: {{ issue.title }}{% endblock %} - -{% block content %} -

#{{ issue.id }}: {{ issue.title }}

-

- Project: {{ issue.project }}
- Created: {{ issue.create_date }} -

-

{{ issue.text }}

-{% endblock %} +

#{{ issue.id }}: {{ issue.title }}

+

+ Project: {{ issue.project }}
+ Created: {{ issue.create_date }} +

+

{{ issue.text }}

\ No newline at end of file diff --git a/issues/templates/issues/index.html b/issues/templates/issues/index.html index 9eb3e07..c109698 100644 --- a/issues/templates/issues/index.html +++ b/issues/templates/issues/index.html @@ -1,19 +1,13 @@ -{% extends "base.html" %} +{% if issue_list %} + +{% else %} +

No issues.

+{% endif %} -{% block title %}Issues{% endblock %} - -{% block content %} - {% if issue_list %} - - {% else %} -

No issues.

- {% endif %} - -

Create new issue

-{% endblock %} +

Create new issue

diff --git a/issues/templates/issues/new.html b/issues/templates/issues/new.html index 0e6d87c..e9b9899 100644 --- a/issues/templates/issues/new.html +++ b/issues/templates/issues/new.html @@ -1,21 +1,15 @@ -{% extends "base.html" %} +

Create new issue

-{% block title %}Create issue{% endblock %} +{% if error_message %}

{{ error_message }}

{% endif %} -{% block content %} -

Create new issue

- - {% if error_message %}

{{ error_message }}

{% endif %} - -
- {% csrf_token %} - - {{ form.as_table }} - - - -
- -
-
-{% endblock %} +
+ {% csrf_token %} + + {{ form.as_table }} + + + +
+ +
+
diff --git a/projects/templates/projects/index.html b/projects/templates/projects/index.html index ee9bb64..b64c0da 100644 --- a/projects/templates/projects/index.html +++ b/projects/templates/projects/index.html @@ -1,17 +1,11 @@ -{% extends "base.html" %} - -{% block title %}Projects{% endblock %} - -{% block content %} - {% if project_list %} - - {% else %} -

No projects.

- {% endif %} -{% endblock %} +{% if project_list %} + +{% else %} +

No projects.

+{% endif %} \ No newline at end of file diff --git a/projects/templates/projects/view.html b/projects/templates/projects/view.html index afae756..e38e16f 100644 --- a/projects/templates/projects/view.html +++ b/projects/templates/projects/view.html @@ -1,21 +1,15 @@ -{% extends "base.html" %} +

{{ project.project_key }} - {{ project.name }}

+

{{ project.description }}

-{% block title %}Project: {{ project.name }}{% endblock %} - -{% block content %} -

{{ project.project_key }} - {{ project.name }}

-

{{ project.description }}

- -

Issues

- {% if issue_list %} - - {% else %} -

This project has no issues yet.

- {% endif %} -{% endblock %} +

Issues

+{% if issue_list %} + +{% else %} +

This project has no issues yet.

+{% endif %} \ No newline at end of file diff --git a/templates/base.html b/templates/base.html deleted file mode 100644 index c54107f..0000000 --- a/templates/base.html +++ /dev/null @@ -1,12 +0,0 @@ - - - - {% block title %}Tofu{% endblock %} - Tofu - - - -

Tofu

- - {% block content %}No content.{% endblock %} - - diff --git a/templates/registration/login.html b/templates/registration/login.html index f3d53be..1325723 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -1,13 +1,7 @@ -{% extends "base.html" %} +

Login

-{% block title %}Login{% endblock %} - -{% block content %} -

Login

- -
- {% csrf_token %} - {{ form.as_p }} - -
-{% endblock %} +
+ {% csrf_token %} + {{ form.as_p }} + +
diff --git a/tofu/settings.py b/tofu/settings.py index cc78a18..236b664 100644 --- a/tofu/settings.py +++ b/tofu/settings.py @@ -126,6 +126,5 @@ STATIC_URL = '/static/' # Other settings -LOGIN_URL = '/account/login/' LOGIN_REDIRECT_URL = '/projects/' LOGOUT_REDIRECT_URL = '/account/login/'