Merge pull request #236 from nickolay/759202-remove-dead-side_top

Bug 759202: Remove unused 'side_top' block
mdn · May 31, 2012 · 45dd737 · 45dd737
2 parents 93ab1f2 + fc320c5
commit 45dd737
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 156 deletions.
diff --git a/apps/users/templates/users/base.html b/apps/users/templates/users/base.html
@@ -3,31 +3,5 @@
 {% set styles = ('users',) %}
 {% set scripts = ('users',) %}
 
-{% block side_top %}
-  {% if not profile and user.is_authenticated() %}
-    {% set profile = user.get_profile() %}
-  {% endif %}
-  {% if profile %}
-    <nav id="doc-tabs">
-      <ul>{# If form is set, we're editing #}
-        <li{% if not form %} class="active"{% endif %}>
-          <a href="{{ profile_url(profile.user) }}">
-            {% if user == profile.user %}
-              {{ _('My profile') }}
-            {% else %}
-              {{ display_name(profile.user) }}
-            {% endif %}
-          </a>
-        </li>
-        {% if request.user == profile.user %}
-          <li{% if form %} class="active"{% endif %}>
-            <a href="{{ url('users.edit_profile') }}">{{ _('Edit my profile') }}</a>
-          </li>
-        {% endif %}
-      </ul>
-    </nav>
-  {% endif %}
-{% endblock %}
-
 {% block breadcrumbs %}
 {% endblock %}
diff --git a/apps/wiki/templates/wiki/compare_revisions.html b/apps/wiki/templates/wiki/compare_revisions.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('Compare Revisions | {document}')|f(document=document.title) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {% set crumbs = [(url('wiki.category', document.category), document.get_category_display()),
@@ -25,6 +24,3 @@ <h2>{{ document.title }}</h2>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, 'history', settings) }}
-{% endblock %}
diff --git a/apps/wiki/templates/wiki/confirm_revision_delete.html b/apps/wiki/templates/wiki/confirm_revision_delete.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('Delete Revision | {document}')|f(document=document.title) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {% set crumbs = [(url('wiki.category', document.category), document.get_category_display()),
@@ -29,6 +28,3 @@ <h1 class="title">{{ _('Are you sure you want to delete this revision?') }}</h1>
   </article>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, '', settings) }}
-{% endblock %}
diff --git a/apps/wiki/templates/wiki/document.html b/apps/wiki/templates/wiki/document.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs, document_notifications %}
 {% block title %}{{ page_title(document.title) }}{% endblock %}
 {% set classes = 'document' %}
 {% block bodyclass %}document{% endblock %}
@@ -220,26 +219,6 @@ <h2>{{ _('Tags') }}</h2>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, 'article', settings) }}
-
-  {% if user.is_authenticated() and document %}
-    <div id="doc-watch">
-      {% if document.is_watched_by(user) %}
-        <form action="{{ url('wiki.document_unwatch', document.full_path) }}" method="post">
-          {{ csrf() }}
-          <input type="submit" class="link-btn" value="{{ _('Turn off emails.') }}" />
-        </form>
-      {% else %}
-        <form action="{{ url('wiki.document_watch', document.full_path) }}" method="post">
-          {{ csrf() }}
-          <input type="submit" class="link-btn" value="{{ _('Get emailed when this article changes.') }}" />
-        </form>
-      {% endif %}
-    </div>
-  {% endif %}
-{% endblock %}
-
 {% block side %}
   {% include 'wiki/includes/support_for_selectors.html' %}
 {% endblock %}

diff --git a/apps/wiki/templates/wiki/document_revisions.html b/apps/wiki/templates/wiki/document_revisions.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('Revision History | {document}')|fe(document=document.title) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {% set crumbs = [(url('wiki.category', document.category), document.get_category_display()),
@@ -104,6 +103,3 @@ <h1 class="title">{{ _('History of {title}')|fe(title=document.title) }}</h1>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, 'history', settings) }}
-{% endblock %}
diff --git a/apps/wiki/templates/wiki/edit_document.html b/apps/wiki/templates/wiki/edit_document.html
@@ -1,7 +1,6 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
 {% from "layout/errorlist.html" import errorlist %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('{document} | Edit Article')|f(document=document.title) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {# TODO: Change KB url to landing page when we have one #}
@@ -151,10 +150,6 @@ <h4>{{_('Review needed?')}}</h4>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, 'edit', settings) }}
-{% endblock %}
-
 {% block site_js %}
     {{ super() }}
     {{ js('framebuster') }}

