Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Updated Django and Django Fiber versions

  • Loading branch information...
commit 6113a5637c02abca35d9e5b9796ba19ffc709185 1 parent 25b1efe
@dbunskoek dbunskoek authored
Showing with 18 additions and 10 deletions.
  1. +2 −2 requirements.txt
  2. +15 −7 settings_default.py
  3. +1 −1  urls.py
View
4 requirements.txt
@@ -1,2 +1,2 @@
-Django==1.3.1
-django-fiber==0.9.6.1
+Django==1.4.3
+django-fiber==0.10
View
22 settings_default.py
@@ -66,11 +66,6 @@
# Example: "http://media.lawrence.com/static/"
STATIC_URL = '/static/'
-# URL prefix for admin static files -- CSS, JavaScript and images.
-# Make sure to use a trailing slash.
-# Examples: "http://foo.com/static/admin/", "/static/admin/".
-ADMIN_MEDIA_PREFIX = STATIC_URL + 'admin/'
-
# Additional locations of static files
STATICFILES_DIRS = (
# Put strings here, like "/home/html/static" or "C:/www/django/static".
@@ -109,7 +104,6 @@
TEMPLATE_CONTEXT_PROCESSORS = DEFAULT_SETTINGS.TEMPLATE_CONTEXT_PROCESSORS + (
'django.core.context_processors.request',
- 'fiber.context_processors.page_info',
)
INSTALLED_APPS = (
@@ -120,13 +114,27 @@
'django.contrib.messages',
'django.contrib.staticfiles',
'django.contrib.admin',
- 'piston',
'mptt',
'compressor',
'pages',
'fiber',
)
+FIBER_METADATA_PAGE_SCHEMA = {
+ 'title': {
+ 'widget': 'select',
+ 'values': ['option1', 'option2', 'option3',],
+ },
+ 'bgcolor': {
+ 'widget': 'combobox',
+ 'values': ['#ffffff', '#fff000', '#ff00cc'],
+ 'prefill_from_db': True,
+ },
+ 'description': {
+ 'widget': 'textarea',
+ },
+}
+
# 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.
View
2  urls.py
@@ -10,7 +10,7 @@
# url(r'^$', 'testproject.views.home', name='home'),
# url(r'^testproject/', include('testproject.foo.urls')),
- (r'^api/v1/', include('fiber.api.urls')),
+ (r'^api/v2/', include('fiber.rest_api.urls')),
(r'^admin/fiber/', include('fiber.admin_urls')),
(r'^jsi18n/$', 'django.views.i18n.javascript_catalog', {'packages': ('fiber',),}),
Please sign in to comment.
Something went wrong with that request. Please try again.