From 05febe12228793a782087bd77ce53e186a5b9b38 Mon Sep 17 00:00:00 2001 From: Karen Date: Thu, 25 Aug 2011 17:18:49 +0530 Subject: [PATCH] added search for left column, changed template a bit, etc. etc. --- itf/itfcore/models.py | 2 +- itf/static/css/noel/inner.css | 33 +++++++++++++++++-- itf/static/js/jquery.js | 2 +- .../modules/bestpractices/bestpractice.html | 2 +- itf/templates/noel/insidepage.html | 25 +++++++------- itf/urls.py | 2 +- 6 files changed, 49 insertions(+), 17 deletions(-) diff --git a/itf/itfcore/models.py b/itf/itfcore/models.py index 4bfbdb2..ca29591 100644 --- a/itf/itfcore/models.py +++ b/itf/itfcore/models.py @@ -2,7 +2,7 @@ from django.db import models from django.contrib.auth.models import User import datetime from django.contrib.localflavor.in_.forms import INZipCodeField -from oxdjango.fields import DictField +from ox.django.fields import DictField GENDER_CHOICES = ( ('M', 'Male'), diff --git a/itf/static/css/noel/inner.css b/itf/static/css/noel/inner.css index 0705fbb..0d6a793 100644 --- a/itf/static/css/noel/inner.css +++ b/itf/static/css/noel/inner.css @@ -51,6 +51,32 @@ right:16px; top:11px; cursor:pointer;} +.searchInnerField +{width:114px; +/*position:absolute; +right:4px; +top:11px;*/ +margin-left: 174px; +margin-top:4px; +border:1px solid #f0f0f0; +background:url(img/search-icon.png) no-repeat right; +padding:2px 2px 2px 4px; +font-family:Arial, Helvetica, 'DejaVu Sans', sans-serif; +font-size:12px; +color:#7d7d7d; +-moz-border-radius:8px; +-webkit-border-radius:8px; +border-radius:8px; +-moz-box-shadow:inset 2px 2px 6px #d7d7d7; +-webkit-box-shadow:inset 2px 2px 6px #d7d7d7; +box-shadow:inset 2px 2px 6px #d7d7d7; +outline:none; +} /*placeholder input text supported by html5 for FF3.7 and webkit*/ + + +.searchInnerField:focus +{border:1px solid #999; } + #tabsInner /*tabs not touching because i would prefer not to give fixed width, shadow, etc.*/ {font-size:14px; color:#ff8400; @@ -150,7 +176,7 @@ text-decoration:none;} {text-decoration:underline; color:#898989;} -#listLeftSelected +.listLeftSelected {border-bottom:1px solid #eece98; border-top:1px solid #eece98; -moz-box-shadow:inset -6px 0px 18px #eece98; @@ -257,9 +283,12 @@ border-radius:8px; -webkit-box-shadow:2px 3px 20px #252425; box-shadow:2px 3px 20px #252425;} -#sectionTitle +.itfInfoSub {color:#f7bd00; font-weight:bold;} +.itfInfo p +{padding-bottom:8px;} + #clearBoth {clear:both;} diff --git a/itf/static/js/jquery.js b/itf/static/js/jquery.js index 0a17377..169c7e9 120000 --- a/itf/static/js/jquery.js +++ b/itf/static/js/jquery.js @@ -1 +1 @@ -jquery-1.4.4.js \ No newline at end of file +jquery-1.6.2.min.js \ No newline at end of file diff --git a/itf/templates/modules/bestpractices/bestpractice.html b/itf/templates/modules/bestpractices/bestpractice.html index 1ffa9e5..2cde61d 100644 --- a/itf/templates/modules/bestpractices/bestpractice.html +++ b/itf/templates/modules/bestpractices/bestpractice.html @@ -9,7 +9,7 @@ {% endif %}

- Relevance to Theatre: {{ theatre }}

+ Relevance to Theatre: {{ theatre|linebreaks }} Quick Howto: {{ quick_howto }}

diff --git a/itf/templates/noel/insidepage.html b/itf/templates/noel/insidepage.html index 49814db..694dae0 100644 --- a/itf/templates/noel/insidepage.html +++ b/itf/templates/noel/insidepage.html @@ -22,6 +22,9 @@

{{ title }}

search +
+ +
-
▲
-
▼
+
▲
+
▼
@@ -88,23 +91,23 @@
diff --git a/itf/urls.py b/itf/urls.py index 5b191ba..0e1ef45 100644 --- a/itf/urls.py +++ b/itf/urls.py @@ -61,7 +61,7 @@ if settings.LOCAL_DEVELOPMENT: # urlpatterns += patterns('', # - (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': join(settings.PROJECT_PATH, "static")}), + (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': join(settings.PROJECT_ROOT, "static")}), # ) #