git://git.onelab.eu / myslice.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 329d7b7)
start to work on scrollers
authorThierry Parmentelat <thierry.parmentelat@inria.fr>
Sun, 2 Dec 2012 15:08:59 +0000 (16:08 +0100)
committerThierry Parmentelat <thierry.parmentelat@inria.fr>
Sun, 2 Dec 2012 15:08:59 +0000 (16:08 +0100)
myslice/templates/myslice.html patch | blob | history
myslice/urls.py patch | blob | history
slice/static/css/sample.css patch | blob | history
slice/templates/sample-scroll.html [new file with mode: 0644] patch | blob
slice/templates/sample-tab.html [moved from slice/templates/sample.html with 100% similarity] patch | blob | history
slice/views.py patch | blob | history

diff --git a/myslice/templates/myslice.html b/myslice/templates/myslice.html
index f316c6e..5478053 100644 (file)
--- a/myslice/templates/myslice.html
+++ b/myslice/templates/myslice.html
@@ -22,7 +22,7 @@
 {% insert_str prelude "css/myslice.css" %}
 {% insert_str prelude "css/miscell.css" %}
 
-<body>
+<body data-spy='"scroll" data-target=".foo">
 
 {% block container %}
 <div id='container'>
diff --git a/myslice/urls.py b/myslice/urls.py
index e1dd5e5..32251ea 100644 (file)
--- a/myslice/urls.py
+++ b/myslice/urls.py
@@ -23,5 +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_view'),
+    (r'^sample/?$', 'slice.views.sample_tab'),
+    (r'^scroll/?$', 'slice.views.sample_scroll'),
 )
diff --git a/slice/static/css/sample.css b/slice/static/css/sample.css
index 3a62216..a4f120e 100644 (file)
--- a/slice/static/css/sample.css
+++ b/slice/static/css/sample.css
@@ -2,3 +2,17 @@
     border-style: solid; 
     padding: 20px;
 }
+
+#scrollDiv1 { 
+    background-color: #fbb;
+}
+#scrollDiv2 { 
+    background-color: #bbb;
+}
+#scrollDiv3 { 
+    background-color: #bbf;
+}
+#scrollDiv4 { 
+    background-color: #bfb;
+}
+
diff --git a/slice/templates/sample-scroll.html b/slice/templates/sample-scroll.html
new file mode 100644 (file)
index 0000000..0f94529
--- /dev/null
+++ b/slice/templates/sample-scroll.html
@@ -0,0 +1,24 @@
+{% extends 'myslice.html' %}
+
+{% block content_main %}
+
+{% insert_str prelude "css/sample.css" %}
+
+<!--<div id='scrolls' data-spy="scroll" data-target=".foo">-->
+<div id='scrollDiv1'> scroll1 area {{ lorem }} {{ lorem }} {{ lorem }} </div>
+<div id='scrollDiv2'> scroll2 area {{ lorem }} {{ lorem }} </div>
+<div id='scrollDiv3'> scroll3 area {{ lorem }}  </div>
+<div id='scrollDiv4'> scroll4 area {{ lorem }} {{ lorem }} {{ lorem }} </div>
+<!--</div>-->
+{% endblock content_main %}
+
+{% block content_related %}
+<div id="foo">
+<ul class="nav nav-list">
+  <li><a href="#scrollDiv1"><!--<i class="icon-chevron-right"/>--> scroll1 </a></li>
+  <li><a href="#scrollDiv2"> scroll2 </a></li>
+  <li><a href="#scrollDiv3"> scroll3 </a></li>
+  <li><a href="#scrollDiv4"> scroll4 </a></li>
+</ul>
+</div>
+{% endblock content_related %}
diff --git a/slice/views.py b/slice/views.py
index 463ff84..397bee6 100644 (file)
--- a/slice/views.py
+++ b/slice/views.py
@@ -12,18 +12,30 @@ def fake_slice_view (request, name=None):
                                             'name':name,
                                             'content_main' : lorem,
                                             'menu_items' : 
-                                            [ { 'label':'Sample', 'href': '/sample/'},
-                                              { 'label':'Slice', 'href': '/slice/', 'active':True},
+                                            [ { 'label':'Sample view', 'href': '/sample/'},
+                                              { 'label':'Slice view', 'href': '/slice/', 'active':True},
+                                              { 'label':'Scroll view', 'href': '/scroll/'},
                                               ]},
                               context_instance=RequestContext(request))
 
     return result
 
-def sample_view (request):
-    return render_to_response ('sample.html',
+def sample_tab (request):
+    return render_to_response ('sample-tab.html',
                                { 'lorem': lorem,
                                  'menu_items':
                                      [ { 'label':'Sample', 'href': '/sample/','active':True, },
                                        { 'label':'Slice', 'href': '/slice/'},
+                                       { 'label':'Scroll view', 'href': '/scroll/'},
+                                       ]},
+                               context_instance=RequestContext(request))
+
+def sample_scroll (request):
+    return render_to_response ('sample-scroll.html',
+                               { 'lorem':lorem,
+                                 'menu_items':
+                                     [ { 'label':'Sample', 'href': '/sample/', },
+                                       { 'label':'Slice', 'href': '/slice/'},
+                                       { 'label':'Scroll view', 'href': '/scroll/', 'active':True, },
                                        ]},
                                context_instance=RequestContext(request))
myslice (django)