some fixes

[mediagoblin.git] / mediagoblin / media_types / blog / __init__.py

diff --git a/mediagoblin/media_types/blog/__init__.py b/mediagoblin/media_types/blog/__init__.py
index ec6f68ec10b3cfe165e70c34a0924d0590a953d2..8a61c6e0ed7d176087e1138c6e3e20ba14b8e7b6 100644 (file)
--- a/mediagoblin/media_types/blog/__init__.py
+++ b/mediagoblin/media_types/blog/__init__.py
@@ -26,72 +26,96 @@ from mediagoblin.tools import pluginapi
 PLUGIN_DIR = os.path.dirname(__file__)
 MEDIA_TYPE = 'mediagoblin.media_types.blogpost'
 
+
 def setup_plugin():
     config = pluginapi.get_config(MEDIA_TYPE)
     _log.info("setting up blog media type plugin.")
-    
-    routes = [  
+
+    routes = [
         #blog_create
-        ('mediagoblin.media_types.blog.create',                         
+        ('mediagoblin.media_types.blog.create',
         '/u/<string:user>/b/create/',
         'mediagoblin.media_types.blog.views:blog_edit'
-        ), 
-         #blog_edit        
-        ('mediagoblin.media_types.blog.edit',                          
-        '/u/<string:user>/b/<string:blog_slug>/edit/',          
+        ),
+         #blog_edit
+        ('mediagoblin.media_types.blog.edit',
+        '/u/<string:user>/b/<string:blog_slug>/edit/',
         'mediagoblin.media_types.blog.views:blog_edit'
         ),
         #blog post create
-        ('mediagoblin.media_types.blog.blogpost.create',                
+        ('mediagoblin.media_types.blog.blogpost.create',
         '/u/<string:user>/b/<string:blog_slug>/p/create/',
         'mediagoblin.media_types.blog.views:blogpost_create'
         ),
         #blog post edit
-        ('mediagoblin.media_types.blog.blogpost.edit',                  
+        ('mediagoblin.media_types.blog.blogpost.edit',
         '/u/<string:user>/b/<string:blog_slug>/p/<string:blog_post_slug>/edit/',
         'mediagoblin.media_types.blog.views:blogpost_edit'
         ),
-        #blog admin dashboard
+        #blog collection dashboard in case of multiple blogs
+        ('mediagoblin.media_types.blog.blog_admin_dashboard',
+        '/u/<string:user>/b/dashboard/',
+        'mediagoblin.media_types.blog.views:blog_dashboard'
+        ),
+        #blog dashboard
         ('mediagoblin.media_types.blog.blog-dashboard',
-        '/u/<string:user>/b/<string:blog_slug>/blog_dashboard/',
+        '/u/<string:user>/b/<string:blog_slug>/dashboard/',
         'mediagoblin.media_types.blog.views:blog_dashboard'
         ),
         #blog post listing view
         ('mediagoblin.media_types.blog.blog_post_listing',
-        '/u/<string:user>/b/',
+        '/u/<string:user>/b/<string:blog_slug>/',
         'mediagoblin.media_types.blog.views:blog_post_listing'
         ),
         #blog post draft view
-        ('mediagoblin.media_types.blog.blogpost_draft_view', 
+        ('mediagoblin.media_types.blog.blogpost_draft_view',
         '/u/<string:user>/b/<string:blog_slug>/p/<string:blog_post_slug>/draft/',
-        'mediagoblin.media_types.blog.views:draft_view')
-        ]
-            
-            
+        'mediagoblin.media_types.blog.views:draft_view'
+        ),
+        #blog delete view
+        ('mediagoblin.media_types.blog.blog_delete',
+        '/u/<string:user>/b/<string:blog_slug>/delete/',
+        'mediagoblin.media_types.blog.views:blog_delete'
+        ),
+        # blog about view
+        ('mediagoblin.media_types.blog.blog_about',
+        '/u/<string:user>/b/<string:blog_slug>/about/',
+        'mediagoblin.media_types.blog.views:blog_about_view'
+        )]
+
+
     pluginapi.register_routes(routes)
     pluginapi.register_template_path(os.path.join(PLUGIN_DIR, 'templates'))
-    
-    
+    pluginapi.register_template_hooks({"user_profile": "mediagoblin/blog/url_to_blogs_dashboard.html",
+                                        "blog_dashboard_home": "mediagoblin/blog/url_to_blogging.html",
+                                        "create_blog_home": "mediagoblin/blog/url_to_create_blog.html",
+                                    })
+
+
 class BlogPostMediaManager(MediaManagerBase):
     human_readable = "Blog Post"
     display_template = "mediagoblin/media_displays/blogpost.html"
     default_thumb = "images/media_thumbs/blogpost.jpg"
-    
+
     def get_blog_by_blogpost(self):
         blog_post_data = BlogPostData.query.filter_by(media_entry=self.entry.id).first()
         blog = Blog.query.filter_by(id=blog_post_data.blog).first()
         return blog
-        
-def get_media_type_and_manager():
-        return MEDIA_TYPE, BlogPostMediaManager
+
+def add_to_user_home_context(context):
+    blogs = context['request'].db.Blog.query.filter_by(author=context['user'].id)
+
+    if blogs:
+        context['blogs'] = blogs
+    else:
+        context['blogs'] = None
+    return context
+
 
 hooks = {
     'setup': setup_plugin,
-    'get_media_type_and_manager': get_media_type_and_manager,
     ('media_manager', MEDIA_TYPE): lambda: BlogPostMediaManager,
+    # Inject blog context on user profile page
+    ("mediagoblin.user_pages.user_home",
+     "mediagoblin/user_pages/user.html"): add_to_user_home_context
 }
-
-
-    
-    
-