From cd0dc84f3799b9ef5f5b1eb0097491054bebcc45 Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Tue, 4 Dec 2012 18:08:29 +0100 Subject: [PATCH] checkpoint --- .../jquery/{ => js}/jquery-1.8.3.min.js | 0 myslice/static/jquery/{ => js}/jquery.js | 0 myslice/static/js/mymenu.js | 3 -- myslice/templates/mymenu.html | 2 +- myslice/templates/myslice.html | 7 +-- slice/templates/sample-scroll.html | 12 ++--- slice/views.py | 46 +++++++++++-------- 7 files changed, 38 insertions(+), 32 deletions(-) rename myslice/static/jquery/{ => js}/jquery-1.8.3.min.js (100%) rename myslice/static/jquery/{ => js}/jquery.js (100%) delete mode 100644 myslice/static/js/mymenu.js diff --git a/myslice/static/jquery/jquery-1.8.3.min.js b/myslice/static/jquery/js/jquery-1.8.3.min.js similarity index 100% rename from myslice/static/jquery/jquery-1.8.3.min.js rename to myslice/static/jquery/js/jquery-1.8.3.min.js diff --git a/myslice/static/jquery/jquery.js b/myslice/static/jquery/js/jquery.js similarity index 100% rename from myslice/static/jquery/jquery.js rename to myslice/static/jquery/js/jquery.js diff --git a/myslice/static/js/mymenu.js b/myslice/static/js/mymenu.js deleted file mode 100644 index d513d5da..00000000 --- a/myslice/static/js/mymenu.js +++ /dev/null @@ -1,3 +0,0 @@ -// a dummy javascript file -// I've seen this working, but of course it's painful .. -//alert("loaded mymenu.js") diff --git a/myslice/templates/mymenu.html b/myslice/templates/mymenu.html index b4e531ad..d7f4551c 100644 --- a/myslice/templates/mymenu.html +++ b/myslice/templates/mymenu.html @@ -1,4 +1,4 @@ -{% insert_str prelude "js/mymenu.js" %} +{# {% insert_str prelude "js/mymenu.js" %} #} {% insert_str prelude "css/mymenu.css" %}