From: Thierry Parmentelat Date: Sun, 2 Dec 2012 15:08:59 +0000 (+0100) Subject: start to work on scrollers X-Git-Tag: myslice-django-0.1-1~175 X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=da4f9161e239b402bc48c914fb25a65379772543;p=unfold.git start to work on scrollers --- diff --git a/myslice/templates/myslice.html b/myslice/templates/myslice.html index f316c6ec..5478053d 100644 --- 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" %} - + diff --git a/myslice/urls.py b/myslice/urls.py index e1dd5e5a..32251eaa 100644 --- 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\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 3a622160..a4f120ea 100644 --- 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 index 00000000..0f945297 --- /dev/null +++ b/slice/templates/sample-scroll.html @@ -0,0 +1,24 @@ +{% extends 'myslice.html' %} + +{% block content_main %} + +{% insert_str prelude "css/sample.css" %} + + +

scroll1 area {{ lorem }} {{ lorem }} {{ lorem }}

scroll2 area {{ lorem }} {{ lorem }}

scroll3 area {{ lorem }}

scroll4 area {{ lorem }} {{ lorem }} {{ lorem }}

+ +{% endblock content_main %} + +{% block content_related %} +

+{% endblock content_related %} diff --git a/slice/templates/sample.html b/slice/templates/sample-tab.html similarity index 100% rename from slice/templates/sample.html rename to slice/templates/sample-tab.html diff --git a/slice/views.py b/slice/views.py index 463ff84a..397bee69 100644 --- 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))