projets / auf_django_skin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: ad83703)
Version 1.3
authorEric Mc Sween <eric.mcsween@auf.org>
Thu, 16 Feb 2012 20:18:16 +0000 (15:18 -0500)
committerEric Mc Sween <eric.mcsween@auf.org>
Thu, 16 Feb 2012 20:18:16 +0000 (15:18 -0500)
* Retrait de auf.django.idle

* Importer django.conf.settings plutôt que settings directement

CHANGES patch | blob | blame | history
auf/django/skin/context_processors.py patch | blob | blame | history
auf/django/skin/static/skin/css/admin.css patch | blob | blame | history
auf/django/skin/templates/admin/base.html patch | blob | blame | history
auf/django/skin/templates/base.html patch | blob | blame | history
auf/django/skin/templatetags/__init__.py [changed mode: 0755->0644] patch | blob | blame | history
setup.py patch | blob | blame | history

diff --git a/CHANGES b/CHANGES
index fb9c5e4..721cc3d 100755 (executable)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.3
+---
+
+* Retrait de auf.django.idle
+
+* Importer django.conf.settings plutôt que settings directement
+
 1.2
 ---
 
diff --git a/auf/django/skin/context_processors.py b/auf/django/skin/context_processors.py
index c15e3a1..08a1688 100755 (executable)
--- a/auf/django/skin/context_processors.py
+++ b/auf/django/skin/context_processors.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-import settings
 from auf.django.references import models as ref
+from django.conf import settings
 
 PROJET_TITRE_KEY = 'PROJET_TITRE'
 
diff --git a/auf/django/skin/static/skin/css/admin.css b/auf/django/skin/static/skin/css/admin.css
index 39da283..a8da924 100755 (executable)
--- a/auf/django/skin/static/skin/css/admin.css
+++ b/auf/django/skin/static/skin/css/admin.css
@@ -4,3 +4,10 @@
     text-indent: 0 !important;
     width: auto !important;
 }
+
+.actions li {
+    list-style-type: none;
+    display: inline;
+    padding: 0 1em;
+}
+
diff --git a/auf/django/skin/templates/admin/base.html b/auf/django/skin/templates/admin/base.html
index f1dd1c6..b09e272 100755 (executable)
--- a/auf/django/skin/templates/admin/base.html
+++ b/auf/django/skin/templates/admin/base.html
@@ -1,4 +1,4 @@
-{% load i18n theming_tags idle %}
+{% load i18n theming_tags %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
 <head>
@@ -9,7 +9,6 @@
 {% if LANGUAGE_BIDI %}<link rel="stylesheet" type="text/css" href="{% block stylesheet_rtl %}{% admin_media_prefix %}css/rtl.css{% endblock %}" />{% endif %}
 {% render_theming_css %}
 <script type="text/javascript">window.__admin_media_prefix__ = "{% filter escapejs %}{% admin_media_prefix %}{% endfilter %}";</script>
-{% idle_head %}
 {% block extrahead %}{% endblock %}
 {% block blockbots %}<meta name="robots" content="NONE,NOARCHIVE" />{% endblock %}
 </head>
@@ -20,7 +19,6 @@
 <!-- Container -->
 <div id="container">
     {% if not is_popup %}
-    {% idle_box %}
     <!-- Header -->
     <div id="header">
         <div id="branding">
diff --git a/auf/django/skin/templates/base.html b/auf/django/skin/templates/base.html
index b8db859..a38e9ad 100755 (executable)
--- a/auf/django/skin/templates/base.html
+++ b/auf/django/skin/templates/base.html
@@ -1,4 +1,3 @@
-{% load idle %}
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" lang="{{ LANGUAGE_CODE }}" xml:lang="{{ LANGUAGE_CODE }}" {% if LANGUAGE_BIDI %}dir="rtl"{% endif %}>
   <head>
@@ -6,14 +5,11 @@
     <title>{% block title %}AUF - {{ AUF_SITE }}{% endblock %}</title>
     <link rel="icon" type="image/png" href="{{ STATIC_URL }}skin/images/favicon.ico" />
     <link rel="stylesheet" type="text/css" href="{{ STATIC_URL }}skin/css/auf.css" media="all"/>
-    {% idle_head %}
     {% block extrahead %}{% endblock %}
   </head>
 
   <body class="{% block bodyclass %}{% endblock %}">
 
-    {% idle_box %}
-
     <div id="header">
 
       <div id="logo">
diff --git a/auf/django/skin/templatetags/__init__.py b/auf/django/skin/templatetags/__init__.py
old mode 100755 (executable)
new mode 100644 (file)
diff --git a/setup.py b/setup.py
index 8ec8c14..a15deec 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -4,7 +4,7 @@ from setuptools import setup, find_packages
 import sys, os
 
 name = 'auf.django.skin'
-version = '1.2'
+version = '1.3'
 
 setup(name=name,
       version=version,
@@ -21,14 +21,4 @@ setup(name=name,
       packages=find_packages(exclude=['ez_setup', 'examples', 'tests']),
       include_package_data=True,
       zip_safe=False,
-      dependency_links = [
-          'http://pypi.auf.org/auf.django.idle',
-      ],
-      install_requires=[
-          # -*- Extra requirements: -*-
-          'auf.django.idle',
-      ],
-      entry_points="""
-      # -*- Entry points: -*-
-      """,
       )
auf_django_skin