From 6498095e2b970260668d327dae7b818f534d8ac3 Mon Sep 17 00:00:00 2001
From: Oskar Hahn <mail@oshahn.de>
Date: Thu, 9 Feb 2012 16:57:10 +0100
Subject: [PATCH] create setup.py to install openslides

---
 .hgignore                                     |  5 +++
 MANIFEST.in                                   | 10 ++++++
 manage.py                                     |  6 ----
 openslides/__init__.py                        |  6 ++--
 .../agenda/templates/agenda/base_agenda.html  |  2 ++
 openslides/agenda/templates/agenda/edit.html  |  3 ++
 .../agenda/templates/agenda/overview.html     |  3 ++
 .../application/base_application.html         |  2 ++
 .../templates/application/edit.html           |  4 +++
 .../templates/application/import.html         |  5 ++-
 .../templates/application/overview.html       |  7 ++--
 .../templates/application/poll_view.html      |  3 ++
 .../templates/application/view.html           |  6 +++-
 .../templates/assignment/base_assignment.html |  2 ++
 .../assignment/templates/assignment/edit.html |  3 ++
 .../templates/assignment/overview.html        |  4 +++
 .../templates/assignment/poll_view.html       |  3 ++
 .../assignment/templates/assignment/view.html |  4 +++
 openslides/default.settings.py                |  3 +-
 .../participant/base_participant.html         |  2 ++
 .../templates/participant/edit.html           |  3 ++
 .../templates/participant/group_edit.html     |  3 ++
 .../templates/participant/group_overview.html |  3 ++
 .../templates/participant/import.html         |  3 ++
 .../templates/participant/login.html          |  5 ++-
 .../templates/participant/overview.html       |  3 ++
 .../templates/participant/settings.html       |  7 ++--
 .../templates/projector/default.html          |  3 ++
 openslides/templates/403.html                 |  6 ++--
 openslides/templates/404.html                 |  6 ++--
 openslides/templates/500.html                 |  6 ++--
 openslides/templates/base.html                |  4 ++-
 setup.py                                      | 33 +++++++++++++++++++
 33 files changed, 136 insertions(+), 32 deletions(-)
 create mode 100644 MANIFEST.in
 create mode 100644 setup.py

diff --git a/.hgignore b/.hgignore
index da159186b..b6ae45eff 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,3 +7,8 @@
 ~$
 \.DS_Store$
 ^docs/_build
+^dist/
+^versiontools
+
+syntax:glob
+*.egg-info
diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 000000000..36f436eed
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1,10 @@
+include AUTHORS
+include LICENSE
+include INSTALL
+include CHANGELOG
+include initial_data.json
+include manage.py
+include THANKS
+recursive-include openslides/static *
+recursive-include openslides/locale *.mo *.po
+recursive-include openslides *.html
diff --git a/manage.py b/manage.py
index 186080547..8703a7bf0 100644
--- a/manage.py
+++ b/manage.py
@@ -12,12 +12,6 @@
 
 from django.core.management import execute_manager
 
-import os, site
-
-SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
-
-site.addsitedir(os.path.join(SITE_ROOT, 'openslides'))
-
 try:
     from openslides import settings
 except ImportError:
diff --git a/openslides/__init__.py b/openslides/__init__.py
index 1b2216072..5658e025d 100644
--- a/openslides/__init__.py
+++ b/openslides/__init__.py
@@ -1,7 +1,5 @@
 VERSION = (1, 2, 0, 'alpha', 0)
 
-from django.template import add_to_builtins
-
 def get_version(version=None):
     """Derives a PEP386-compliant version number from VERSION."""
     if version is None:
@@ -69,5 +67,7 @@ def hg_version():
 
     return version
 
+import os, site
 
-add_to_builtins('django.templatetags.i18n')
+SITE_ROOT = os.path.realpath(os.path.dirname(__file__))
+site.addsitedir(SITE_ROOT)
diff --git a/openslides/agenda/templates/agenda/base_agenda.html b/openslides/agenda/templates/agenda/base_agenda.html
index 6d9e54097..1e937b7ab 100644
--- a/openslides/agenda/templates/agenda/base_agenda.html
+++ b/openslides/agenda/templates/agenda/base_agenda.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
+{% load i18n %}
 
 {% block submenu %}
     {% url item_overview as url_itemoverview %}
diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html
index 849a61f82..e9a133621 100644
--- a/openslides/agenda/templates/agenda/edit.html
+++ b/openslides/agenda/templates/agenda/edit.html
@@ -1,4 +1,7 @@
 {% extends "agenda/base_agenda.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Item" %}{% endblock %}
 
 {% block content %}
diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html
index aa32e4b11..67c81d835 100644
--- a/openslides/agenda/templates/agenda/overview.html
+++ b/openslides/agenda/templates/agenda/overview.html
@@ -1,5 +1,8 @@
 {% extends "agenda/base_agenda.html" %}
+
 {% load tags %}
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {% trans "Agenda" %}{% endblock %}
 
 {% block header %}
diff --git a/openslides/application/templates/application/base_application.html b/openslides/application/templates/application/base_application.html
index 0f0506fd4..5866e479a 100644
--- a/openslides/application/templates/application/base_application.html
+++ b/openslides/application/templates/application/base_application.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
+{% load i18n %}
 
 {% block submenu %}
     {% url application_overview as url_applicationoverview %}
diff --git a/openslides/application/templates/application/edit.html b/openslides/application/templates/application/edit.html
index 4a0169caa..692f06844 100644
--- a/openslides/application/templates/application/edit.html
+++ b/openslides/application/templates/application/edit.html
@@ -1,4 +1,8 @@
 {% extends "application/base_application.html" %}
+
+{% load i18n %}
+
+
 {% block title %}{{ block.super }} - {%trans "Application" %}{% endblock %}
 
 {% block content %}
diff --git a/openslides/application/templates/application/import.html b/openslides/application/templates/application/import.html
index 2bec6fede..de067c1c1 100644
--- a/openslides/application/templates/application/import.html
+++ b/openslides/application/templates/application/import.html
@@ -1,11 +1,14 @@
 {% extends "application/base_application.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Import applications" %} {% endblock %}
 
 {% block content %}
     <h1>{%trans "Import applications" %}</h1>
     <p>{% trans 'Select a CSV file to import applications!' %}</p>
 
-	<p>{% trans '(Required comma separated values: <code>number, title, text, reason, first_name, last_name</code> - <code>number</code> and <code>reason</code> are optional and may be empty)' %} </p>
+    <p>{% trans '(Required comma separated values: <code>number, title, text, reason, first_name, last_name</code> - <code>number</code> and <code>reason</code> are optional and may be empty)' %} </p>
     <form enctype="multipart/form-data" action="" method="post">{% csrf_token %}
         {{ form.as_p }}
         <button class="button" type="submit">
diff --git a/openslides/application/templates/application/overview.html b/openslides/application/templates/application/overview.html
index c1a42d47e..c94a95a36 100644
--- a/openslides/application/templates/application/overview.html
+++ b/openslides/application/templates/application/overview.html
@@ -1,6 +1,9 @@
 {% extends "application/base_application.html" %}
-{% block title %}{{ block.super }} - {%trans "Applications" %}{% endblock %}
+
 {% load tags %}
+{% load i18n %}
+
+{% block title %}{{ block.super }} - {%trans "Applications" %}{% endblock %}
 
 {% block content %}
     <h1>{%trans "Applications" %}</h1>
@@ -13,7 +16,7 @@
         <input type="checkbox" name="number" onchange="document.forms['filter'].submit()"
             {% if 'on' in request.GET.number %}checked{% endif %}> {%trans "Without number" %} &nbsp;
         <input type="checkbox" name="status" onchange="document.forms['filter'].submit()"
