Browse files

A bit of cleanup. Remove some extranous code that, although you will …

…probably put it back, is needless in a project template. Move the staticfiles around to correspond with proper django staticfiles setup.
  • Loading branch information...
1 parent 511ed75 commit afc8013625986624c74c17f42eef4e2d08e087b3 @xenith committed Mar 9, 2012
Showing with 20 additions and 23 deletions.
  1. 0 { → project_name/base}/static/404.html
  2. 0 { → project_name/base}/static/500.html
  3. 0 { → project_name/base}/static/apple-touch-icon-114x114-precomposed.png
  4. 0 { → project_name/base}/static/apple-touch-icon-57x57-precomposed.png
  5. 0 { → project_name/base}/static/apple-touch-icon-72x72-precomposed.png
  6. 0 { → project_name/base}/static/apple-touch-icon-precomposed.png
  7. 0 { → project_name/base}/static/apple-touch-icon.png
  8. 0 { → project_name/base}/static/crossdomain.xml
  9. 0 { → project_name/base}/static/css/app.css
  10. 0 { → project_name/base}/static/css/bootstrap-responsive.css
  11. 0 { → project_name/base}/static/css/bootstrap-responsive.min.css
  12. 0 { → project_name/base}/static/css/bootstrap.css
  13. 0 { → project_name/base}/static/css/bootstrap.min.css
  14. 0 { → project_name/base}/static/css/h5bp.css
  15. 0 { → project_name/base}/static/css/less/accordion.less
  16. 0 { → project_name/base}/static/css/less/alerts.less
  17. 0 { → project_name/base}/static/css/less/bootstrap.less
  18. 0 { → project_name/base}/static/css/less/breadcrumbs.less
  19. 0 { → project_name/base}/static/css/less/button-groups.less
  20. 0 { → project_name/base}/static/css/less/buttons.less
  21. 0 { → project_name/base}/static/css/less/carousel.less
  22. 0 { → project_name/base}/static/css/less/close.less
  23. 0 { → project_name/base}/static/css/less/code.less
  24. 0 { → project_name/base}/static/css/less/component-animations.less
  25. 0 { → project_name/base}/static/css/less/dropdowns.less
  26. 0 { → project_name/base}/static/css/less/forms.less
  27. 0 { → project_name/base}/static/css/less/grid.less
  28. 0 { → project_name/base}/static/css/less/hero-unit.less
  29. 0 { → project_name/base}/static/css/less/labels.less
  30. 0 { → project_name/base}/static/css/less/layouts.less
  31. 0 { → project_name/base}/static/css/less/mixins.less
  32. 0 { → project_name/base}/static/css/less/modals.less
  33. 0 { → project_name/base}/static/css/less/navbar.less
  34. 0 { → project_name/base}/static/css/less/navs.less
  35. 0 { → project_name/base}/static/css/less/pager.less
  36. 0 { → project_name/base}/static/css/less/pagination.less
  37. 0 { → project_name/base}/static/css/less/patterns.less
  38. 0 { → project_name/base}/static/css/less/popovers.less
  39. 0 { → project_name/base}/static/css/less/print.less
  40. 0 { → project_name/base}/static/css/less/progress-bars.less
  41. 0 { → project_name/base}/static/css/less/reset.less
  42. 0 { → project_name/base}/static/css/less/responsive.less
  43. 0 { → project_name/base}/static/css/less/scaffolding.less
  44. 0 { → project_name/base}/static/css/less/sprites.less
  45. 0 { → project_name/base}/static/css/less/style.less
  46. 0 { → project_name/base}/static/css/less/tables.less
  47. 0 { → project_name/base}/static/css/less/thumbnails.less
  48. 0 { → project_name/base}/static/css/less/tooltip.less
  49. 0 { → project_name/base}/static/css/less/type.less
  50. 0 { → project_name/base}/static/css/less/utilities.less
  51. 0 { → project_name/base}/static/css/less/variables.less
  52. 0 { → project_name/base}/static/css/less/wells.less
  53. 0 { → project_name/base}/static/css/style.css
  54. 0 { → project_name/base}/static/favicon.ico
  55. 0 { → project_name/base}/static/humans.txt
  56. 0 { → project_name/base}/static/img/glyphicons-halflings-white.png
  57. 0 { → project_name/base}/static/img/glyphicons-halflings.png
  58. 0 { → project_name/base}/static/js/libs/bootstrap.js
  59. 0 { → project_name/base}/static/js/libs/bootstrap.min.js
  60. 0 { → project_name/base}/static/js/libs/bootstrap/alert.js
  61. 0 { → project_name/base}/static/js/libs/bootstrap/bootstrap.js
  62. 0 { → project_name/base}/static/js/libs/bootstrap/bootstrap.min.js
  63. 0 { → project_name/base}/static/js/libs/bootstrap/button.js
  64. 0 { → project_name/base}/static/js/libs/bootstrap/carousel.js
  65. 0 { → project_name/base}/static/js/libs/bootstrap/collapse.js
  66. 0 { → project_name/base}/static/js/libs/bootstrap/dropdown.js
  67. 0 { → project_name/base}/static/js/libs/bootstrap/modal.js
  68. 0 { → project_name/base}/static/js/libs/bootstrap/popover.js
  69. 0 { → project_name/base}/static/js/libs/bootstrap/scrollspy.js
  70. 0 { → project_name/base}/static/js/libs/bootstrap/tab.js
  71. 0 { → project_name/base}/static/js/libs/bootstrap/tooltip.js
  72. 0 { → project_name/base}/static/js/libs/bootstrap/transition.js
  73. 0 { → project_name/base}/static/js/libs/bootstrap/typeahead.js
  74. 0 { → project_name/base}/static/js/libs/jquery-1.7.1.js
  75. 0 { → project_name/base}/static/js/libs/jquery-1.7.1.min.js
  76. 0 { → project_name/base}/static/js/libs/less-1.2.1.min.js
  77. 0 { → project_name/base}/static/js/libs/modernizr-2.5.3-respond-1.1.0.min.js
  78. 0 { → project_name/base}/static/js/libs/modernizr-2.5.3.min.js
  79. 0 { → project_name/base}/static/js/plugins.js
  80. 0 { → project_name/base}/static/js/script.js
  81. 0 { → project_name/base}/static/robots.txt
  82. +1 −1 project_name/base/urls.py
  83. +1 −3 project_name/base/views.py
  84. +1 −2 project_name/settings/base.py
  85. +2 −2 project_name/urls.py
  86. +15 −15 project_name/wsgi.py
  87. 0 static/.keep
