Просмотр исходного кода

Removed load clauses from admin templates. #156

Ralfp 12 лет назад
Родитель
Сommit
75c2eecd52

+ 3 - 3
misago/apps/admin/widgets.py

@@ -117,7 +117,7 @@ class ListWidget(BaseWidget):
         return {
         return {
                 'icon': icon,
                 'icon': icon,
                 'name': name,
                 'name': name,
-                'url': url,
+                'link': url,
                 'post': post,
                 'post': post,
                 'prompt': prompt,
                 'prompt': prompt,
                 }
                 }
@@ -358,7 +358,7 @@ class ListWidget(BaseWidget):
                                    'admin': self.admin,
                                    'admin': self.admin,
                                    'action': self,
                                    'action': self,
                                    'request': request,
                                    'request': request,
-                                   'url': self.get_url(),
+                                   'link': self.get_url(),
                                    'messages_log': request.messages.get_messages(self.admin.id),
                                    'messages_log': request.messages.get_messages(self.admin.id),
                                    'message': message,
                                    'message': message,
                                    'sorting': self.sortables,
                                    'sorting': self.sortables,
@@ -467,7 +467,7 @@ class FormWidget(BaseWidget):
                                    'admin': self.admin,
                                    'admin': self.admin,
                                    'action': self,
                                    'action': self,
                                    'request': request,
                                    'request': request,
-                                   'url': self.get_url(model),
+                                   'link': self.get_url(model),
                                    'fallback': self.get_fallback_url(),
                                    'fallback': self.get_fallback_url(),
                                    'messages_log': request.messages.get_messages(self.admin.id),
                                    'messages_log': request.messages.get_messages(self.admin.id),
                                    'message': message,
                                    'message': message,

