summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2011-04-25 13:06:21 (GMT)
committerErnesto Rico-Schmidt <e.rico.schmidt@gmail.com>2011-04-25 13:06:21 (GMT)
commitee5257de10e846f5e8e6fe63b11aa2fa8b9cd2a9 (patch)
tree05c998d2a32b5446f45095a15e9a93cee3f83c1c
parentc9bbb322f456c3f12ef896384139839d3019bd82 (diff)
removed base style sheet.
-rw-r--r--site_media/styles/base.css152
-rw-r--r--templates/program/boxes/current.html1
-rw-r--r--templates/program/boxes/recommendations.html1
-rw-r--r--templates/program/day_schedule.html1
-rw-r--r--templates/program/host_detail.html1
-rw-r--r--templates/program/host_list.html1
-rw-r--r--templates/program/recommendations.html1
-rw-r--r--templates/program/show_list.html1
-rw-r--r--templates/program/timeslot_detail.html1
-rw-r--r--templates/program/week_schedule.html1
-rw-r--r--urls.py12
11 files changed, 1 insertions, 172 deletions
diff --git a/site_media/styles/base.css b/site_media/styles/base.css
deleted file mode 100644
index 51194b1..0000000
--- a/site_media/styles/base.css
+++ /dev/null
@@ -1,152 +0,0 @@
-#recommendations-box,
-#day-schedule,
-#broadcastformats,
-#filter,
-#shows {
- display: inline;
- float: left;
-}
-
-#filter { width: 213px; }
-#recommendations-box { width: 213px; }
-#day-schedule { width: 700px; }
-#shows {width: 700px;}
-#broadcastformats { width: 170px; }
-#current-timeslot,
-#next-timeslot,
-#after-next-timeslot {
- clear: both;
-}
-
-#current-timeslot .start,
-#next-timeslot .start,
-#after-next-timeslot .start {
- display: inline;
- float: left;
-}
-
-#current-timeslot .show,
-#next-timeslot .show,
-#after-next-timeslot .show {
- display: inline;
- float: left;
-}
-
-/* FIXME: fill the actual colors */
-#current-timeslot .experimentell,
-#next-timeslot .experimentell,
-#after-next-timeslot .experimentell,
-#recommendations-box .experimentell {
- border-left: red solid 3px;
-}
-#current-timeslot .feature-magazin,
-#next-timeslot .feature-magazin,
-#after-next-timeslot .feature-magazin,
-#recommendations-box .feature-magazin {
- border-left: red solid 3px;
-}
-#current-timeslot .horspiel-literatur,
-#next-timeslot .horspiel-literatur,
-#after-next-timeslot .horspiel-literatur,
-#recommendations-box .horspiel-literatur {
- border-left: red solid 3px;
-}
-#current-timeslot .musiksendung,
-#next-timeslot .musiksendung,
-#after-next-timeslot .musiksendung,
-#recommendations-box .musiksendung {
- border-left: red solid 3px;
-}
-#current-timeslot .talk,
-#next-timeslot .talk,
-#after-next-timeslot .talk,
-#recommendations-box .talk {
- border-left: red solid 3px;
-}
-#current-timeslot .unmoderiertes-musikprogramm,
-#next-timeslot .unmoderiertes-musikprogramm,
-#after-next-timeslot .unmoderiertes-musikprogramm,
-#recommendations-box .unmoderiertes-musikprogramm {
- border-left: red solid 3px;
-}
-#current-timeslot .vortrag-diskussion,
-#next-timeslot .vortrag-diskussion,
-#after-next-timeslot .vortrag-diskussion,
-#recommendations-box .vortrag-diskussion {
- border-left: red solid 3px;
-}
-
-#recommendations-box .recommendation {
- clear: both;
-}
-
-/* FIXME: fill the actual colors */
-#day-schedule .experimentell {
- background-color: red;
-}
-#day-schedule .feature-magazin {
- background-color: red;
-}
-#day-schedule .horspiel-literatur {
- background-color: red;
-}
-#day-schedule .musiksendung {
- background-color: red;
-}
-#day-schedule .talk {
- background-color: red;
-}
-#day-schedule .unmoderiertes-musikprogramm {
- background-color: red;
-}
-#day-schedule .vortrag-diskussion {
- background-color: red;
-}
-
-#day-schedule .timeslot {
- clear: both;
-}
-
-.timeslot .start,
-.timeslot .show-abbrevs,
-.timeslot .show {
- display: inline;
- float: left;
-}
-
-.timeslot .show-abbrevs { width: 50px; }
-
-#shows .show { clear: both; }
-
-.show .abbrevs {
- width: 50px;
- display: inline;
- float: left;
-}
-.show .details {
- display: inline;
- float: left;
-}
-
-.details .name,
-.details .programslots,
-.details .short-description {
- display: inline;
- float: left;
-}
-
-#week-schedule { width: 960px; }
-#week-schedule .weekday { font-size: small; height: 2em; }
-
-#monday,
-#tuesday,
-#wednesday,
-#thursday,
-#friday,
-#saturday,
-#sunday {
- display: inline;
- float: left;
- font-size: small;
- width: 123px;
-}
diff --git a/templates/program/boxes/current.html b/templates/program/boxes/current.html
index a2341d3..620cb7f 100644
--- a/templates/program/boxes/current.html
+++ b/templates/program/boxes/current.html
@@ -3,7 +3,6 @@
<head>
<meta charset="utf-8"/>
<title>Current program box</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/boxes/recommendations.html b/templates/program/boxes/recommendations.html
index abcbe03..21afb90 100644
--- a/templates/program/boxes/recommendations.html
+++ b/templates/program/boxes/recommendations.html
@@ -3,7 +3,6 @@
<head>
<meta charset="utf-8"/>
<title>Recomendations box</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
{% if recommendation_list %}
diff --git a/templates/program/day_schedule.html b/templates/program/day_schedule.html
index d7f4b87..275930d 100644
--- a/templates/program/day_schedule.html
+++ b/templates/program/day_schedule.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Day schedule: {{ day|date:"l, d.m.Y" }}</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/host_detail.html b/templates/program/host_detail.html
index d28f582..b611c8d 100644
--- a/templates/program/host_detail.html
+++ b/templates/program/host_detail.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Host detail: {{ host.name }}</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/host_list.html b/templates/program/host_list.html
index 9b83b29..d05ae11 100644
--- a/templates/program/host_list.html
+++ b/templates/program/host_list.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Host list</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/recommendations.html b/templates/program/recommendations.html
index 85ec16e..0cce965 100644
--- a/templates/program/recommendations.html
+++ b/templates/program/recommendations.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Recomendations</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/show_list.html b/templates/program/show_list.html
index 67da0de..f7bf327 100644
--- a/templates/program/show_list.html
+++ b/templates/program/show_list.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Show list</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/timeslot_detail.html b/templates/program/timeslot_detail.html
index 55819c8..1a5082f 100644
--- a/templates/program/timeslot_detail.html
+++ b/templates/program/timeslot_detail.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Timeslot detail: {{ timeslot }}</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/templates/program/week_schedule.html b/templates/program/week_schedule.html
index 402e027..df7b177 100644
--- a/templates/program/week_schedule.html
+++ b/templates/program/week_schedule.html
@@ -1,7 +1,6 @@
<html>
<head>
<title>Week schedule</title>
- <link href="/site_media/styles/base.css" media="screen" rel="stylesheet" type="text/css" />
</head>
<body>
diff --git a/urls.py b/urls.py
index 27fbf2e..5b99676 100644
--- a/urls.py
+++ b/urls.py
@@ -1,19 +1,9 @@
-from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import include, patterns
from django.contrib import admin
-import os.path
-
admin.autodiscover()
urlpatterns = patterns('',
(r'^admin/', include(admin.site.urls)),
(r'^program/', include('program.urls')),
)
-if settings.DEBUG:
- urlpatterns += patterns('',
- (r'^site_media/(?P<path>.*)$',
- 'django.views.static.serve',
- {'document_root': os.path.join(settings.PROJECT_DIR, 'site_media')}
- ),
- )