Permalink
Browse files

Upgrading to current Playdoh layout and Playdoh lib.

  • Loading branch information...
1 parent 7d2aacf commit 61ab6421c45952321d957099002f5a07d101acc9 @brandonsavage brandonsavage committed Dec 20, 2012
Showing with 308 additions and 384 deletions.
  1. 0 {apps → dragnet}/.gitignore
  2. 0 {apps → dragnet}/__init__.py
  3. 0 { → dragnet/commons}/__init__.py
  4. 0 {apps → dragnet}/commons/context_processors.py
  5. 0 {apps → dragnet}/commons/helpers.py
  6. 0 {apps → dragnet}/commons/middleware.py
  7. 0 {apps → dragnet}/commons/models.py
  8. 0 {apps/commons → dragnet/commons/tests}/__init__.py
  9. 0 {apps → dragnet}/commons/tests/test_accepted_locales.py
  10. 0 {apps → dragnet}/commons/tests/test_migrations.py
  11. 0 {apps → dragnet}/commons/urlresolvers.py
  12. 0 {apps/commons/tests → dragnet/dll}/__init__.py
  13. +1 −1 {apps → dragnet}/dll/forms.py
  14. 0 {apps → dragnet}/dll/helpers.py
  15. 0 {apps → dragnet}/dll/models.py
  16. +154 −0 dragnet/dll/static/dll/main.css
  17. +3 −1 {apps → dragnet}/dll/templates/dll/create.html
  18. +3 −1 {apps → dragnet}/dll/templates/dll/edit.html
  19. 0 {apps → dragnet}/dll/templates/dll/index.html
  20. 0 {apps → dragnet}/dll/templates/dll/pagination.html
  21. 0 {apps → dragnet}/dll/templates/dll/search.html
  22. +3 −1 {apps → dragnet}/dll/templates/dll/view.html
  23. 0 {apps → dragnet}/dll/urls.py
  24. +2 −2 {apps → dragnet}/dll/views.py
  25. 0 { → dragnet}/settings/__init__.py
  26. +12 −23 { → dragnet}/settings/base.py
  27. +1 −1 { → dragnet}/settings/local.py-dist
  28. +6 −2 { → dragnet}/urls.py
  29. 0 {apps → dragnet}/users/__init__.py
  30. 0 {apps/dll → dragnet/users/auth}/__init__.py
  31. 0 {apps → dragnet}/users/auth/backends.py
  32. 0 {apps → dragnet}/users/email_auth_backend.py
  33. 0 {apps → dragnet}/users/forms.py
  34. 0 {apps → dragnet}/users/models.py
  35. 0 {apps → dragnet}/users/monkeypatch_template_engine.py
  36. 0 {apps → dragnet}/users/templates/users/login.html
  37. 0 {apps → dragnet}/users/templates/users/settings.html
  38. 0 {apps → dragnet}/users/tests.py
  39. 0 {apps → dragnet}/users/urls.py
  40. 0 {apps → dragnet}/users/views.py
  41. +13 −13 manage.py
  42. +0 −18 media/js/libs/jquery-1.6.2.js
  43. +2 −0 requirements/compiled.txt
  44. +0 −315 settings/base.py-back
  45. +18 −0 setup.py
  46. 0 {media/css → static}/.gitignore
  47. +15 −0 static/browserid/browserid.js
  48. 0 {media/img → static/css}/.gitignore
  49. +1 −1 {media → static}/css/dll/main.css
  50. 0 {media → static}/css/examples/main.css
  51. +52 −0 static/examples/main.css
  52. 0 {media/js → static/img}/.gitignore
  53. BIN {media → static}/img/dll/search.png
  54. 0 apps/users/auth/__init__.py → static/js/.gitignore
  55. +2 −2 {media → static}/js/dll/detail.js
  56. 0 {media → static}/js/dll/nav.js
  57. +4 −0 static/js/libs/jquery-1.9.0.js
  58. +4 −0 static/libs/jquery-1.9.0.js
  59. +11 −2 templates/base.html
  60. +1 −1 vendor
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -1,5 +1,5 @@
from django import forms
-from dll.models import File, Comment
+from dragnet.dll.models import File, Comment
class FileForm(forms.ModelForm):
File renamed without changes.
File renamed without changes.
@@ -0,0 +1,154 @@
+body {
+ font-family: Arial,Helvetica,sans-serif;
+ font-size: 12px;
+ background-color: #d8ffc1;
+ margin: 0px;
+ padding: 0px;
+}
+
+.page-header {
+ background-color: #377810;
+ background: -moz-linear-gradient(center top , #73A058 0%, #377810 100%);
+ background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #73A058), color-stop(1, #377810)); /* webkit */
+ box-shadow: 0 0 3px #666666;
+ -moz-box-shadow: 0 0 3px #666666;
+ -webkit-box-shadow: 0 0 3px #666666;
+ height: 75px;
+ position: relative;
+}
+
+.page-header p {
+ font-size: 30px;
+ color: white;
+ margin: 0px;
+ padding: 15px;
+}
+
+.page-header a {
+ color: White;
+ text-decoration: none;
+}
+
+.page-header input {
+ top: 20px;
+ right: 20px;
+ position: absolute;
+ border-radius: 0.5em;
+ -webkit-border-radius: 0.5em;
+ -moz-border-radius: 0.5em;
+ border: 1px solid #A0A0A0;
+ width: 240px;
+ background: url("/static/img/dll/search.png") no-repeat scroll 5px center #FFFFFF;
+ font-size: 12px;
+ padding: 3px 4px 4px 28px
+}
+
+.body {
+ margin: 1em 2em;
+ position: relative;
+ text-align: left;
+}
+
+.right {
+ text-align: right;
+}
+
+.panel {
+ background: #FFFFFF;
+ border-radius: 9px;
+ -webkit-border-radius: 9px;
+ -moz-border-radius: 9px;
+ box-shadow: 0 0 3px #CCCCCC;
+ -moz-box-shadow: 0 0 3px #CCCCCC;
+ -webkit-box-shadow: 0 0 3px #CCCCCC;
+ border: 1px solid #D7D7D7;
+ padding: 10px;
+}
+
+.panel table {
+ border-collapse: collapse;
+ width: 100%;
+ font-size: 10pt;
+}
+
+.panel th, span.comment-meta {
+ text-align: left;
+ background-color: #85c162;
+}
+
+span.comment-meta {
+ font-weight: bold;
+
+}
+
+span.comment-meta, span.comment-data {
+ display: block;
+ padding: 3px;
+}
+
+.single-comment {
+ font-size: 11pt;
+ width: 600px;
+ border: 1px solid #D7D7D7;
+ margin: 10px;
+}
+
+.panel td, th {
+ border: 1px solid Black;
+ padding: 3px;
+}
+
+.panel tr:hover {
+ background-color: #d0f5ba;
+}
+
+a {
+ color: #3B7B15;
+}
+
+.pagination {
+ font-size: 11pt;
+ text-align: right;
+ padding: 3px 0px 5px;
+}
+
+ul.tab-list {
+ list-style: none;
+ padding: 0;
+ margin: 5px 0px 0px 8px;
+}
+
+ul.tab-list li {
+ display: inline;
+ border: solid #85C162;
+ border-width: 1px 1px 0 1px;
+ margin: 0 0.3em 0 0;
+ padding: 3px 3px 0px 3px;
+ font-size: 11pt;
+}
+
+ul.tab-list li.active {
+ background-color: #85C162;
+ padding-top: 7px;
+ border-radius: 5px 5px 0px 0px;
+ -webkit-border-radius: 5px 5px 0px 0px;
+ -moz-border-radius: 5px 5px 0px 0px;
+}
+
+ul.tab-list a {
+ color: black;
+ text-decoration: none;
+}
+
+.information {
+ border: 1px solid #85C162;
+ padding: 5px;
+}
+
+.out-of-focus {
+ display: none;
+}
+
+table.history td {
+ width: 25%;
+}
@@ -2,7 +2,9 @@
{% block extrahead %}
-{{ js('detail_js') }}
+{% compress js %}
+ <script src="{{ static('js/dll/detail.js') }}"></script>
+{% endcompress %}
{% endblock %}
@@ -2,7 +2,9 @@
{% block extrahead %}
-{{ js('detail_js') }}
+{% compress js %}
+ <script src="{{ static('js/dll/detail.js') }}"></script>
+{% endcompress %}
{% endblock %}
@@ -2,7 +2,9 @@
{% block extrahead %}
-{{ js('detail_js') }}
+{% compress js %}
+ <script src="{{ static('js/dll/detail.js') }}"></script>
+{% endcompress %}
{% endblock %}
File renamed without changes.
@@ -9,8 +9,8 @@
import bleach
import jingo
-from dll.forms import FileForm, CommentForm, SearchForm
-from dll.models import File, Comment, FileHistory
+from dragnet.dll.forms import FileForm, CommentForm, SearchForm
+from dragnet.dll.models import File, Comment, FileHistory
from django.core.paginator import Paginator, EmptyPage, InvalidPage
from django.db.models import Q
File renamed without changes.
@@ -2,27 +2,14 @@
from funfactory.settings_base import *
-MINIFY_BUNDLES = {
- 'css': {
- 'common_css': (
- 'css/dll/main.css',
- ),
- },
- 'js': {
- 'common_js': (
- 'js/libs/jquery-1.6.2.js',
- 'js/dll/nav.js',
- ),
- 'detail_js': (
- 'js/dll/detail.js',
- ),
- }
-}
+from django_sha2 import get_password_hashers
+PASSWORD_HASHERS = get_password_hashers(BASE_PASSWORD_HASHERS, HMAC_KEYS)
-INSTALLED_APPS += (
- 'dll',
- 'users',
-)
+INSTALLED_APPS = get_apps(append=(
+ 'dragnet.users',
+ 'dragnet.dll',
+
+))
# Because Jinja2 is the default template loader, add any non-Jinja templated
# apps here:
@@ -59,8 +46,8 @@
import ldap
AUTHENTICATION_BACKENDS = (
- 'users.email_auth_backend.EmailOrUsernameModelBackend',
- 'users.auth.backends.MozillaLDAPBackend',
+ 'dragnet.users.email_auth_backend.EmailOrUsernameModelBackend',
+ 'dragnet.users.auth.backends.MozillaLDAPBackend',
'django.contrib.auth.backends.ModelBackend',
)
@@ -84,6 +71,8 @@
except ImportError:
AUTHENTICATION_BACKENDS = (
- 'users.email_auth_backend.EmailOrUsernameModelBackend',
+ 'dragnet.users.email_auth_backend.EmailOrUsernameModelBackend',
'django.contrib.auth.backends.ModelBackend',
)
+
+ROOT_URLCONF = 'dragnet.urls'
@@ -1,7 +1,7 @@
# This is an example settings_local.py file.
# Copy it and add your local settings here.
-from settings import *
+from . import base
DATABASES = {
@@ -12,8 +12,8 @@
urlpatterns = patterns('',
# Example:
- (r'', include('dll.urls')),
- (r'^users/', include('users.urls')),
+ (r'', include('dragnet.dll.urls')),
+ (r'^users/', include('dragnet.users.urls')),
# Uncomment the admin/doc line below to enable admin documentation:
# (r'^admin/doc/', include('django.contrib.admindocs.urls')),
@@ -30,3 +30,7 @@
(r'^%s/(?P<path>.*)$' % media_url, 'django.views.static.serve',
{'document_root': settings.MEDIA_ROOT}),
)
+
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+if settings.DEBUG:
+ urlpatterns += staticfiles_urlpatterns()
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
View
@@ -2,23 +2,23 @@
import os
import sys
-try:
- # For local development in a virtualenv:
- from funfactory import manage
-except ImportError:
- # Production:
- # Add a temporary path so that we can import the funfactory
- tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
- 'vendor', 'src', 'funfactory')
- sys.path.append(tmp_path)
+# Edit this if necessary or override the variable in your environment.
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'dragnet.settings')
- from funfactory import manage
+# Add a temporary path so that we can import the funfactory
+tmp_path = os.path.join(os.path.dirname(os.path.abspath(__file__)),
+ 'vendor', 'src', 'funfactory')
+# Comment out to load funfactory from your site packages instead
+sys.path.insert(0, tmp_path)
- # Let the path magic happen in setup_environ() !
- sys.path.remove(tmp_path)
+from funfactory import manage
+# Let the path magic happen in setup_environ() !
+sys.path.remove(tmp_path)
-manage.setup_environ(__file__)
+
+manage.setup_environ(__file__, more_pythonic=True)
if __name__ == "__main__":
manage.main()
+

Large diffs are not rendered by default.

Oops, something went wrong.
@@ -6,3 +6,5 @@ python-ldap==2.3.13
hmac==20101005
hashlib==20081119
py-bcrypt==0.2
+
+-r ../vendor/src/funfactory/funfactory/requirements/compiled.txt
Oops, something went wrong.

0 comments on commit 61ab642

Please sign in to comment.