Permalink
Browse files

- changed Django Fiber to 0.9.6

- simplified urlpatterns
- created new fixture
  • Loading branch information...
1 parent 4ecd235 commit 80f945e51e849b42c1237150be7c2214082f8242 @dbunskoek dbunskoek committed Jan 19, 2012
Showing with 36 additions and 13 deletions.
  1. +30 −3 fixtures/example_initial_data.json
  2. +1 −1 requirements.txt
  3. +1 −2 settings_default.py
  4. +4 −7 urls.py
@@ -4,9 +4,11 @@
"model": "fiber.contentitem",
"fields": {
"content_markup": "",
- "updated": "2011-06-08 07:03:13",
+ "updated": "2012-01-19 14:30:08",
"name": "",
"created": "2011-06-05 04:47:59",
+ "template_name": "",
+ "used_on_pages_data": "[{\"url\": \"/\", \"title\": \"Home\"}]",
"protected": false,
"content_html": "<h2>\r\n\tA ContentItem in the &quot;main&quot; block</h2>\r\n<p>\r\n\t<em>Double-click to edit this ContentItem.</em></p>\r\n<p>\r\n\tLorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.</p>\r\n",
"metadata": null
@@ -17,9 +19,11 @@
"model": "fiber.contentitem",
"fields": {
"content_markup": "",
- "updated": "2011-06-08 07:03:52",
+ "updated": "2012-01-19 14:30:08",
"name": "",
"created": "2011-06-05 04:48:11",
+ "template_name": "",
+ "used_on_pages_data": "[{\"url\": \"/\", \"title\": \"Home\"}]",
"protected": false,
"content_html": "<h2>\r\n\tA ContentItem in the &quot;aside&quot; block</h2>\r\n<p>\r\n\t<em>Double-click to edit this ContentItem.</em></p>\r\n<p>\r\n\tUt enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur.</p>\r\n",
"metadata": null
@@ -30,9 +34,11 @@
"model": "fiber.contentitem",
"fields": {
"content_markup": "",
- "updated": "2011-06-08 07:05:03",
+ "updated": "2012-01-19 14:30:08",
"name": "address",
"created": "2011-06-05 04:53:32",
+ "template_name": "",
+ "used_on_pages_data": "[]",
"protected": false,
"content_html": "<h2>\r\n\tA ContentItem named &quot;address&quot;</h2>\r\n<p>\r\n\t<em>Double-click to edit this ContentItem.</em></p>\r\n",
"metadata": null
@@ -55,6 +61,7 @@
"lft": 1,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -76,6 +83,7 @@
"lft": 2,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -97,6 +105,7 @@
"lft": 4,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -118,6 +127,7 @@
"lft": 5,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -139,6 +149,7 @@
"lft": 7,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -160,6 +171,7 @@
"lft": 10,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -181,6 +193,7 @@
"lft": 11,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -202,6 +215,7 @@
"lft": 12,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -223,6 +237,7 @@
"lft": 14,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -244,6 +259,7 @@
"lft": 15,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -265,6 +281,7 @@
"lft": 17,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -286,6 +303,7 @@
"lft": 21,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -307,6 +325,7 @@
"lft": 22,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -328,6 +347,7 @@
"lft": 25,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -349,6 +369,7 @@
"lft": 26,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -370,6 +391,7 @@
"lft": 30,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -391,6 +413,7 @@
"lft": 31,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -412,6 +435,7 @@
"lft": 33,
"protected": false,
"tree_id": 1,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -433,6 +457,7 @@
"lft": 1,
"protected": false,
"tree_id": 2,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -454,6 +479,7 @@
"lft": 2,
"protected": false,
"tree_id": 2,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
@@ -475,6 +501,7 @@
"lft": 4,
"protected": false,
"tree_id": 2,
+ "is_public": true,
"show_in_menu": true,
"metadata": null
}
View
@@ -1,2 +1,2 @@
Django==1.3.1
-django-fiber==0.9.5
+django-fiber==0.9.6
View
@@ -97,7 +97,6 @@
MIDDLEWARE_CLASSES = DEFAULT_SETTINGS.MIDDLEWARE_CLASSES + (
'fiber.middleware.ObfuscateEmailAddressMiddleware',
'fiber.middleware.AdminPageMiddleware',
- 'fiber.middleware.PageFallbackMiddleware',
)
ROOT_URLCONF = 'urls'
@@ -124,8 +123,8 @@
'piston',
'mptt',
'compressor',
- 'fiber',
'pages',
+ 'fiber',
)
# A sample logging configuration. The only tangible logging
View
11 urls.py
@@ -19,11 +19,8 @@
# Uncomment the next line to enable the admin:
url(r'^admin/', include(admin.site.urls)),
-)
-if settings.DEBUG:
- urlpatterns += patterns('',
- url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {
- 'document_root': settings.MEDIA_ROOT,
- }),
- )
+ url(r'^media/(?P<path>.*)$', 'django.views.static.serve', {'document_root': settings.MEDIA_ROOT,}),
+
+ (r'', 'fiber.views.page'), # this should always be placed last
+)

0 comments on commit 80f945e

Please sign in to comment.