From 0a0adf93baaacca0b3828858918c9ae86836b15b Mon Sep 17 00:00:00 2001 From: Sanj Date: Wed, 14 Sep 2011 04:00:34 +0530 Subject: [PATCH] karen: css - banner, etc --- best/settings.py | 10 +-- best/static/rapidsms/stylesheets/layout.css | 73 +++++++++++++-------- best/static/rapidsms/stylesheets/splits.css | 9 ++- best/static/rapidsms/stylesheets/tables.css | 3 +- best/urls.py | 15 ++++- 5 files changed, 74 insertions(+), 36 deletions(-) diff --git a/best/settings.py b/best/settings.py index e354649..058c14c 100644 --- a/best/settings.py +++ b/best/settings.py @@ -24,7 +24,7 @@ DATABASES = { } } - +LOCAL_DEVELOPMENT = False # the rapidsms backend configuration is designed to resemble django's # database configuration, as a nested dict of (name, configuration). # @@ -96,10 +96,10 @@ INSTALLED_APPS = [ # to add it here, also, to expose it in the rapidsms ui. RAPIDSMS_TABS = [ ("rapidsms.contrib.messagelog.views.message_log", "Message Log"), - ("rapidsms.contrib.registration.views.registration", "Registration"), - ("rapidsms.contrib.messaging.views.messaging", "Messaging"), - ("rapidsms.contrib.locations.views.locations", "Map"), - ("rapidsms.contrib.scheduler.views.index", "Event Scheduler"), +# ("rapidsms.contrib.registration.views.registration", "Registration"), +# ("rapidsms.contrib.messaging.views.messaging", "Messaging"), +# ("rapidsms.contrib.locations.views.locations", "Map"), +# ("rapidsms.contrib.scheduler.views.index", "Event Scheduler"), ("rapidsms.contrib.httptester.views.generate_identity", "Message Tester"), ] diff --git a/best/static/rapidsms/stylesheets/layout.css b/best/static/rapidsms/stylesheets/layout.css index dde55a9..764c25a 100644 --- a/best/static/rapidsms/stylesheets/layout.css +++ b/best/static/rapidsms/stylesheets/layout.css @@ -55,11 +55,25 @@ div.clear-hack { /* the header is based roughly upon unicef.org, with rapidsms colors */ #header { - background: url("../images/header-bg.png") repeat-x; - padding-top: 23px; - padding-bottom: 33px; - position: relative; - color: #ccf; +height:122px; +width:960px; +text-align:right; +position: relative; +color: #CCF; +background: #94997e; /* Old browsers */ +background: -moz-linear-gradient(top, #94997e 0%, #d2dab3 10%, #d2dab3 80%, #94997e 100%); /* FF3.6+ */ +background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#94997e), color-stop(10%,#d2dab3), color-stop(80%,#d2dab3), color-stop(100%,#94997e)); /* Chrome,Safari4+ */ +background: -webkit-linear-gradient(top, #94997e 0%,#d2dab3 10%,#d2dab3 80%,#94997e 100%); /* Chrome10+,Safari5.1+ */ +background: -o-linear-gradient(top, #94997e 0%,#d2dab3 10%,#d2dab3 80%,#94997e 100%); /* Opera11.10+ */ +background: -ms-linear-gradient(top, #94997e 0%,#d2dab3 10%,#d2dab3 80%,#94997e 100%); /* IE10+ */ +filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#94997e', endColorstr='#94997e',GradientType=0 ); /* IE6-9 */ +background: linear-gradient(top, #94997e 0%,#d2dab3 10%,#d2dab3 80%,#94997e 100%); /* W3C */} + + + + + + } /* hide the log in/out links in the top right. this doesn't need to @@ -75,21 +89,27 @@ div.clear-hack { } #header #auth a { - color: #fff; } + color: #CE0000; + padding-right:6px; + font-size:80%;} #branding { - padding: 0 10px; + padding: 2px 10px; } /* align in the middle of the unicef blue stripe of header bg, and * display logo on the right. TODO: extract the unicef branding */ #branding h1 { - background: url("../images/unicef-logo.png") no-repeat 100% 50%; - height: 65px; + background: url(../images/bessms_header07d.png) no-repeat; + height: 108px; color: #fff; margin: 0; - } + width:960px; + position:absolute; + top:6px; + left:0px; + } * html #branding h1 { width: 940px; } @@ -98,7 +118,7 @@ div.clear-hack { height: 65px; width: 245px; display: block; - background: url("../images/rapidsms-logo.png") no-repeat 0 50%; + /*background: url("../images/rapidsms-logo.png") no-repeat 0 50%;*/ /* float the RapidSMS logo, in case any app would like to * append anything to the light blue (empty) stripe */ @@ -138,18 +158,13 @@ div.clear-hack { #tabs li a, #page-tabs li a { - color: #fff; - display: block; - padding: 0 1em; - background: #2fa5d1 url("../images/tab-bg.png") repeat-x; - border-right: 1px solid #11bad0; - border-left: 1px solid #11bad0; - - /* disable the focus outline on tabs, to avoid a rather - * ugly dotted box around tabs while they have focus (we - * remain accessible by providing an :focus, later) */ - outline: none; - } + color: white; +display: block; +padding: 0 1em; +border-right: 1px solid #FE0000; +border-left: 1px solid #FE0000; +outline: none; +background-color:#CE0000; } /* there are unread messages in this tab! TODO: is this just * for the training app? if so, move it there! */ @@ -184,10 +199,10 @@ div.clear-hack { * with the keyboard (we removed the outline, above) */ #tabs li a:hover, #page-tabs li a:hover, #tabs li a:focus, #page-tabs li a:focus { - background-image: url("../images/tab-bg-hover.png"); - text-shadow: #cef1f5 0 0 2px; + /*background-image: url("../images/tab-bg-hover.png");*/ + text-shadow: #FB8C07 1px 1px 2px; text-decoration: none; - } + } @@ -208,6 +223,9 @@ div.clear-hack { +.module a +{color:#CE0000;} + #inner { padding: 1em; position: relative; @@ -286,6 +304,9 @@ div.trigger { #footer .footer-region a:last-child { margin-right: 0; } + #footer a +{color:#CE0000;} + #footer p.rights { text-align: right; float: right; diff --git a/best/static/rapidsms/stylesheets/splits.css b/best/static/rapidsms/stylesheets/splits.css index 0f379b9..e2c7161 100644 --- a/best/static/rapidsms/stylesheets/splits.css +++ b/best/static/rapidsms/stylesheets/splits.css @@ -11,10 +11,13 @@ .two-columns { padding-left: 1em; } .two-columns .col-1 { margin-left: -1em; } - .two-columns .col-1, - .two-columns .col-2 { - width: 50%; } + .two-columns .col-1 +{ + width: 34%; } + .two-columns .col-2 +{ + width: 66%; } .three-columns { padding-left: 2em; } .three-columns .col-1 { margin-left: -2em; } diff --git a/best/static/rapidsms/stylesheets/tables.css b/best/static/rapidsms/stylesheets/tables.css index fa846c0..87a1ec5 100644 --- a/best/static/rapidsms/stylesheets/tables.css +++ b/best/static/rapidsms/stylesheets/tables.css @@ -1,7 +1,8 @@ /* vim:set et ts=4 sw=4 */ table { - border-collapse: collapse; } + border-collapse: collapse; + width:100%;} col { } diff --git a/best/urls.py b/best/urls.py index 34efec2..b6a468c 100644 --- a/best/urls.py +++ b/best/urls.py @@ -1,6 +1,7 @@ from django.conf.urls.defaults import * from django.conf import settings from django.contrib import admin +from os.path import join admin.autodiscover() @@ -16,7 +17,7 @@ urlpatterns = patterns('', # RapidSMS core URLs (r'^account/', include('rapidsms.urls.login_logout')), url(r'^$', 'rapidsms.views.dashboard', name='rapidsms-dashboard'), - +# (r'^$', include('rapidsms.contrib.messagelog.urls')), # RapidSMS contrib app URLs (r'^ajax/', include('rapidsms.contrib.ajax.urls')), (r'^export/', include('rapidsms.contrib.export.urls')), @@ -28,6 +29,17 @@ urlpatterns = patterns('', (r'^scheduler/', include('rapidsms.contrib.scheduler.urls')), ) + +if settings.LOCAL_DEVELOPMENT: +# + urlpatterns += patterns('', +# + (r'^static/(?P.*)$', 'django.views.static.serve', {'document_root': join(settings.PROJECT_PATH, "static")}), +# +) +# + +''' if settings.DEBUG: urlpatterns += patterns('', # helper URLs file that automatically serves the 'static' folder in @@ -35,3 +47,4 @@ if settings.DEBUG: # production) (r'^', include('rapidsms.urls.static_media')), ) +'''