From b2372aae0b1863950bc75e6fb82932485b1ef961 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Thu, 22 Nov 2012 18:42:09 +0100 Subject: [PATCH] renamed --- Makefile | 13 ++++++++--- myslice/static/css/miscell.css | 3 +++ .../templates/mymenu.html | 1 + .../templates/myslice-base.html | 20 ++++++++++++---- myslice/urls.py | 5 ++-- slice/templates/{foo.html => slice.html} | 6 ++--- slice/views.py | 23 ++++++++----------- 7 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 myslice/static/css/miscell.css rename slice/templates/foo-menu.html => myslice/templates/mymenu.html (82%) rename slice/templates/foo-base.html => myslice/templates/myslice-base.html (60%) rename slice/templates/{foo.html => slice.html} (50%) diff --git a/Makefile b/Makefile index fe0820fc..80fcc4f1 100644 --- a/Makefile +++ b/Makefile @@ -1,10 +1,17 @@ +all: tags + +force: + # in general it's right to rely on the contents as reported by git -tags: +tags: force git ls-files | xargs etags # however sometimes we have stuff not yet added, so in this case -ftags: +ftags: force find . -type f | fgrep -v '/.git/' | xargs etags -static: +static: force ./manage.py collectstatic --noinput + +clean-static: force + rm -rf ./all-static/ diff --git a/myslice/static/css/miscell.css b/myslice/static/css/miscell.css new file mode 100644 index 00000000..23755f8f --- /dev/null +++ b/myslice/static/css/miscell.css @@ -0,0 +1,3 @@ +.bold { + font-weight: bold; +} diff --git a/slice/templates/foo-menu.html b/myslice/templates/mymenu.html similarity index 82% rename from slice/templates/foo-menu.html rename to myslice/templates/mymenu.html index ed91b028..990b6a77 100644 --- a/slice/templates/foo-menu.html +++ b/myslice/templates/mymenu.html @@ -4,6 +4,7 @@ {% insert raw_js %} "some script useful for mymenu" {% endinsert %} {# use the raw_css container for css style #} +