diff --git a/apps/wiki/templates/wiki/includes/sidebar_modules.html b/apps/wiki/templates/wiki/includes/sidebar_modules.html
diff --git a/apps/wiki/templates/wiki/preview.html b/apps/wiki/templates/wiki/preview.html
@@ -2,7 +2,6 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs, document_notifications %}
 {% block title %}{{ title|safe }}{% endblock %}
 {% set classes = 'document' %}
 {% block bodyclass %}document{% endblock %}

diff --git a/apps/wiki/templates/wiki/review_revision.html b/apps/wiki/templates/wiki/review_revision.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('Review Revision {id} | {document}')|f(document=document.title, id=revision.id) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {% set crumbs = [(url('wiki.category', document.category), document.get_category_display()),
@@ -69,10 +68,6 @@ <h3>{{ _('Revision rendered html:') }}</h3>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, '', settings) }}
-{% endblock %}
-
 {% block side %}
   {% include 'wiki/includes/support_for_selectors.html' %}
 {% endblock %}
diff --git a/apps/wiki/templates/wiki/review_translation.html b/apps/wiki/templates/wiki/review_translation.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('Review Translation {id} | {document}')|f(document=document.parent.title, id=revision.id) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {% set crumbs = [(url('wiki.category', document.category), document.get_category_display()),
@@ -110,10 +109,6 @@ <h3>{{ _('Translation rendered html:') }}</h3>
   </article>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, '', settings) }}
-{% endblock %}
-
 {% block side %}
   {% include 'wiki/includes/support_for_selectors.html' %}
 {% endblock %}
diff --git a/apps/wiki/templates/wiki/revision.html b/apps/wiki/templates/wiki/revision.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {# L10n: {n} is the revision number, {t} is the title of the document. {c} is the category. #}
 {% set title = _('Revision {n} | {t} | {c}')|f(n=revision.id, t=document.title, c=document.get_category_display()) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
@@ -87,10 +86,6 @@ <h1 class="title">{{ document.title }}</h1>
 {% endblock %}
 
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, '', settings) }}
-{% endblock %}
-
 {% block side %}
   {% include 'wiki/includes/support_for_selectors.html' %}
 {% endblock %}
diff --git a/apps/wiki/templates/wiki/select_locale.html b/apps/wiki/templates/wiki/select_locale.html
@@ -1,6 +1,5 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% set title = _('Select language | {document}')|f(document=document.title) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
 {% set crumbs = [(url('wiki.category', document.category), document.get_category_display()),
@@ -26,6 +25,3 @@ <h1>{{ _('Select a language to translate to:') }}</h1>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, document.parent, user, 'localize', settings) }}
-{% endblock %}
diff --git a/apps/wiki/templates/wiki/translate.html b/apps/wiki/templates/wiki/translate.html
@@ -1,7 +1,6 @@
 {# vim: set ts=2 et sts=2 sw=2: #}
 {% extends "wiki/base.html" %}
 {% from "layout/errorlist.html" import errorlist %}
-{% from "wiki/includes/sidebar_modules.html" import document_tabs %}
 {% from "includes/common_macros.html" import content_editor %}
 {% set title = _('Translate Article | {document}')|f(document=parent.title) %}
 {% block title %}{{ page_title(title) }}{% endblock %}
@@ -140,10 +139,6 @@ <h3>{{ _('{locale} translation:')|f(locale=language) }}</h3>
 </section>
 {% endblock %}
 
-{% block side_top %}
-  {{ document_tabs(document, parent, user, 'localize', settings) }}
-{% endblock %}
-
 {% block js %}
   <script src="{{ MEDIA_URL }}ckeditor/ckeditor.js"></script>
   <script src="{{ MEDIA_URL }}ckeditor/adapters/jquery.js"></script>