+ 0 - 3
templates/admin/admin/acl_form.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/layout.html" %}
 {% extends "admin/admin/layout.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 
 {% block action_body %}
 {% block action_body %}

+ 0 - 3
templates/admin/admin/form.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/layout.html" %}
 {% extends "admin/admin/layout.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 
 {% block action_body %}
 {% block action_body %}

+ 0 - 3
templates/admin/admin/layout.html

@@ -1,7 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% from "admin/macros.html" import page_title, draw_message %}
 {% from "admin/macros.html" import page_title, draw_message %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 

+ 0 - 3
templates/admin/admin/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/layout.html" %}
 {% extends "admin/admin/layout.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 
 {% block action_body %}
 {% block action_body %}

+ 0 - 3
templates/admin/bans/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td class="lead-cell">
   <td class="lead-cell">

+ 0 - 3
templates/admin/clients/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td class="lead-cell">
   <td class="lead-cell">

+ 0 - 2
templates/admin/error403.html

@@ -1,6 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
-{% load url from future %}
 
 
 {% block title %}{% trans %}Permission denied{% endtrans %} - {{ settings.board_name }}{% endblock %}
 {% block title %}{% trans %}Permission denied{% endtrans %} - {{ settings.board_name }}{% endblock %}
       
       

+ 0 - 2
templates/admin/error404.html

@@ -1,6 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
-{% load url from future %}
 
 
 {% block title %}{% trans %}Page not found{% endtrans %} - {{ settings.board_name }}{% endblock %}
 {% block title %}{% trans %}Page not found{% endtrans %} - {{ settings.board_name }}{% endblock %}
       
       

+ 0 - 1
templates/admin/forums/delete.html

@@ -1,5 +1,4 @@
 {% extends "admin/admin/form.html" %}
 {% extends "admin/admin/form.html" %}
-{% load i18n %}
 
 
 {% block form_submit %}
 {% block form_submit %}
 <button name="save" type="submit" class="btn btn-danger">{% trans %}Delete Forum{% endtrans %}</button>
 <button name="save" type="submit" class="btn btn-danger">{% trans %}Delete Forum{% endtrans %}</button>

+ 0 - 3
templates/admin/forums/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td class="lead-cell" style="padding-left: {{ 8 + ((item.level - 1) * 24) }}px;">
   <td class="lead-cell" style="padding-left: {{ 8 + ((item.level - 1) * 24) }}px;">

+ 0 - 3
templates/admin/index.html

@@ -1,7 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
-{% load humanize %}
-{% load url from future %}
 {% from "admin/macros.html" import page_title %}
 {% from "admin/macros.html" import page_title %}
 
 
 {% block title %}{{ page_title(title=_('Admin Home')) }}{% endblock %}
 {% block title %}{{ page_title(title=_('Admin Home')) }}{% endblock %}

+ 0 - 2
templates/admin/layout.html

@@ -1,6 +1,4 @@
 {% extends "admin/base.html" %}
 {% extends "admin/base.html" %}
-{% load i18n %}
-{% load url from future %}
 {% from "admin/macros.html" import messages_list %}
 {% from "admin/macros.html" import messages_list %}
 
 
 {% block body %}
 {% block body %}

+ 0 - 2
templates/admin/macros.html

@@ -1,5 +1,3 @@
-{% load i18n %}
-
 {% macro page_title(title='', parent='', page=0) -%}
 {% macro page_title(title='', parent='', page=0) -%}
 {% if parent %}{{ parent }}: {% endif %}{% if title %}{{ title }}{% if page > 1 %} ({% trans page=page %}{{ page }} page{% endtrans %}){% endif %} - {% endif %}{% trans %}Misago Admin{% endtrans %}
 {% if parent %}{{ parent }}: {% endif %}{% if title %}{{ title }}{% if page > 1 %} ({% trans page=page %}{{ page }} page{% endtrans %}){% endif %} - {% endif %}{% trans %}Misago Admin{% endtrans %}
 {%- endmacro %}
 {%- endmacro %}

+ 0 - 3
templates/admin/newsletters/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}

+ 0 - 3
templates/admin/online/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td>
   <td>

+ 0 - 2
templates/admin/processing.html

@@ -1,6 +1,4 @@
 {% extends "admin/layout_compact.html" %}
 {% extends "admin/layout_compact.html" %}
-{% load i18n %}
-{% load url from future %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 {% from "admin/macros.html" import page_title, draw_message_icon %}
 {% from "admin/macros.html" import page_title, draw_message_icon %}
 
 

+ 0 - 3
templates/admin/prune/apply.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/layout.html" %}
 {% extends "admin/admin/layout.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block action_body %}
 {% block action_body %}
 <form action="{{ url }}" method="post">
 <form action="{{ url }}" method="post">

+ 0 - 3
templates/admin/prune/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td class="lead-cell">
   <td class="lead-cell">

+ 0 - 3
templates/admin/ranks/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 
 {% block table_head scoped %}
 {% block table_head scoped %}

+ 0 - 3
templates/admin/roles/forums.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 {% from "admin/macros.html" import page_title %}
 {% from "admin/macros.html" import page_title %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 

+ 0 - 3
templates/admin/roles/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td class="lead-cell">
   <td class="lead-cell">

+ 0 - 1
templates/admin/roles_forums/list.html

@@ -1,5 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
 
 
 {% block table_row scoped %}
 {% block table_row scoped %}
   <td class="lead-cell">
   <td class="lead-cell">

+ 0 - 2
templates/admin/settings/search_results.html

@@ -1,6 +1,4 @@
 {% extends "admin/settings/settings.html" %}
 {% extends "admin/settings/settings.html" %}
-{% load i18n %}
-{% load url from future %}
 {% from "admin/macros.html" import page_title, draw_message %}
 {% from "admin/macros.html" import page_title, draw_message %}
 
 
 {% block title %}{{ page_title(title=_('Search Results'), parent=_('Settings')) }}{% endblock %}
 {% block title %}{{ page_title(title=_('Search Results'), parent=_('Settings')) }}{% endblock %}

+ 0 - 2
templates/admin/settings/settings.html

@@ -1,6 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
-{% load url from future %}
 {% from "admin/macros.html" import page_title, draw_message %}
 {% from "admin/macros.html" import page_title, draw_message %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 

+ 0 - 1
templates/admin/stats/form.html

@@ -1,5 +1,4 @@
 {% extends "admin/stats/layout.html" %}
 {% extends "admin/stats/layout.html" %}
-{% load i18n %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 
 
 {% block action %}<div class="row">
 {% block action %}<div class="row">

+ 0 - 1
templates/admin/stats/graph.html

@@ -1,5 +1,4 @@
 {% extends "admin/stats/form.html" %}
 {% extends "admin/stats/form.html" %}
-{% load i18n %}
 {% import "_forms.html" as form_theme with context %}
 {% import "_forms.html" as form_theme with context %}
 {% from "admin/macros.html" import page_title %}
 {% from "admin/macros.html" import page_title %}
 {% from "admin/stats/plot.html" import draw_plot_tooltips, draw_plot with context %}
 {% from "admin/stats/plot.html" import draw_plot_tooltips, draw_plot with context %}

+ 0 - 1
templates/admin/stats/layout.html

@@ -1,5 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
 {% import "admin/macros.html" as macros with context %}
 {% import "admin/macros.html" as macros with context %}
 
 
 {% block title %}{{ macros.page_title(title=_('Stats')) }}{% endblock %}
 {% block title %}{{ macros.page_title(title=_('Stats')) }}{% endblock %}

+ 0 - 1
templates/admin/stats/not_available.html

@@ -1,5 +1,4 @@
 {% extends "admin/stats/layout.html" %}
 {% extends "admin/stats/layout.html" %}
-{% load i18n %}
 
 
 {% block action %}<div class="alert">
 {% block action %}<div class="alert">
   <div class="alert-icon"><span><i class="icon-info-sign icon-white"></i></span></div>
   <div class="alert-icon"><span><i class="icon-info-sign icon-white"></i></span></div>

+ 0 - 3
templates/admin/team/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block action_body scoped %}
 {% block action_body scoped %}
 <table class="table table-striped table-users">
 <table class="table table-striped table-users">

+ 0 - 1
templates/admin/todo.html

@@ -1,5 +1,4 @@
 {% extends "admin/layout.html" %}
 {% extends "admin/layout.html" %}
-{% load i18n %}
 {% from "admin/macros.html" import page_title %}
 {% from "admin/macros.html" import page_title %}
 
 
 {% block title %}{{ page_title(title=_('Unimplemented Admin Action')) }}{% endblock %}
 {% block title %}{{ page_title(title=_('Unimplemented Admin Action')) }}{% endblock %}

+ 0 - 3
templates/admin/users/list.html

@@ -1,7 +1,4 @@
 {% extends "admin/admin/list.html" %}
 {% extends "admin/admin/list.html" %}
-{% load i18n %}
-{% load l10n %}
-{% load url from future %}
 
 
 {% block action_body %}
 {% block action_body %}
 {% if monitor.users_inactive|int > 0 %}
 {% if monitor.users_inactive|int > 0 %}