From 620d87604e975f2b5f0451a6ece40bcd93e421a2 Mon Sep 17 00:00:00 2001
From: Thierry Parmentelat <thierry.parmentelat@inria.fr>
Date: Fri, 7 Dec 2012 17:28:01 +0100
Subject: [PATCH] moves all the static files under ~/static, for convenience
again, even if only for now
---
Makefile | 2 +-
myslice/settings.py | 1 +
myslice/static/css/miscell.css | 3 ---
slice/views.py | 4 ++--
.../bootstrap/css/bootstrap-responsive.css | 0
.../bootstrap/css/bootstrap-responsive.min.css | 0
.../static => static}/bootstrap/css/bootstrap.css | 0
.../bootstrap/css/bootstrap.min.css | 0
.../bootstrap/img/glyphicons-halflings-white.png | Bin
.../bootstrap/img/glyphicons-halflings.png | Bin
.../static => static}/bootstrap/js/bootstrap.js | 0
.../static => static}/bootstrap/js/bootstrap.min.js | 0
{myslice/static => static}/css/mymenu.css | 0
{myslice/static => static}/css/myslice.css | 0
{slice/static => static}/css/sample.css | 0
.../datatables/js/dataTables-1.9.3.js | 0
.../static => static}/datatables/js/dataTables.js | 0
{myslice/static => static}/img/myslice-logo.png | Bin
.../static => static}/jquery/js/jquery-1.8.3.min.js | 0
{myslice/static => static}/jquery/js/jquery.js | 0
templates/{mymenu.html => mymenu-widget.html} | 0
templates/myslice-layout.html | 2 +-
22 files changed, 5 insertions(+), 7 deletions(-)
delete mode 100644 myslice/static/css/miscell.css
rename {myslice/static => static}/bootstrap/css/bootstrap-responsive.css (100%)
rename {myslice/static => static}/bootstrap/css/bootstrap-responsive.min.css (100%)
rename {myslice/static => static}/bootstrap/css/bootstrap.css (100%)
rename {myslice/static => static}/bootstrap/css/bootstrap.min.css (100%)
rename {myslice/static => static}/bootstrap/img/glyphicons-halflings-white.png (100%)
rename {myslice/static => static}/bootstrap/img/glyphicons-halflings.png (100%)
rename {myslice/static => static}/bootstrap/js/bootstrap.js (100%)
rename {myslice/static => static}/bootstrap/js/bootstrap.min.js (100%)
rename {myslice/static => static}/css/mymenu.css (100%)
rename {myslice/static => static}/css/myslice.css (100%)
rename {slice/static => static}/css/sample.css (100%)
rename {myslice/static => static}/datatables/js/dataTables-1.9.3.js (100%)
rename {myslice/static => static}/datatables/js/dataTables.js (100%)
rename {myslice/static => static}/img/myslice-logo.png (100%)
rename {myslice/static => static}/jquery/js/jquery-1.8.3.min.js (100%)
rename {myslice/static => static}/jquery/js/jquery.js (100%)
rename templates/{mymenu.html => mymenu-widget.html} (100%)
diff --git a/Makefile b/Makefile
index 9ac9b7f8..dde9fac3 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,7 @@ force:
#################### compute emacs tags
# list files under git but exclude third-party stuff like bootstrap and jquery
myfiles: force
- @git ls-files | egrep -v 'insert_above/|/bootstrap/|/jquery/'
+ @git ls-files | egrep -v 'insert_above/|/bootstrap/|/jquery/|datatables/'
# in general it's right to rely on the contents as reported by git
tags: force
diff --git a/myslice/settings.py b/myslice/settings.py
index 258c3e28..7785f048 100644
--- a/myslice/settings.py
+++ b/myslice/settings.py
@@ -80,6 +80,7 @@ STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
+ os.path.join(ROOT,'static'),
)
# List of finder classes that know how to find static files in
diff --git a/myslice/static/css/miscell.css b/myslice/static/css/miscell.css
deleted file mode 100644
index 23755f8f..00000000
--- a/myslice/static/css/miscell.css
+++ /dev/null
@@ -1,3 +0,0 @@
-.bold {
- font-weight: bold;
-}
diff --git a/slice/views.py b/slice/views.py
index ac1108c3..10ccb3eb 100644
--- a/slice/views.py
+++ b/slice/views.py
@@ -7,7 +7,7 @@ from django.template.loader import render_to_string
from django.shortcuts import render_to_response
lorem="""
-Lorem <span class='bold'>ipsum dolor</span> sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod <code>mazim placerat</code> facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.
+Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod <code>mazim placerat</code> facer possim assum. Typi non habent claritatem insitam; est usus legentis in iis qui facit eorum claritatem. Investigationes demonstraverunt lectores legere me lius quod ii legunt saepius. Claritas est etiam processus dynamicus, qui sequitur mutationem consuetudium lectorum. Mirum est notare quam littera gothica, quam nunc putamus parum claram, anteposuerit litterarum formas humanitatis per seacula quarta decima et quinta decima. Eodem modo typi, qui nunc nobis videntur parum clari, fiant sollemnes in futurum.
"""
standard_menu_items = [ { 'label':'Tab view', 'href': '/tab/'},
@@ -43,7 +43,7 @@ def fake_slice_view (request, name=None):
def tab_view (request):
return render_to_response ('tab-view.html',
{ 'lorem': lorem,
- 'menu_items': menu_items('sample'),
+ 'menu_items': menu_items('tab'),
},
context_instance=RequestContext(request))
diff --git a/myslice/static/bootstrap/css/bootstrap-responsive.css b/static/bootstrap/css/bootstrap-responsive.css
similarity index 100%
rename from myslice/static/bootstrap/css/bootstrap-responsive.css
rename to static/bootstrap/css/bootstrap-responsive.css
diff --git a/myslice/static/bootstrap/css/bootstrap-responsive.min.css b/static/bootstrap/css/bootstrap-responsive.min.css
similarity index 100%
rename from myslice/static/bootstrap/css/bootstrap-responsive.min.css
rename to static/bootstrap/css/bootstrap-responsive.min.css
diff --git a/myslice/static/bootstrap/css/bootstrap.css b/static/bootstrap/css/bootstrap.css
similarity index 100%
rename from myslice/static/bootstrap/css/bootstrap.css
rename to static/bootstrap/css/bootstrap.css
diff --git a/myslice/static/bootstrap/css/bootstrap.min.css b/static/bootstrap/css/bootstrap.min.css
similarity index 100%
rename from myslice/static/bootstrap/css/bootstrap.min.css
rename to static/bootstrap/css/bootstrap.min.css
diff --git a/myslice/static/bootstrap/img/glyphicons-halflings-white.png b/static/bootstrap/img/glyphicons-halflings-white.png
similarity index 100%
rename from myslice/static/bootstrap/img/glyphicons-halflings-white.png
rename to static/bootstrap/img/glyphicons-halflings-white.png
diff --git a/myslice/static/bootstrap/img/glyphicons-halflings.png b/static/bootstrap/img/glyphicons-halflings.png
similarity index 100%
rename from myslice/static/bootstrap/img/glyphicons-halflings.png
rename to static/bootstrap/img/glyphicons-halflings.png
diff --git a/myslice/static/bootstrap/js/bootstrap.js b/static/bootstrap/js/bootstrap.js
similarity index 100%
rename from myslice/static/bootstrap/js/bootstrap.js
rename to static/bootstrap/js/bootstrap.js
diff --git a/myslice/static/bootstrap/js/bootstrap.min.js b/static/bootstrap/js/bootstrap.min.js
similarity index 100%
rename from myslice/static/bootstrap/js/bootstrap.min.js
rename to static/bootstrap/js/bootstrap.min.js
diff --git a/myslice/static/css/mymenu.css b/static/css/mymenu.css
similarity index 100%
rename from myslice/static/css/mymenu.css
rename to static/css/mymenu.css
diff --git a/myslice/static/css/myslice.css b/static/css/myslice.css
similarity index 100%
rename from myslice/static/css/myslice.css
rename to static/css/myslice.css
diff --git a/slice/static/css/sample.css b/static/css/sample.css
similarity index 100%
rename from slice/static/css/sample.css
rename to static/css/sample.css
diff --git a/myslice/static/datatables/js/dataTables-1.9.3.js b/static/datatables/js/dataTables-1.9.3.js
similarity index 100%
rename from myslice/static/datatables/js/dataTables-1.9.3.js
rename to static/datatables/js/dataTables-1.9.3.js
diff --git a/myslice/static/datatables/js/dataTables.js b/static/datatables/js/dataTables.js
similarity index 100%
rename from myslice/static/datatables/js/dataTables.js
rename to static/datatables/js/dataTables.js
diff --git a/myslice/static/img/myslice-logo.png b/static/img/myslice-logo.png
similarity index 100%
rename from myslice/static/img/myslice-logo.png
rename to static/img/myslice-logo.png
diff --git a/myslice/static/jquery/js/jquery-1.8.3.min.js b/static/jquery/js/jquery-1.8.3.min.js
similarity index 100%
rename from myslice/static/jquery/js/jquery-1.8.3.min.js
rename to static/jquery/js/jquery-1.8.3.min.js
diff --git a/myslice/static/jquery/js/jquery.js b/static/jquery/js/jquery.js
similarity index 100%
rename from myslice/static/jquery/js/jquery.js
rename to static/jquery/js/jquery.js
diff --git a/templates/mymenu.html b/templates/mymenu-widget.html
similarity index 100%
rename from templates/mymenu.html
rename to templates/mymenu-widget.html
diff --git a/templates/myslice-layout.html b/templates/myslice-layout.html
index bd9639b1..738e3759 100644
--- a/templates/myslice-layout.html
+++ b/templates/myslice-layout.html
@@ -31,7 +31,7 @@
<div id='header'>
{% block header %}
<a id='menu_logo' href="/"><img class="logo" src="{{ STATIC_URL }}img/myslice-logo.png" alt="MySlice" /></a>
- {% include 'mymenu.html' %}
+ {% include 'mymenu-widget.html' %}
{% endblock header %}
</div>
--
2.47.0