Permalink
Browse files

Merge pull request #67 from ktonon/master

Fix for #66
  • Loading branch information...
montylounge committed Sep 24, 2011
2 parents 862e4c0 + 6d97dbd commit c5077c31528725ab0afce01352a4b8bd6a517690
Showing 829 changed files with 578 additions and 251 deletions.
View
@@ -1,10 +1,8 @@
*.pyc
*.bak
*.db
+*.sqlite
local_settings.py
-mingus/media/CACHE
pip-log.txt
-mingus/media/uploads/
-mingus/media/photos/
django_mingus.egg-info
-mingus/media/CACHE/
+*~
View
@@ -0,0 +1 @@
+*
@@ -1,27 +0,0 @@
-/* Pretty printing styles. Used with prettify.js. */
-
-.str { color: #080; }
-.kwd { color: #008; }
-.com { color: #800; }
-.typ { color: #606; }
-.lit { color: #066; }
-.pun { color: #660; }
-.pln { color: #000; }
-.tag { color: #008; }
-.atn { color: #606; }
-.atv { color: #080; }
-.dec { color: #606; }
-pre.prettyprint { padding: 2px; border: 1px solid #888; }
-
-@media print {
- .str { color: #060; }
- .kwd { color: #006; font-weight: bold; }
- .com { color: #600; font-style: italic; }
- .typ { color: #404; font-weight: bold; }
- .lit { color: #044; }
- .pun { color: #440; }
- .pln { color: #000; }
- .tag { color: #006; font-weight: bold; }
- .atn { color: #404; }
- .atv { color: #060; }
-}
View
@@ -1,27 +1,24 @@
-BeautifulSoup>=3.0.8
+BeautifulSoup==3.2.0
PIL
python-dateutil==1.4.1
-django==1.1.1
-django-debug-toolbar==0.8.1
+django==1.3.0
+django-debug-toolbar==0.8.5
django-tagging==0.3
Pygments==1.1.1
FeedParser==4.1
Markdown==2.0.1
textile==2.1.3
django-robots==0.6.1
-
-e git+git://github.com/django-extensions/django-extensions.git#egg=django_extensions
-
-e git+git://github.com/montylounge/django-basic-apps.git#egg=basic
-e git+git://github.com/zerok/django-flatblocks.git#egg=flatblocks
--e git+git://github.com/montylounge/django-disqus.git#egg=disqus
+-e git+git://github.com/ktonon/django-disqus.git#egg=disqus
-e svn+http://django-navbar.googlecode.com/svn/trunk#egg=navbar
-e svn+http://django-db-log.googlecode.com/svn/trunk#egg=djangodblog
-e git+git://github.com/brosner/django-oembed.git#egg=oembded
-e svn+http://django-template-utils.googlecode.com/svn/trunk#egg=template_utils
-e git+git://github.com/montylounge/django-proxy.git#egg=django_proxy
-
-e git+git://github.com/mintchaos/django_compressor.git#egg=compressor
-e git+git://github.com/bartTC/django-markup.git#egg=django_markup
-e git+git://github.com/montylounge/django-google-analytics.git#egg=google_analytics
@@ -30,7 +27,6 @@ django-robots==0.6.1
-e git+git://github.com/sunlightlabs/django-honeypot.git#egg=honeypot
-e git+git://github.com/montylounge/django-sugar.git#egg=sugar
-e git+git://github.com/montylounge/django-quoteme.git#egg=quoteme
-
-e hg+https://python-twitter.googlecode.com/hg/#egg=python-twitter
-e svn+http://django-tinymce.googlecode.com/svn/trunk/#django-tinymce
-e git+git://github.com/pydanny/django-wysiwyg.git#egg=django-wysiwyg
@@ -39,13 +35,6 @@ django-robots==0.6.1
django-dbtemplates==0.6.1
django-memcache-status==1.0.1
-e git+git://github.com/kylef/django-request.git#egg=django-request
-
--e git://github.com/jezdez/django-staticfiles.git#egg=django_staticfiles
-e git://github.com/sorl/sorl-thumbnail.git#egg=sorl_thumbnail
-e git://github.com/montylounge/django-basic-apps.git#egg=django_basic_apps
-
-
-
-
-
-
+-e git://github.com/ktonon/django-portfolio.git#egg=django_portfolio
View
@@ -4,19 +4,21 @@
PROJECT_ROOT = os.path.dirname(__file__)
MEDIA_ROOT = os.path.join(PROJECT_ROOT, 'media')
MEDIA_URL = '/media/'
-ADMIN_MEDIA_PREFIX = '/admin_media/'
+ADMIN_MEDIA_PREFIX = '/static/admin/'
#staticfiles app values
-STATIC_URL = '/media/mingus/'
-STATIC_ROOT = os.path.join(PROJECT_ROOT, 'media')
+STATIC_URL = '/static/'
STATICFILES_DIRS = (
- os.path.join(PROJECT_ROOT, 'media', 'mingus'),
+ os.path.join(PROJECT_ROOT, 'static', 'betweenconcepts'),
+ os.path.join(PROJECT_ROOT, 'static', 'mingus'),
)
+# Login paths
+LOGIN_REDIRECT_URL = '/admin/'
+
SITE_ID = 1
ROOT_URLCONF = 'mingus.urls'
-TIME_ZONE = 'America/New_York'
-SECRET_KEY = '+bq@o(jph^-*sfj4j%xukecxb0jae9lci&ysy=609hj@(l$47c'
+TIME_ZONE = 'America/Chicago'
USE_I18N = False
HONEYPOT_FIELD_NAME = 'fonzie_kungfu'
@@ -36,23 +38,27 @@
'djangodblog.DBLogMiddleware',
'debug_toolbar.middleware.DebugToolbarMiddleware',
'django.contrib.flatpages.middleware.FlatpageFallbackMiddleware',
+ 'django.contrib.messages.middleware.MessageMiddleware',
)
TEMPLATE_CONTEXT_PROCESSORS = (
"django.core.context_processors.auth",
"django.core.context_processors.debug",
"django.core.context_processors.i18n",
"django.core.context_processors.media",
+ "django.core.context_processors.static",
"basic.blog.context_processors.blog_settings",
"navbar.context_processors.navbars",
- "staticfiles.context_processors.static_url",
)
INSTALLED_APPS = (
'django.contrib.auth',
'django.contrib.contenttypes',
'django.contrib.sessions',
'django.contrib.sites',
+ 'django.contrib.markup',
+ 'django.contrib.messages',
+ 'django.contrib.staticfiles',
'django.contrib.admin',
'django.contrib.sitemaps',
'django.contrib.flatpages',
@@ -86,12 +92,13 @@
'mingus.core',
'debug_toolbar',
- 'staticfiles',
'tinymce',
'django_wysiwyg',
'cropper',
'memcache_status',
'request',
+
+ 'portfolio',
)
@@ -106,6 +113,29 @@
DJANGO_WYSIWYG_MEDIA_URL = STATIC_URL + "js/ckeditor/"
DJANGO_WYSIWYG_FLAVOR = "ckeditor"
+# A sample logging configuration. The only tangible logging
+# performed by this configuration is to send an email to
+# the site admins on every HTTP 500 error.
+# See http://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+ 'version': 1,
+ 'disable_existing_loggers': False,
+ 'handlers': {
+ 'mail_admins': {
+ 'level': 'ERROR',
+ 'class': 'django.utils.log.AdminEmailHandler'
+ }
+ },
+ 'loggers': {
+ 'django.request': {
+ 'handlers': ['mail_admins'],
+ 'level': 'ERROR',
+ 'propagate': True,
+ },
+ }
+}
+
try:
from local_settings import *
except ImportError:
@@ -1,42 +1,42 @@
-BeautifulSoup>=3.0.8
-PIL
-python-dateutil==1.4.1
-django==1.1.1
-django-debug-toolbar==0.8.1
-django-tagging==0.3
-Pygments==1.1.1
-FeedParser==4.1
+BeautifulSoup==3.2.0
+Django==1.3
Markdown==2.0.1
-textile==2.1.3
-django-robots==0.6.1
+PIL==1.1.7
+Pygments==1.1.1
+-e git://github.com/montylounge/django-basic-apps.git@3e88fab6cef3524d9e8d84dbb17dfb5906c82ed5#egg=django_basic_apps-dev
+-e git://github.com/mintchaos/django_compressor.git@7f314c513410a5be6379edf1abfc4f1730a36d09#egg=django_compressor-dev
+-e hg+https://bitbucket.org/ubernostrum/django-contact-form/@1d3791fa4dfbb2375ba0d27e62283380c0ec74e6#egg=django_contact_form-dev
+-e git://github.com/montylounge/django_cropper.git@194e3c94b0abcb5ec2a9788ff1fe474779b3f67d#egg=django_cropper-dev
+-e svn+http://django-db-log.googlecode.com/svn/trunk@13#egg=django_db_log-1.0.1-py2.7-dev_r13
django-dbtemplates==0.6.1
+django-debug-toolbar==0.8.5
+-e git://github.com/ktonon/django-disqus.git#egg=django_disqus-dev
+-e git://github.com/django-extensions/django-extensions.git@459276ded0edf1d1cf6d94b4865891a281445b95#egg=django_extensions-dev
+-e git://github.com/zerok/django-flatblocks.git@77c310727d5ec5a0f69cdeda2b71bea8613503f0#egg=django_flatblocks-dev
+-e git://github.com/sunlightlabs/django-honeypot.git@76f57f487f68825fb302269516bb2b3284b81801#egg=django_honeypot-dev
django-markup==0.3
django-memcache-status==1.0.1
-
--e git://github.com/django-extensions/django-extensions.git@459276ded0edf1d1cf6d94b4865891a281445b95#egg=django_extensions-0.4.2_pre-py2.5-dev
--e git://github.com/mintchaos/django_compressor.git@7f314c513410a5be6379edf1abfc4f1730a36d09#egg=django_compressor-0.5.1-py2.5-dev
--e hg+https://bitbucket.org/ubernostrum/django-contact-form/@1d3791fa4dfbb2375ba0d27e62283380c0ec74e6#egg=django_contact_form-tip
--e svn+http://django-db-log.googlecode.com/svn/trunk@13#egg=django_db_log-1.0.1-py2.5-dev_r13
--e git://github.com/montylounge/django-disqus.git@35a022f28c50b9f7cdfcdd5deb4ae6f9150f4358#egg=django_disqus-0.1-py2.5-dev
--e git://github.com/zerok/django-flatblocks.git@77c310727d5ec5a0f69cdeda2b71bea8613503f0#egg=django_flatblocks-0.3.3-py2.5-dev
--e git://github.com/sunlightlabs/django-honeypot.git@76f57f487f68825fb302269516bb2b3284b81801#egg=django_honeypot-0.2.1-py2.5-dev
--e svn+http://django-navbar.googlecode.com/svn/trunk@20#egg=django_navbar-0.1.1rc1-py2.5-dev_r20
--e git://github.com/brosner/django-oembed.git@0b09321a6042c490534e5940083136f712da57b0#egg=django_oembed-0.1.0-py2.5-dev
--e git://github.com/montylounge/django-proxy.git@37f5e24c4426aeec6fc20473d1213fafb6e5c489#egg=django_proxy-0.1.0-py2.5-dev
--e git://github.com/montylounge/django-quoteme.git@d067a0da1756867250af9d836b8e0d47ff6c7c44#egg=django_quoteme-0.2-py2.5-dev
--e git://github.com/hbussell/django-slimmer.git@61deecdbc7650664c2a23f36ed806c043c70d65e#egg=django_slimmer-0.0.1-py2.5-dev
--e git://github.com/montylounge/django-sugar.git@fad43351d848da815159837d0a5f548b1fd2ef0f#egg=django_sugar-0.2-py2.5-dev
--e svn+http://django-tinymce.googlecode.com/svn/trunk@96#egg=django_tinymce-trunk-py2.5-dev_r96
--e hg+https://bitbucket.org/kmike/django-view-cache-utils/@4408ad8f1751ee2fccb441d2a342c4ed710467a0#egg=django_view_cache_utils-tip
--e git://github.com/pydanny/django-wysiwyg.git@b280e1b75326363dfe746d8c36425cfbed53b4ec#egg=django_wysiwyg-0.1.0-py2.5-dev
--e git://github.com/montylounge/django-google-analytics.git@6b7aa6dba851dd59dca0a20bc7eefe70754384e4#egg=google_analytics-0.1-py2.5-dev
--e svn+http://django-template-utils.googlecode.com/svn/trunk@109#egg=template_utils-0.4p2-py2.5-dev_r109
--e git://github.com/montylounge/django_cropper.git@194e3c94b0abcb5ec2a9788ff1fe474779b3f67d#egg=django-cropper-0.1.5a-py2.5-dev
--e git://github.com/kylef/django-request.git@84cfef56f6eea281a9c382859fb29ef570c7295d#egg=django_request-0.21-py2.5-dev
-
--e git://github.com/jezdez/django-staticfiles.git@bb936df3fbbc6d59bd3ec50f08f1ab9fc79ea44b#egg=django_staticfiles-0.2.0-py2.5-dev
--e git://github.com/sorl/sorl-thumbnail.git@827d1f2b04ef02f62301bc6968d21879b77adbf3#egg=sorl_thumbnail-10.12-py2.5-dev
--e git://github.com/montylounge/django-basic-apps.git@3e88fab6cef3524d9e8d84dbb17dfb5906c82ed5#egg=django_basic_apps-0.6-py2.5-dev
-
-
-
+-e svn+http://django-navbar.googlecode.com/svn/trunk@20#egg=django_navbar-0.1.1rc1-py2.7-dev_r20
+-e git://github.com/brosner/django-oembed.git@0b09321a6042c490534e5940083136f712da57b0#egg=django_oembed-dev
+-e git://github.com/montylounge/django-proxy.git@37f5e24c4426aeec6fc20473d1213fafb6e5c489#egg=django_proxy-dev
+-e git://github.com/montylounge/django-quoteme.git@d067a0da1756867250af9d836b8e0d47ff6c7c44#egg=django_quoteme-dev
+-e git://github.com/kylef/django-request.git@84cfef56f6eea281a9c382859fb29ef570c7295d#egg=django_request-dev
+django-robots==0.6.1
+-e git://github.com/hbussell/django-slimmer.git@61deecdbc7650664c2a23f36ed806c043c70d65e#egg=django_slimmer-dev
+-e git://github.com/jezdez/django-staticfiles.git@bb936df3fbbc6d59bd3ec50f08f1ab9fc79ea44b#egg=django_staticfiles-dev
+-e git://github.com/montylounge/django-sugar.git@fad43351d848da815159837d0a5f548b1fd2ef0f#egg=django_sugar-dev
+django-tagging==0.3
+-e svn+http://django-tinymce.googlecode.com/svn/trunk@96#egg=django_tinymce-trunk-py2.7-dev_r96
+-e hg+https://bitbucket.org/kmike/django-view-cache-utils/@4408ad8f1751ee2fccb441d2a342c4ed710467a0#egg=django_view_cache_utils-dev
+-e git://github.com/pydanny/django-wysiwyg.git@b280e1b75326363dfe746d8c36425cfbed53b4ec#egg=django_wysiwyg-dev
+feedparser==4.1
+-e git://github.com/montylounge/django-google-analytics.git@6b7aa6dba851dd59dca0a20bc7eefe70754384e4#egg=google_analytics-dev
+httplib2==0.7.1
+oauth2==1.5.170
+python-dateutil==1.4.1
+-e hg+https://python-twitter.googlecode.com/hg/@263fe2a0db8be23347e92b81d6ab3c33b4ef292f#egg=python_twitter-dev
+simplejson==2.1.6
+-e git://github.com/sorl/sorl-thumbnail.git@827d1f2b04ef02f62301bc6968d21879b77adbf3#egg=sorl_thumbnail-dev
+-e svn+http://django-template-utils.googlecode.com/svn/trunk@109#egg=template_utils-0.4p2-py2.7-dev_r109
+textile==2.1.3
+wsgiref==0.1.2
@@ -0,0 +1,94 @@
+#portfolio-nav {
+}
+
+#portfolio-nav li.selected a {
+ color: #000;
+ text-shadow: 1px 1px 1px #ccc;
+}
+
+#portfolio-projects .project-list {
+ margin-left: 0;
+}
+
+#portfolio-projects .project {
+ border-radius: 20px;
+ -webkit-border-radius: 20px;
+ -moz-border-radius: 20px;
+
+ padding: 5px 15px;
+ margin-bottom: 30px;
+
+ background-color: #f0f0f0;
+ border-top: solid 4px #e0e4e8;
+ border-bottom: solid 4px #e0e4e8;
+}
+
+#portfolio-projects .project h2 {
+ margin-bottom: 0.5em;
+ font-size: 22pt;
+}
+
+#portfolio-projects .dates {
+ position: absolute;
+ top: 0;
+ right: 0;
+ font-style: italic;
+ font-size: 10pt;
+ color: #666;
+}
+
+#portfolio-projects ul.skills {
+ position: absolute;
+ top: 1.2em;
+ right: 0;
+}
+#portfolio-projects ul.skills li {
+ display: inline;
+ margin-left: 1em;
+}
+#portfolio-projects ul.skills li a {
+ font-weight: normal;
+}
+
+#portfolio-projects .description {
+ min-height: 120px;
+}
+
+#portfolio-projects img.project-image {
+ border-radius: 10px;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border: solid 5px #e0e4e8;
+
+ float: left;
+ height: 100px;
+ margin-right: 10px;
+ margin-bottom: 10px;
+}
+
+#portfolio-projects .slide-show {
+ position: relative;
+ border-radius: 10px;
+ -webkit-border-radius: 10px;
+ -moz-border-radius: 10px;
+ border: solid 5px #e0e4e8;
+ background-color: #e0e4e8;
+ padding-top: 20px;
+
+ float: right;
+ width: 300px;
+ height: 300px;
+ cursor: pointer;
+}
+#portfolio-projects .slide-show .counter {
+ position: absolute;
+ top: 0;
+ right: 0;
+}
+#portfolio-projects .slide-show img {
+ width: 300px;
+}
+
+#portfolio-projects .description li {
+ list-style-type: disc;
+}
Oops, something went wrong.

0 comments on commit c5077c3

Please sign in to comment.