From aba098c5c01793a4497b5706215c84b6b16974ba Mon Sep 17 00:00:00 2001 From: luxagraf Date: Wed, 24 Apr 2013 08:22:20 -0400 Subject: updated for django 1.5, removed grappelli dependency --- design/templates/admin/base.html | 176 ++++++++++++++---------------------- design/templates/admin/buttons.html | 8 +- design/templates/admin/index.html | 141 +++++++++++++++-------------- 3 files changed, 145 insertions(+), 180 deletions(-) (limited to 'design/templates/admin') diff --git a/design/templates/admin/base.html b/design/templates/admin/base.html index 3ed4858..455d0d2 100644 --- a/design/templates/admin/base.html +++ b/design/templates/admin/base.html @@ -1,119 +1,79 @@ -{% load admin_static %}{% load url from future %}{% load i18n grp_tags %} - - +{% load admin_static %} + - {% block title %}{% endblock %} - - {% block blockbots %}{% endblock %} - - {% block stylesheets %} - - - - {% comment %}{% if LANGUAGE_BIDI %}{% endif %}{% endcomment %} - {% endblock %} - - {% block extrastyle %}{% endblock %} - - {% block javascripts %} - - - - - - {% if debug %} - - - - - - - - - - - - - - {% else %} - - - {% endif %} - {% endblock %} - - {% block extrahead %}{% endblock %} +{% block title %}{% endblock %} + +{% block extrastyle %}{% endblock %} + +{% if LANGUAGE_BIDI %}{% endif %} + +{% block extrahead %}{% endblock %} +{% block blockbots %}{% endblock %} - -
+{% load i18n %} - -
- {% if not is_popup %} + - - {% include "admin/includes_grappelli/header.html" %} - - -
- - -
- {% endif %} -
+ +
- -
- - - {% if messages %} -
    - {% for message in messages %} - {{ message }} - {% endfor %} -
- {% endif %} + {% if not is_popup %} + + + + {% block breadcrumbs %} +
+ {% trans 'Home' %} + {% if title %} › {{ title }}{% endif %} +
+ {% endblock %} + {% endif %} - -
- {% block pretitle %}{% endblock %} - {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} - {% block object-tools %}{% endblock %} -
+ {% block messages %} + {% if messages %} +
    {% for message in messages %} + {{ message }} + {% endfor %}
+ {% endif %} + {% endblock messages %} - -
- {% block content %} - {{ content }} - {% block filters %}{% endblock %} - {% endblock %} -
+ +
+ {% block pretitle %}{% endblock %} + {% block content_title %}{% if title %}

{{ title }}

{% endif %}{% endblock %} + {% block content %} + {% block object-tools %}{% endblock %} + {{ content }} + {% endblock %} + {% block sidebar %}{% endblock %} +
+
+ -
- - - {% block footer %}{% endblock %} + {% block footer %}{% endblock %} +
+ -
diff --git a/design/templates/admin/buttons.html b/design/templates/admin/buttons.html index e1a7a98..9bd6f00 100644 --- a/design/templates/admin/buttons.html +++ b/design/templates/admin/buttons.html @@ -14,25 +14,23 @@ .item a { min-width: 150px; font-size: 110%; - border: 1px solid #BDBDBD !important; position: relative; display: inline-block; margin: 0px; padding: 5px; height: 28px; font-weight: bold; - border-radius: 5px 5px 5px 5px !important; -moz-box-sizing: border-box; cursor: pointer; overflow: hidden; vertical-align: top; color: rgb(255, 255, 255); - border: 1px solid rgb(43, 138, 171); - background-image: linear-gradient(rgb(79, 178, 211), rgb(48, 155, 191)); + border: 2px solid rgb(91, 128, 178); + background: url("../img/default-bg.gif") repeat-x scroll center bottom rgb(124, 160, 199); } -
+

Publish Site

{% if message %} diff --git a/design/templates/admin/index.html b/design/templates/admin/index.html index cbb2904..cbaa89f 100644 --- a/design/templates/admin/index.html +++ b/design/templates/admin/index.html @@ -1,79 +1,86 @@ {% extends "admin/base_site.html" %} +{% load i18n admin_static %} - -{% load i18n grp_tags log %} +{% block extrastyle %}{{ block.super }}{% endblock %} - -{% block javascripts %} - {{ block.super }} -{% endblock %} +{% block coltype %}colMS{% endblock %} - -{% block breadcrumbs %} -
    -
  • {% trans "Home" %}
    • -
-{% endblock %} -{% block content_title %} - {% if title %} -

{{ title }}

- {% endif %} -{% endblock %} +{% block breadcrumbs %}{% endblock %} - {% block content %} -
-
- {% for app in app_list %} -
-

{% trans app.name %}

- {% for model in app.models %} -
- {% if model.perms.change %}{{ model.name }}{% else %}{{ model.name }}{% endif %} - {% if model.perms.add or model.perms.change %} - - {% endif %} -
- {% endfor %} -
- {% empty %} -

{% trans "You don´t have permission to edit anything." %}

- {% endfor %} +
+ +{% if app_list %} + {% for app in app_list %} +
+ + + {% for model in app.models %} + + {% if model.admin_url %} + + {% else %} + + {% endif %} + + {% if model.add_url %} + + {% else %} + + {% endif %} + + {% if model.admin_url %} + + {% else %} + + {% endif %} + + {% endfor %} +
+ + {% blocktrans with name=app.name %}{{ name }}{% endblocktrans %} + +
{{ model.name }}{{ model.name }}{% trans 'Add' %} {% trans 'Change' %} 
+ {% endfor %} +{% else %} +

{% trans "You don't have permission to edit anything." %}

+{% endif %} +
+{% endblock %} + +{% block sidebar %} + +
{% include 'admin/buttons.html' %} -
-
-

{% trans 'Recent Actions' %}

-
-

{% trans 'My Actions' %}

- {% get_admin_log 10 as admin_log for_user user %} - {% if not admin_log %} -

{% trans 'None available' %}

- {% else %} -
    - {% for entry in admin_log %} -
  • - {% if entry.is_deletion %} - {{ entry.object_repr }} - {% else %} - {{ entry.object_repr }} - {% endif %} - {% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %} -
    • - {% endfor %} -
- {% endif %} -
-
-
+
+

{% trans 'Recent Actions' %}

+

{% trans 'My Actions' %}

+ {% load log %} + {% get_admin_log 10 as admin_log for_user user %} + {% if not admin_log %} +

{% trans 'None available' %}

+ {% else %} +
    + {% for entry in admin_log %} +
  • + {% if entry.is_deletion or not entry.get_admin_url %} + {{ entry.object_repr }} + {% else %} + {{ entry.object_repr }} + {% endif %} +
    + {% if entry.content_type %} + {% filter capfirst %}{% trans entry.content_type.name %}{% endfilter %} + {% else %} + {% trans 'Unknown content' %} + {% endif %} +
    • + {% endfor %} +
+ {% endif %}
+
{% endblock %} - -- cgit v1.2.3-70-g09d2