View
0 static/404.html → project_name/base/static/404.html
File renamed without changes.
View
0 static/500.html → project_name/base/static/500.html
File renamed without changes.
View
0 .../apple-touch-icon-114x114-precomposed.png → .../apple-touch-icon-114x114-precomposed.png
File renamed without changes
View
0 ...ic/apple-touch-icon-57x57-precomposed.png → ...ic/apple-touch-icon-57x57-precomposed.png
File renamed without changes
View
0 ...ic/apple-touch-icon-72x72-precomposed.png → ...ic/apple-touch-icon-72x72-precomposed.png
File renamed without changes
View
0 static/apple-touch-icon-precomposed.png → ...e/static/apple-touch-icon-precomposed.png
File renamed without changes
View
0 static/apple-touch-icon.png → ...ect_name/base/static/apple-touch-icon.png
File renamed without changes
View
0 static/crossdomain.xml → project_name/base/static/crossdomain.xml
File renamed without changes.
View
0 static/css/app.css → project_name/base/static/css/app.css
File renamed without changes.
View
0 static/css/bootstrap-responsive.css → .../base/static/css/bootstrap-responsive.css
File renamed without changes.
View
0 static/css/bootstrap-responsive.min.css → ...e/static/css/bootstrap-responsive.min.css
File renamed without changes.
View
0 static/css/bootstrap.css → project_name/base/static/css/bootstrap.css
File renamed without changes.
View
0 static/css/bootstrap.min.css → ...ct_name/base/static/css/bootstrap.min.css
File renamed without changes.
View
0 static/css/h5bp.css → project_name/base/static/css/h5bp.css
File renamed without changes.
View
0 static/css/less/accordion.less → ..._name/base/static/css/less/accordion.less
File renamed without changes.
View
0 static/css/less/alerts.less → ...ect_name/base/static/css/less/alerts.less
File renamed without changes.
View
0 static/css/less/bootstrap.less → ..._name/base/static/css/less/bootstrap.less
File renamed without changes.
View
0 static/css/less/breadcrumbs.less → ...ame/base/static/css/less/breadcrumbs.less
File renamed without changes.
View
0 static/css/less/button-groups.less → ...e/base/static/css/less/button-groups.less
File renamed without changes.
View
0 static/css/less/buttons.less → ...ct_name/base/static/css/less/buttons.less
File renamed without changes.
View
0 static/css/less/carousel.less → ...t_name/base/static/css/less/carousel.less
File renamed without changes.
View
0 static/css/less/close.less → project_name/base/static/css/less/close.less
File renamed without changes.
View
0 static/css/less/code.less → project_name/base/static/css/less/code.less
File renamed without changes.
View
0 static/css/less/component-animations.less → ...static/css/less/component-animations.less
File renamed without changes.
View
0 static/css/less/dropdowns.less → ..._name/base/static/css/less/dropdowns.less
File renamed without changes.
View
0 static/css/less/forms.less → project_name/base/static/css/less/forms.less
File renamed without changes.
View
0 static/css/less/grid.less → project_name/base/static/css/less/grid.less
File renamed without changes.
View
0 static/css/less/hero-unit.less → ..._name/base/static/css/less/hero-unit.less
File renamed without changes.
View
0 static/css/less/labels.less → ...ect_name/base/static/css/less/labels.less
File renamed without changes.
View
0 static/css/less/layouts.less → ...ct_name/base/static/css/less/layouts.less
File renamed without changes.
View
0 static/css/less/mixins.less → ...ect_name/base/static/css/less/mixins.less
File renamed without changes.
View
0 static/css/less/modals.less → ...ect_name/base/static/css/less/modals.less
File renamed without changes.
View
0 static/css/less/navbar.less → ...ect_name/base/static/css/less/navbar.less
File renamed without changes.
View
0 static/css/less/navs.less → project_name/base/static/css/less/navs.less
File renamed without changes.
View
0 static/css/less/pager.less → project_name/base/static/css/less/pager.less
File renamed without changes.
View
0 static/css/less/pagination.less → ...name/base/static/css/less/pagination.less
File renamed without changes.
View
0 static/css/less/patterns.less → ...t_name/base/static/css/less/patterns.less
File renamed without changes.
View
0 static/css/less/popovers.less → ...t_name/base/static/css/less/popovers.less
File renamed without changes.
View
0 static/css/less/print.less → project_name/base/static/css/less/print.less
File renamed without changes.
View
0 static/css/less/progress-bars.less → ...e/base/static/css/less/progress-bars.less
File renamed without changes.
View
0 static/css/less/reset.less → project_name/base/static/css/less/reset.less
File renamed without changes.
View
0 static/css/less/responsive.less → ...name/base/static/css/less/responsive.less
File renamed without changes.
View
0 static/css/less/scaffolding.less → ...ame/base/static/css/less/scaffolding.less
File renamed without changes.
View
0 static/css/less/sprites.less → ...ct_name/base/static/css/less/sprites.less
File renamed without changes.
View
0 static/css/less/style.less → project_name/base/static/css/less/style.less
File renamed without changes.
View
0 static/css/less/tables.less → ...ect_name/base/static/css/less/tables.less
File renamed without changes.
View
0 static/css/less/thumbnails.less → ...name/base/static/css/less/thumbnails.less
File renamed without changes.
View
0 static/css/less/tooltip.less → ...ct_name/base/static/css/less/tooltip.less
File renamed without changes.
View
0 static/css/less/type.less → project_name/base/static/css/less/type.less
File renamed without changes.
View
0 static/css/less/utilities.less → ..._name/base/static/css/less/utilities.less
File renamed without changes.
View
0 static/css/less/variables.less → ..._name/base/static/css/less/variables.less
File renamed without changes.
View
0 static/css/less/wells.less → project_name/base/static/css/less/wells.less
File renamed without changes.
View
0 static/css/style.css → project_name/base/static/css/style.css
File renamed without changes.
View
0 static/favicon.ico → project_name/base/static/favicon.ico
File renamed without changes.
View
0 static/humans.txt → project_name/base/static/humans.txt
File renamed without changes.
View
0 static/img/glyphicons-halflings-white.png → ...static/img/glyphicons-halflings-white.png
File renamed without changes
View
0 static/img/glyphicons-halflings.png → .../base/static/img/glyphicons-halflings.png
File renamed without changes
View
0 static/js/libs/bootstrap.js → ...ect_name/base/static/js/libs/bootstrap.js
File renamed without changes.
View
0 static/js/libs/bootstrap.min.js → ...name/base/static/js/libs/bootstrap.min.js
File renamed without changes.
View
0 static/js/libs/bootstrap/alert.js → ...me/base/static/js/libs/bootstrap/alert.js
File renamed without changes.
View
0 static/js/libs/bootstrap/bootstrap.js → ...ase/static/js/libs/bootstrap/bootstrap.js
File renamed without changes.
View
0 static/js/libs/bootstrap/bootstrap.min.js → ...static/js/libs/bootstrap/bootstrap.min.js
File renamed without changes.
View
0 static/js/libs/bootstrap/button.js → ...e/base/static/js/libs/bootstrap/button.js
File renamed without changes.
View
0 static/js/libs/bootstrap/carousel.js → ...base/static/js/libs/bootstrap/carousel.js
File renamed without changes.
View
0 static/js/libs/bootstrap/collapse.js → ...base/static/js/libs/bootstrap/collapse.js
File renamed without changes.
View
0 static/js/libs/bootstrap/dropdown.js → ...base/static/js/libs/bootstrap/dropdown.js
File renamed without changes.
View
0 static/js/libs/bootstrap/modal.js → ...me/base/static/js/libs/bootstrap/modal.js
File renamed without changes.
View
0 static/js/libs/bootstrap/popover.js → .../base/static/js/libs/bootstrap/popover.js
File renamed without changes.
View
0 static/js/libs/bootstrap/scrollspy.js → ...ase/static/js/libs/bootstrap/scrollspy.js
File renamed without changes.
View
0 static/js/libs/bootstrap/tab.js → ...name/base/static/js/libs/bootstrap/tab.js
File renamed without changes.
View
0 static/js/libs/bootstrap/tooltip.js → .../base/static/js/libs/bootstrap/tooltip.js
File renamed without changes.
View
0 static/js/libs/bootstrap/transition.js → ...se/static/js/libs/bootstrap/transition.js
File renamed without changes.
View
0 static/js/libs/bootstrap/typeahead.js → ...ase/static/js/libs/bootstrap/typeahead.js
File renamed without changes.
View
0 static/js/libs/jquery-1.7.1.js → ..._name/base/static/js/libs/jquery-1.7.1.js
File renamed without changes.
View
0 static/js/libs/jquery-1.7.1.min.js → ...e/base/static/js/libs/jquery-1.7.1.min.js
File renamed without changes.
View
0 static/js/libs/less-1.2.1.min.js → ...ame/base/static/js/libs/less-1.2.1.min.js
File renamed without changes.
View
0 ...libs/modernizr-2.5.3-respond-1.1.0.min.js → ...libs/modernizr-2.5.3-respond-1.1.0.min.js
File renamed without changes.
View
0 static/js/libs/modernizr-2.5.3.min.js → ...ase/static/js/libs/modernizr-2.5.3.min.js
File renamed without changes.
View
0 static/js/plugins.js → project_name/base/static/js/plugins.js
File renamed without changes.
View
0 static/js/script.js → project_name/base/static/js/script.js
File renamed without changes.
View
0 static/robots.txt → project_name/base/static/robots.txt
File renamed without changes.
View
2 project_name/base/urls.py
@@ -1,4 +1,4 @@
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import url, include, patterns
urlpatterns = patterns('{{ project_name}}.base.views',
View
4 project_name/base/views.py
@@ -1,6 +1,4 @@
-from django.core.urlresolvers import reverse
-from django.shortcuts import get_object_or_404, render_to_response
-from django.http import Http404, HttpResponseRedirect, HttpResponse
+from django.shortcuts import render_to_response
from django.template import RequestContext
View
3 project_name/settings/base.py
@@ -111,7 +111,6 @@
# Put strings here, like "/home/html/static" or "C:/www/django/static".
# Always use forward slashes, even on Windows.
# Don't forget to use absolute paths, not relative paths.
- os.path.join(PROJECT_ROOT, 'static')
)
# If you set this to False, Django will make some optimizations so as not
@@ -148,10 +147,10 @@
'django.core.context_processors.media',
'django.core.context_processors.request',
'django.core.context_processors.i18n',
+ 'django.core.context_processors.static',
'session_csrf.context_processor',
'django.contrib.messages.context_processors.messages',
#'jingo_minify.helpers.build_ids',
- 'django.core.context_processors.static',
]
TEMPLATE_DIRS = (
View
4 project_name/urls.py
@@ -1,5 +1,5 @@
from django.conf import settings
-from django.conf.urls.defaults import *
+from django.conf.urls.defaults import include, url, patterns
from session_csrf import anonymous_csrf
from django.contrib import admin
admin.autodiscover()
@@ -14,7 +14,7 @@ def bad(request):
(r'^admin/doc/', include('django.contrib.admindocs.urls')),
(r'^admin/$', anonymous_csrf(admin.site.admin_view(admin.site.index))),
(r'^admin/', include(admin.site.urls)),
- url(r'^', include('debug_toolbar_user_panel.urls')),
+ #url(r'^', include('debug_toolbar_user_panel.urls')),
(r'^bad/$', bad),
)
View
30 project_name/wsgi.py
@@ -25,29 +25,29 @@
# described at http://code.google.com/p/modwsgi/wiki/VirtualEnvironments
# Remember original sys.path.
-prev_sys_path = list(sys.path)
+#prev_sys_path = list(sys.path)
# Get the path to the env's site-packages directory
-site_packages = subprocess.check_output([
- os.path.join(REPO_PATH, '.virtualenv/bin/python'),
- '-c',
- 'from distutils.sysconfig import get_python_lib;'
- 'print get_python_lib(),'
-]).strip()
+#site_packages = subprocess.check_output([
+# os.path.join(PROJECT_ROOT, '.virtualenv/bin/python'),
+# '-c',
+# 'from distutils.sysconfig import get_python_lib;'
+# 'print get_python_lib(),'
+#]).strip()
# Add the virtualenv site-packages to the site packages
-site.addsitedir(site_packages)
+#site.addsitedir(site_packages)
# Reorder sys.path so the new directories are at the front.
-new_sys_path = []
-for item in list(sys.path):
- if item not in prev_sys_path:
- new_sys_path.append(item)
- sys.path.remove(item)
-sys.path[:0] = new_sys_path
+#new_sys_path = []
+#for item in list(sys.path):
+# if item not in prev_sys_path:
+# new_sys_path.append(item)
+# sys.path.remove(item)
+#sys.path[:0] = new_sys_path
# Add the app code to the path
-sys.path.append(PROJECT_ROOT)
+#sys.path.append(PROJECT_ROOT)
os.environ['CELERY_LOADER'] = 'django'
os.environ.setdefault("DJANGO_SETTINGS_MODULE", "{{ project_name }}.settings")
View
0 static/.keep
No changes.

0 comments on commit afc8013

Please sign in to comment.