Merge lp://staging/~mittalaseem79/inkscape-web/template-tag-fix into lp://staging/inkscape-web
Proposed by
Aseem Mittal
| Status: | Needs review |
|---|---|
| Proposed branch: | lp://staging/~mittalaseem79/inkscape-web/template-tag-fix |
| Merge into: | lp://staging/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://staging/~mittalaseem79/inkscape-web/template-tag-fix |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Martin Owens | code | Needs Fixing | |
|
Review via email:
|
|||
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
| Aseem Mittal (mittalaseem79) wrote | # |
Revision history for this message
| Hachmann (marenhachmann) wrote | # |
Revision history for this message
| Aseem Mittal (mittalaseem79) wrote | # |
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
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.