grouped all templates in toplevel templates for convenience for now

diff --git a/auth/views.py b/auth/views.py
index 11f773b..af7fbc4 100644 (file)
--- a/auth/views.py
+++ b/auth/views.py
@@ -21,5 +21,5 @@ def login_user(request):
         else:
             state = "Your username and/or password were incorrect."
 
-    return render_to_response('login.html',{'state':state, 'username': username},
+    return render_to_response('login-view.html',{'state':state, 'username': username},
                               context_instance=RequestContext(request))

diff --git a/myslice/urls.py b/myslice/urls.py
index 3d86151..c6fa979 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -23,6 +23,6 @@ urlpatterns = patterns(
     (r'^login/?$', 'auth.views.login_user'),
     (r'^slice/?$', 'slice.views.fake_slice_view'),
     (r'^slice/(?P<name>[\w\.]+)/?$', 'slice.views.fake_slice_view'),
-    (r'^sample/?$', 'slice.views.sample_tab'),
-    (r'^scroll/?$', 'slice.views.sample_scroll'),
+    (r'^tab/?$', 'slice.views.tab_view'),
+    (r'^scroll/?$', 'slice.views.scroll_view'),
 )

diff --git a/slice/views.py b/slice/views.py
index 080c2c1..ac1108c 100644 (file)
--- a/slice/views.py
+++ b/slice/views.py
@@ -10,7 +10,7 @@ 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.
 """
 
-standard_menu_items = [ { 'label':'Sample view', 'href': '/sample/'},
+standard_menu_items = [ { 'label':'Tab view', 'href': '/tab/'},
                         { 'label':'Slice view',  'href': '/slice/'},
                         { 'label':'Scroll view', 'href': '/scroll/'},
                         ]
@@ -29,7 +29,7 @@ for site in [ 'inria', 'upmc' , 'ibbt' ]:
         hard_wired_slice_names.append ("ple.%s.%s"%(site,slice))
 
 def fake_slice_view (request, name=None):
-    result=render_to_response('slice.html',
+    result=render_to_response('slice-view.html',
                               {'foo':'var_foo_set_in_view', 
                                'name':name,
                                'slices': hard_wired_slice_names,
@@ -40,15 +40,15 @@ def fake_slice_view (request, name=None):
 
     return result
 
-def sample_tab (request):
-    return render_to_response ('sample-tab.html',
+def tab_view (request):
+    return render_to_response ('tab-view.html',
                                { 'lorem': lorem,
                                  'menu_items': menu_items('sample'),
                                  },
                                context_instance=RequestContext(request))
 
-def sample_scroll (request):
-    return render_to_response ('sample-scroll.html',
+def scroll_view (request):
+    return render_to_response ('scroll-view.html',
                                { 'lorem':lorem,
                                  'menu_items': menu_items('scroll'),
                                  },

diff --git a/auth/templates/login.html b/templates/login-view.html
similarity index 100%
rename from auth/templates/login.html
rename to templates/login-view.html

diff --git a/myslice/templates/mymenu.html b/templates/mymenu.html
similarity index 100%
rename from myslice/templates/mymenu.html
rename to templates/mymenu.html

diff --git a/myslice/templates/myslice.html b/templates/myslice-layout.html
similarity index 100%
rename from myslice/templates/myslice.html
rename to templates/myslice-layout.html

diff --git a/slice/templates/sample-scroll.html b/templates/scroll-view.html
similarity index 96%
rename from slice/templates/sample-scroll.html
rename to templates/scroll-view.html
index 307693d..4875f09 100644 (file)
--- a/slice/templates/sample-scroll.html
+++ b/templates/scroll-view.html
@@ -1,4 +1,4 @@
-{% extends 'myslice.html' %}
+{% extends 'myslice-layout.html' %}
 
 {% block content_main %}
 

diff --git a/slice/templates/slice.html b/templates/slice-view.html
similarity index 94%
rename from slice/templates/slice.html
rename to templates/slice-view.html
index ee9186d..72d2a1a 100644 (file)
--- a/slice/templates/slice.html
+++ b/templates/slice-view.html
@@ -1,4 +1,4 @@
-{% extends 'myslice.html' %}
+{% extends 'myslice-layout.html' %}
 
 {% block content_main %}
 <p>The URL variable name= {{ name }} </p>

diff --git a/slice/templates/sample-tab.html b/templates/tab-view.html
similarity index 98%
rename from slice/templates/sample-tab.html
rename to templates/tab-view.html
index 548f0d8..a8334ed 100644 (file)
--- a/slice/templates/sample-tab.html
+++ b/templates/tab-view.html
@@ -1,4 +1,4 @@
-{% extends 'myslice.html' %}
+{% extends 'myslice-layout.html' %}
 
 {% block content_main %}