From 57336e9b907ac9efa02f427a8da949f46976afdd Mon Sep 17 00:00:00 2001 From: Mike Crute Date: Fri, 9 Jul 2010 22:45:24 -0400 Subject: Moving media to templates directory --- snakeplan/settings.py | 9 ++- snakeplan/templates/media/css/screen.css | 94 ++++++++++++++++++++++++ snakeplan/templates/media/images/add.png | Bin 0 -> 733 bytes snakeplan/templates/media/images/arrow_left.png | Bin 0 -> 345 bytes snakeplan/templates/media/images/connect.png | Bin 0 -> 748 bytes snakeplan/templates/media/images/delete.png | Bin 0 -> 715 bytes snakeplan/templates/media/images/disconnect.png | Bin 0 -> 796 bytes snakeplan/templates/media/images/error.png | Bin 0 -> 701 bytes snakeplan/templates/media/images/info.png | Bin 0 -> 778 bytes snakeplan/templates/media/images/pencil.png | Bin 0 -> 450 bytes snakeplan/templates/media/images/warning.png | Bin 0 -> 666 bytes 11 files changed, 100 insertions(+), 3 deletions(-) create mode 100644 snakeplan/templates/media/css/screen.css create mode 100755 snakeplan/templates/media/images/add.png create mode 100755 snakeplan/templates/media/images/arrow_left.png create mode 100755 snakeplan/templates/media/images/connect.png create mode 100755 snakeplan/templates/media/images/delete.png create mode 100755 snakeplan/templates/media/images/disconnect.png create mode 100755 snakeplan/templates/media/images/error.png create mode 100755 snakeplan/templates/media/images/info.png create mode 100755 snakeplan/templates/media/images/pencil.png create mode 100755 snakeplan/templates/media/images/warning.png diff --git a/snakeplan/settings.py b/snakeplan/settings.py index 69b177c..c735997 100644 --- a/snakeplan/settings.py +++ b/snakeplan/settings.py @@ -44,13 +44,13 @@ USE_I18N = False # Absolute path to the directory that holds media. # Example: "/home/media/media.lawrence.com/" -MEDIA_ROOT = '' +MEDIA_ROOT = os.path.join(PROJECT_DIR, 'templates/media') # URL that handles the media served from MEDIA_ROOT. Make sure to use a # trailing slash if there is a path component (optional in other cases). # Examples: "http://media.lawrence.com", "http://example.com/media/" -MEDIA_URL = '' -ADMIN_MEDIA_PREFIX = '/media/' +MEDIA_URL = '/media' +ADMIN_MEDIA_PREFIX = MEDIA_URL + 'admin/' SECRET_KEY = 'ow28jyl#0h8+^3$-!*%o-qfj5#zyr@xz+%vn_a3iizhn%l-3_=' @@ -78,4 +78,7 @@ INSTALLED_APPS = ( 'django.contrib.sites', 'django.contrib.admin', 'snakeplan.projects', + 'snakeplan.accounts', ) + +AUTH_PROFILE_MODULE = 'snakeplan.accounts.UserProfile' diff --git a/snakeplan/templates/media/css/screen.css b/snakeplan/templates/media/css/screen.css new file mode 100644 index 0000000..c133323 --- /dev/null +++ b/snakeplan/templates/media/css/screen.css @@ -0,0 +1,94 @@ +/********************************************************************* + * Base * + *********************************************************************/ +body { + font: 12px Verdana, Arial, sans-serif; + margin: 0; +} + +h1, h2, h3, h4, h5 { + font-family: Georgia, Times, 'Times New Roman', serif; + font-weight: normal; + text-align: center; +} + +a { + color: #00F; +} + +table { + margin: auto; + border: 1px solid #CCC; + border-collapse: collapse; +} + +td, th { + padding: 5px; + border: 1px solid #AAA; +} + +th { + background: #AAA; + text-align: center; + border-bottom: 1px solid black; +} + +.row-actions { + text-align: center; +} + +.action-bar { + width: 75%; + margin: 10px auto; + padding: 0px; + list-style: none; + height: 20px; +} + +.action-bar li { + display: block; + float: right; + padding: 0 10px; +} + +a.action { + text-decoration: none; + color: #000; +} + +a.action img { + vertical-align: middle; +} + +div.warning { + border-color: #FC3; + background: #FF9 url('../images/warning.png'); +} + +div.error { + background: #FCC url('../images/error.png'); + border-color: #903; +} + +div.info { + background: #CCF url('../images/info.png'); + border-color: #00C; +} + +div.user-notice { + border-width: 1px; + border-style: solid; + padding: 20px 20px 20px 50px; + width: 50%; + margin: auto; + background-repeat: no-repeat; + background-position: 20px; +} + + +/********************************************************************* + * Projects * + *********************************************************************/ +.project.inactive, .project.inactive a { + color: #999; +} diff --git a/snakeplan/templates/media/images/add.png b/snakeplan/templates/media/images/add.png new file mode 100755 index 0000000..6332fef Binary files /dev/null and b/snakeplan/templates/media/images/add.png differ diff --git a/snakeplan/templates/media/images/arrow_left.png b/snakeplan/templates/media/images/arrow_left.png new file mode 100755 index 0000000..5dc6967 Binary files /dev/null and b/snakeplan/templates/media/images/arrow_left.png differ diff --git a/snakeplan/templates/media/images/connect.png b/snakeplan/templates/media/images/connect.png new file mode 100755 index 0000000..024138e Binary files /dev/null and b/snakeplan/templates/media/images/connect.png differ diff --git a/snakeplan/templates/media/images/delete.png b/snakeplan/templates/media/images/delete.png new file mode 100755 index 0000000..08f2493 Binary files /dev/null and b/snakeplan/templates/media/images/delete.png differ diff --git a/snakeplan/templates/media/images/disconnect.png b/snakeplan/templates/media/images/disconnect.png new file mode 100755 index 0000000..b335cb1 Binary files /dev/null and b/snakeplan/templates/media/images/disconnect.png differ diff --git a/snakeplan/templates/media/images/error.png b/snakeplan/templates/media/images/error.png new file mode 100755 index 0000000..c37bd06 Binary files /dev/null and b/snakeplan/templates/media/images/error.png differ diff --git a/snakeplan/templates/media/images/info.png b/snakeplan/templates/media/images/info.png new file mode 100755 index 0000000..12cd1ae Binary files /dev/null and b/snakeplan/templates/media/images/info.png differ diff --git a/snakeplan/templates/media/images/pencil.png b/snakeplan/templates/media/images/pencil.png new file mode 100755 index 0000000..0bfecd5 Binary files /dev/null and b/snakeplan/templates/media/images/pencil.png differ diff --git a/snakeplan/templates/media/images/warning.png b/snakeplan/templates/media/images/warning.png new file mode 100755 index 0000000..628cf2d Binary files /dev/null and b/snakeplan/templates/media/images/warning.png differ -- cgit v1.2.3