diff options
| author | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-15 18:00:13 +0530 |
|---|---|---|
| committer | Aditi Mittal <aditi.iitr@gmail.com> | 2013-09-15 18:00:13 +0530 |
| commit | 5e055893bafbd43b262d61aeaa5bf2733f29cde4 (patch) | |
| tree | b3e51b1e8c4eee5cdfb431368c1058ffd4532201 | |
| parent | 092938741e6a4b2c79e3dd9efbfe38a3702e32ae (diff) | |
| download | mediagoblin-5e055893bafbd43b262d61aeaa5bf2733f29cde4.tar.lz mediagoblin-5e055893bafbd43b262d61aeaa5bf2733f29cde4.tar.xz mediagoblin-5e055893bafbd43b262d61aeaa5bf2733f29cde4.zip | |
Separate Create Blog and Blog Dashboard links on the home page.
4 files changed, 29 insertions, 7 deletions
diff --git a/mediagoblin/media_types/blog/__init__.py b/mediagoblin/media_types/blog/__init__.py index c40ddecb..6dd5cc4c 100644 --- a/mediagoblin/media_types/blog/__init__.py +++ b/mediagoblin/media_types/blog/__init__.py @@ -82,7 +82,8 @@ def setup_plugin(): 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", - "header_actions": "mediagoblin/blog/url_to_blogging.html" + "blog_dashboard_home": "mediagoblin/blog/url_to_blogging.html", + "create_blog_home": "mediagoblin/blog/url_to_create_blog.html", }) diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_blogging.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_blogging.html index 3307ba56..bf688b0f 100644 --- a/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_blogging.html +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_blogging.html @@ -15,11 +15,8 @@ # You should have received a copy of the GNU Affero General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. #} - <a class="button_action" href="{{ request.urlgen('mediagoblin.media_types.blog.create', - user=request.user.username) }}"> - {%- trans %} Create Blog {% endtrans -%} - </a> - <a class="button_action" href="{{ request.urlgen('mediagoblin.media_types.blog.blog_admin_dashboard', + + <a href="{{ request.urlgen('mediagoblin.media_types.blog.blog_admin_dashboard', user=request.user.username) }}"> {%- trans %} Blog Dashboard {% endtrans -%} </a> diff --git a/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_create_blog.html b/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_create_blog.html new file mode 100644 index 00000000..d7d33adb --- /dev/null +++ b/mediagoblin/media_types/blog/templates/mediagoblin/blog/url_to_create_blog.html @@ -0,0 +1,22 @@ +{# +# GNU MediaGoblin -- federated, autonomous media hosting +# Copyright (C) 2011, 2012 MediaGoblin contributors. See AUTHORS. +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +#} + <a class="button_action" href="{{ request.urlgen('mediagoblin.media_types.blog.create', + user=request.user.username) }}"> + {%- trans %} Create Blog {% endtrans -%} + </a> + diff --git a/mediagoblin/templates/mediagoblin/base.html b/mediagoblin/templates/mediagoblin/base.html index e1761321..eb37e25f 100644 --- a/mediagoblin/templates/mediagoblin/base.html +++ b/mediagoblin/templates/mediagoblin/base.html @@ -116,6 +116,8 @@ {%- trans %}Media processing panel{% endtrans -%} </a> · + {% template_hook("blog_dashboard_home") %} + · <a id="logout" href= {% if persona is not defined %} "{{ request.urlgen('mediagoblin.auth.logout') }}" @@ -130,7 +132,7 @@ <a class="button_action" href="{{ request.urlgen('mediagoblin.submit.collection') }}"> {%- trans %}Create new collection{% endtrans -%} </a> - {% template_hook("header_actions") %} + {% template_hook("create_blog_home") %} {% if request.user.is_admin %} <p> <span class="dropdown_title">Admin powers:</span> |