-            {% if 'on' in request.GET.status %}checked{% endif %}> {%trans "Status" %}: 
+            {% if 'on' in request.GET.status %}checked{% endif %}> {%trans "Status" %}:
         <select class="default-input" name="statusvalue" onchange="{% if 'on' in request.GET.status %}document.forms['filter'].submit(){% endif %}">
             <option value="pub" {% if 'pub' in request.GET.statusvalue %}selected{% endif %}>{%trans "Not yet permitted" %}</option>
             <option value="per" {% if 'on' in request.GET.status and 'per' in request.GET.statusvalue %}selected{% endif %}>{%trans "Permitted" %}</option>
diff --git a/openslides/application/templates/application/poll_view.html b/openslides/application/templates/application/poll_view.html
index f0d5feba2..ab83ab86c 100644
--- a/openslides/application/templates/application/poll_view.html
+++ b/openslides/application/templates/application/poll_view.html
@@ -1,4 +1,7 @@
 {% extends 'application/base_application.html' %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {{ poll }}{% endblock %}
 
 {% if perms.application.can_manage_application %}
diff --git a/openslides/application/templates/application/view.html b/openslides/application/templates/application/view.html
index de52fb8bc..f8b40b979 100644
--- a/openslides/application/templates/application/view.html
+++ b/openslides/application/templates/application/view.html
@@ -1,6 +1,10 @@
 {% extends "application/base_application.html" %}
-{% block title %}{{ block.super }} - {% trans "Application" %} "{{ version.title }}"{% endblock %}
+
 {% load tags %}
+{% load i18n %}
+
+{% block title %}{{ block.super }} - {% trans "Application" %} "{{ version.title }}"{% endblock %}
+
 
 {% block content %}
     <div id="sidebar">
diff --git a/openslides/assignment/templates/assignment/base_assignment.html b/openslides/assignment/templates/assignment/base_assignment.html
index 60fd712c7..040336377 100644
--- a/openslides/assignment/templates/assignment/base_assignment.html
+++ b/openslides/assignment/templates/assignment/base_assignment.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
+{% load i18n %}
 
 {% block header %}
     <link type="text/css" rel="stylesheet" media="all" href="/static/styles/assignment.css" />
diff --git a/openslides/assignment/templates/assignment/edit.html b/openslides/assignment/templates/assignment/edit.html
index 0745d8eb6..7786da704 100644
--- a/openslides/assignment/templates/assignment/edit.html
+++ b/openslides/assignment/templates/assignment/edit.html
@@ -1,4 +1,7 @@
 {% extends "assignment/base_assignment.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Election" %}{% endblock %}
 
 {% block content %}
diff --git a/openslides/assignment/templates/assignment/overview.html b/openslides/assignment/templates/assignment/overview.html
index 390eac4bb..106f17d17 100644
--- a/openslides/assignment/templates/assignment/overview.html
+++ b/openslides/assignment/templates/assignment/overview.html
@@ -1,4 +1,8 @@
 {% extends "assignment/base_assignment.html" %}
+
+{% load i18n %}
+
+
 {% block title %}{{ block.super }} - {%trans "Elections" %}{% endblock %}
 
 {% block content %}
diff --git a/openslides/assignment/templates/assignment/poll_view.html b/openslides/assignment/templates/assignment/poll_view.html
index 233ebb300..2ebb5ba2c 100644
--- a/openslides/assignment/templates/assignment/poll_view.html
+++ b/openslides/assignment/templates/assignment/poll_view.html
@@ -1,4 +1,7 @@
 {% extends 'assignment/base_assignment.html' %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Poll" %} "{{ poll }}"{% endblock %}
 
 {% block content %}
diff --git a/openslides/assignment/templates/assignment/view.html b/openslides/assignment/templates/assignment/view.html
index 2a5d56754..99b165ca2 100644
--- a/openslides/assignment/templates/assignment/view.html
+++ b/openslides/assignment/templates/assignment/view.html
@@ -1,4 +1,8 @@
 {% extends "assignment/base_assignment.html" %}
+
+{% load i18n %}
+
+
 {% block title %}{{ block.super }} - {% trans "Assignment" %} "{{ assignment }}"{% endblock %}
 
 {% block content %}
diff --git a/openslides/default.settings.py b/openslides/default.settings.py
index d4ad10687..e68478bb9 100644
--- a/openslides/default.settings.py
+++ b/openslides/default.settings.py
@@ -19,8 +19,9 @@ TEMPLATE_DEBUG = DEBUG
 
 AUTH_PROFILE_MODULE = 'participant.Profile'
 AUTHENTICATION_BACKENDS = ('django.contrib.auth.backends.ModelBackend', 'openslides.system.auth.AnonymousAuth',)
+
 LOGIN_URL = '/login/'
-LOGIN_REDIRECT_URL = '/agenda/'
+LOGIN_REDIRECT_URL = '/'
 
 ADMINS = (
     # ('Your Name', 'your_email@domain.com'),
diff --git a/openslides/participant/templates/participant/base_participant.html b/openslides/participant/templates/participant/base_participant.html
index 869853106..7654653d5 100644
--- a/openslides/participant/templates/participant/base_participant.html
+++ b/openslides/participant/templates/participant/base_participant.html
@@ -1,5 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
+{% load i18n %}
 
 {% block submenu %}
     {% url user_overview as url_users %}
diff --git a/openslides/participant/templates/participant/edit.html b/openslides/participant/templates/participant/edit.html
index 23004db1a..f6af8a28e 100644
--- a/openslides/participant/templates/participant/edit.html
+++ b/openslides/participant/templates/participant/edit.html
@@ -1,4 +1,7 @@
 {% extends "participant/base_participant.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Participant" %} {% endblock %}
 
 {% block content %}
diff --git a/openslides/participant/templates/participant/group_edit.html b/openslides/participant/templates/participant/group_edit.html
index 95209bfea..4ddcdc054 100644
--- a/openslides/participant/templates/participant/group_edit.html
+++ b/openslides/participant/templates/participant/group_edit.html
@@ -1,4 +1,7 @@
 {% extends "participant/base_participant.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "User Group" %} {% endblock %}
 
 {% block content %}
diff --git a/openslides/participant/templates/participant/group_overview.html b/openslides/participant/templates/participant/group_overview.html
index c96172ce7..9f3c59b24 100644
--- a/openslides/participant/templates/participant/group_overview.html
+++ b/openslides/participant/templates/participant/group_overview.html
@@ -1,4 +1,7 @@
 {% extends "participant/base_participant.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Groups" %}{% endblock %}
 
 {% block content %}
diff --git a/openslides/participant/templates/participant/import.html b/openslides/participant/templates/participant/import.html
index 5acdee1b7..369e78572 100644
--- a/openslides/participant/templates/participant/import.html
+++ b/openslides/participant/templates/participant/import.html
@@ -1,4 +1,7 @@
 {% extends "participant/base_participant.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Import participants" %} {% endblock %}
 
 {% block content %}
diff --git a/openslides/participant/templates/participant/login.html b/openslides/participant/templates/participant/login.html
index 61294fac9..190ec38a7 100644
--- a/openslides/participant/templates/participant/login.html
+++ b/openslides/participant/templates/participant/login.html
@@ -1,14 +1,13 @@
 {% extends "participant/base_participant.html" %}
 
+{% load i18n %}
+
 {% block mainmenu %}
     <ul>
         <li class="selected"><a href="{% url user_login %}" title="">{%trans "Login" %}</a></li>
     </ul>
 {% endblock %}
 
-{% block submenu %}
-{% endblock %}
-
 {% block content %}
     <h1>{%trans "Login" %}</h1>
 
diff --git a/openslides/participant/templates/participant/overview.html b/openslides/participant/templates/participant/overview.html
index 978d2acb7..44bbaca10 100644
--- a/openslides/participant/templates/participant/overview.html
+++ b/openslides/participant/templates/participant/overview.html
@@ -1,4 +1,7 @@
 {% extends "participant/base_participant.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Participants" %}{% endblock %}
 
 {% block content %}
diff --git a/openslides/participant/templates/participant/settings.html b/openslides/participant/templates/participant/settings.html
index a35fc7541..003078779 100644
--- a/openslides/participant/templates/participant/settings.html
+++ b/openslides/participant/templates/participant/settings.html
@@ -1,4 +1,7 @@
 {% extends "base.html" %}
+
+{% load i18n %}
+
 {% block title %}{{ block.super }} - {%trans "Your Settings" %}{% endblock %}
 
 {% block submenu %}
@@ -10,7 +13,7 @@
     <form action="" method="post">{% csrf_token %}
         {{ form_user.as_p }}
         {{ form_password.as_p }}
-        
+
         <button class="button" type="submit">
             <span class="icon ok">{%trans 'Save' %}</span>
         </button>
@@ -21,4 +24,4 @@
         </a>
     </form>
     <p></p>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/openslides/projector/templates/projector/default.html b/openslides/projector/templates/projector/default.html
index 19fc3c24f..f0945c564 100644
--- a/openslides/projector/templates/projector/default.html
+++ b/openslides/projector/templates/projector/default.html
@@ -1,5 +1,8 @@
 {% extends "base-projector.html" %}
+
 {% load tags %}
+{% load i18n %}
+
 {% block content %}
     <h1>{% get_config 'event_name' %}</h1>
     {% get_config 'event_description' %}
diff --git a/openslides/templates/403.html b/openslides/templates/403.html
index 7e3a25752..acb867cbb 100644
--- a/openslides/templates/403.html
+++ b/openslides/templates/403.html
@@ -1,9 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
-
-
-{% block submenu %}
-{% endblock %}
+{% load i18n %}
 
 {% block content %}
     <h1>{{ error }}</h1>
diff --git a/openslides/templates/404.html b/openslides/templates/404.html
index bebe5c25f..477b48a00 100644
--- a/openslides/templates/404.html
+++ b/openslides/templates/404.html
@@ -1,9 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
-
-
-{% block submenu %}
-{% endblock %}
+{% load i18n %}
 
 {% block content %}
     <h1>{%trans "Page not found."%}</h1>
diff --git a/openslides/templates/500.html b/openslides/templates/500.html
index 8c51a4f9f..75d37675b 100644
--- a/openslides/templates/500.html
+++ b/openslides/templates/500.html
@@ -1,9 +1,7 @@
 {% extends "base.html" %}
+
 {% load tags %}
-
-
-{% block submenu %}
-{% endblock %}
+{% load i18n %}
 
 {% block content %}
     <h1>{%trans "Server Error"%}</h1>
diff --git a/openslides/templates/base.html b/openslides/templates/base.html
index c674e5fbd..08e2fc969 100644
--- a/openslides/templates/base.html
+++ b/openslides/templates/base.html
@@ -1,9 +1,11 @@
+{% load tags %}
+{% load i18n %}
+
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
     "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
 <head>
-    {% load tags %}
     <title>{% block title %}{% get_config 'event_name' %}{% endblock %}</title>
     <link type="text/css" rel="stylesheet" media="all" href="/static/styles/base.css" />
     <link rel="shortcut icon" href="/static/images/favicon.png" type="image/png" />
diff --git a/setup.py b/setup.py
new file mode 100644
index 000000000..758f18ec6
--- /dev/null
+++ b/setup.py
@@ -0,0 +1,33 @@
+from setuptools import setup
+from setuptools import find_packages
+from openslides import get_version
+
+setup(
+    name='openslides',
+    description='Presentation-System',
+    version=get_version(),
+    url='http://openslides.org',
+    author='OpenSlides-Team',
+    author_email='support@openslides.org',
+    license='GPL2+',
+    packages=find_packages(),
+    include_package_data = True,
+    classifiers = [
+        # http://pypi.python.org/pypi?%3Aaction=list_classifiers
+        'Development Status :: 5 - Production/Stable',
+        'Environment :: Web Environment',
+        'Intended Audience :: Other Audience',
+        'Framework :: Django',
+        'License :: OSI Approved :: GNU General Public License (GPL)',
+        'Operating System :: OS Independent',
+        'Programming Language :: Python',
+    ],
+    setup_requires=[
+        'versiontools >= 1.6',
+    ],
+    install_requires=[
+        'django >= 1.3',
+        'reportlab',
+        'pil',
+    ]
+)