Inkscape-website

Merge lp:~mittalaseem79/inkscape-web/template-tag-fix into lp:inkscape-web

  1. template-tag-fix
  2. Merge into inkscape-web
Proposed by Aseem Mittal
Status: Needs review
Proposed branch: lp:~mittalaseem79/inkscape-web/template-tag-fix
Merge into: lp:inkscape-web
Diff against target: 69 lines (+6/-5)
6 files modified
inkscape/settings.py (+1/-0)
projects/templates/projects/project_detail.html (+1/-1)
projects/templates/projects/project_gsoc_list.html (+1/-1)
projects/templates/projects/project_list.html (+1/-1)
projects/templates/projects/project_propose.html (+1/-1)
projects/templates/projects/projectupdate_form.html (+1/-1)
To merge this branch: bzr merge lp:~mittalaseem79/inkscape-web/template-tag-fix
Reviewer Review Type Date Requested Status
Martin Owens code Needs Fixing
Review via email: mp+288893@code.launchpad.net

Commit message

Add template tag for staticfiles in project templates

Description of the change

Include template tag for staticfiles and add 'markdown_deux' in INSTALLED_APP to load markdown_deux_tags.

To post a comment you must log in.
Revision history for this message
Martin Owens (doctormo) wrote :

The static templatetag is called 'static' in core and 'staticfiles' in contrib. They're identical in functionality (the contrib calls the core) so we should use 'static' directly, especially since design_toolbar will be overloading the static template tag for themeing.

review: Needs Fixing (code)
Reply
Revision history for this message
Aseem Mittal (mittalaseem79) wrote :

> The static templatetag is called 'static' in core and 'staticfiles' in
> contrib. They're identical in functionality (the contrib calls the core) so we
> should use 'static' directly, especially since design_toolbar will be
> overloading the static template tag for themeing.

Understood completely, I will make the required changes.

Reply
lp:~mittalaseem79/inkscape-web/template-tag-fix updated
1147. By Aseem Mittal

Change templatetag staticfiles to static

Revision history for this message
Hachmann (marenhachmann) wrote :

Thank you for fixing my error :)

Reply
Revision history for this message
Aseem Mittal (mittalaseem79) wrote :

> Thank you for fixing my error :)
My pleasure :)

Reply

Unmerged revisions

1147. By Aseem Mittal

Change templatetag staticfiles to static

1146. By Aseem Mittal

Add template tag for staticfiles in project templates

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'inkscape/settings.py'
2--- inkscape/settings.py 2016-03-12 20:21:10 +0000
3+++ inkscape/settings.py 2016-03-14 12:45:39 +0000
4@@ -195,6 +195,7 @@
5 'django_mailman',
6 'alerts',
7 'logbook',
8+ 'markdown_deux',
9 )
10
11 SESSION_ENGINE = 'user_sessions.backends.db'
12
13=== modified file 'projects/templates/projects/project_detail.html'
14--- projects/templates/projects/project_detail.html 2016-03-12 16:52:35 +0000
15+++ projects/templates/projects/project_detail.html 2016-03-14 12:45:39 +0000
16@@ -1,6 +1,6 @@
17 {% extends "base.html" %}
18
19-{% load i18n pile sekizai_tags markdown_deux_tags %}
20+{% load i18n pile sekizai_tags markdown_deux_tags static %}
21
22 {% block title %}{% trans "Project" %} | {{ object.title }}{% endblock %}
23
24
25=== modified file 'projects/templates/projects/project_gsoc_list.html'
26--- projects/templates/projects/project_gsoc_list.html 2016-03-12 16:20:21 +0000
27+++ projects/templates/projects/project_gsoc_list.html 2016-03-14 12:45:39 +0000
28@@ -1,6 +1,6 @@
29 {% extends "base.html" %}
30
31-{% load i18n sekizai_tags pagination_tags %}
32+{% load i18n sekizai_tags pagination_tags static %}
33
34 {% block content %}
35 {% addtoblock "css" %}
36
37=== modified file 'projects/templates/projects/project_list.html'
38--- projects/templates/projects/project_list.html 2016-03-12 16:52:35 +0000
39+++ projects/templates/projects/project_list.html 2016-03-14 12:45:39 +0000
40@@ -1,6 +1,6 @@
41 {% extends "base.html" %}
42
43-{% load i18n sekizai_tags pagination_tags %}
44+{% load i18n sekizai_tags pagination_tags static %}
45
46 {% block content %}
47 {% addtoblock "css" %}
48
49=== modified file 'projects/templates/projects/project_propose.html'
50--- projects/templates/projects/project_propose.html 2016-03-12 16:20:21 +0000
51+++ projects/templates/projects/project_propose.html 2016-03-14 12:45:39 +0000
52@@ -1,4 +1,4 @@
53-{% load i18n pile sekizai_tags %}
54+{% load i18n pile sekizai_tags static %}
55
56 {% addtoblock "css" %}
57 <link rel="stylesheet" type="text/css" href="{% static "css/project.css" %}"/>
58
59=== modified file 'projects/templates/projects/projectupdate_form.html'
60--- projects/templates/projects/projectupdate_form.html 2016-03-12 16:20:21 +0000
61+++ projects/templates/projects/projectupdate_form.html 2016-03-14 12:45:39 +0000
62@@ -1,6 +1,6 @@
63 {% extends "base.html" %}
64
65-{% load i18n pile sekizai_tags %}
66+{% load i18n pile sekizai_tags static %}
67
68 {% block title %}
69 {% trans "Update project" %} | {{ object.project.title }}

Subscribers

People subscribed via source and target branches

to status/vote changes: