From 13cd52bd96e0af142155afc000914fcdb4d2d5c5 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sat, 5 Jan 2013 15:29:57 +0100 Subject: [PATCH] Merged (conflicts). --- .gitignore | 10 ++-- .travis.yml | 2 +- INSTALL.txt | 6 +- openslides/__init__.py | 2 +- .../agenda/templates/agenda/config.html | 4 +- openslides/agenda/templates/agenda/edit.html | 6 +- .../agenda/templates/agenda/item_row.html | 6 +- .../agenda/templates/agenda/overview.html | 8 +-- .../agenda/templates/agenda/widget.html | 10 ++-- .../templates/assignment/config.html | 4 +- .../assignment/templates/assignment/edit.html | 4 +- .../templates/assignment/overview.html | 14 ++--- .../templates/assignment/poll_view.html | 8 +-- .../assignment/templates/assignment/view.html | 37 ++++++------ .../templates/assignment/widget.html | 4 +- .../config/templates/config/general.html | 4 +- openslides/global_settings.py | 4 +- openslides/main.py | 3 - .../motion/templates/motion/base_motion.html | 30 +++++----- .../motion/templates/motion/config.html | 4 +- openslides/motion/templates/motion/edit.html | 6 +- .../motion/templates/motion/import.html | 4 +- .../motion/templates/motion/overview.html | 16 ++--- .../motion/templates/motion/poll_view.html | 10 ++-- openslides/motion/templates/motion/view.html | 58 +++++++++---------- .../motion/templates/motion/widget.html | 4 +- openslides/motion/views.py | 8 +-- openslides/participant/api.py | 3 - openslides/participant/forms.py | 3 + .../templates/participant/config.html | 2 +- .../templates/participant/edit.html | 6 +- .../templates/participant/group_edit.html | 4 +- .../templates/participant/group_overview.html | 8 +-- .../templates/participant/group_widget.html | 4 +- .../templates/participant/import.html | 4 +- .../templates/participant/login.html | 10 +++- .../templates/participant/overview.html | 26 ++++----- .../templates/participant/settings.html | 11 ++++ .../templates/participant/user_widget.html | 4 +- openslides/participant/views.py | 23 ++++---- .../projector/control_countdown.html | 11 ++-- .../projector/control_overlay_message.html | 3 +- .../projector/custom_slide_widget.html | 18 +++--- .../templates/projector/dashboard.html | 2 +- .../templates/projector/live_view_widget.html | 14 ++--- .../projector/templates/projector/new.html | 2 +- .../templates/projector/overlay_widget.html | 4 +- .../templates/projector/select_widgets.html | 2 +- openslides/templates/base.html | 13 +++-- openslides/utils/jsonfield/fields.py | 4 +- openslides/utils/pdf.py | 3 +- openslides/utils/utils.py | 6 +- openslides/utils/views.py | 6 +- requirements.txt | 15 +++-- 54 files changed, 239 insertions(+), 248 deletions(-) diff --git a/.gitignore b/.gitignore index 7f7a1c453..b8b12bc11 100644 --- a/.gitignore +++ b/.gitignore @@ -1,18 +1,16 @@ .venv/* -openslides/.venv/ *.pyc *.swp -openslides/settings.py -database.db *~ -extras/website/* -extras/website-old/* +settings.py +database.sqlite + +# Package building docs/_build/* *.egg-info build/* dist/* .DS_Store -settings.py versiontools* # Unit test / coverage reports diff --git a/.travis.yml b/.travis.yml index f91d92918..ade84bd88 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,9 +1,9 @@ language: python python: - - "2.5" - "2.6" - "2.7" install: + - easy_install https://www.djangoproject.com/download/1.5b2/tarball/ - pip install -r requirements.txt --use-mirrors - python extras/scripts/create_local_settings.py script: diff --git a/INSTALL.txt b/INSTALL.txt index f57e7f00e..739431350 100644 --- a/INSTALL.txt +++ b/INSTALL.txt @@ -18,7 +18,7 @@ I. Installation on GNU/Linux and MacOSX using the Python Package Index (PyPI) 1. Check requirements: Make sure that you have installed Python Programming Language 2 - (>= 2.5) on your system. + (>= 2.6) on your system. 2. Setup a virtual environment with virtualenv (optional): @@ -65,7 +65,7 @@ II. Installation on GNU/Linux and MacOSX using the sources OpenSlides requires following programs, which should be installed first: - + Python Programming Language 2 (>= 2.5) + + Python Programming Language 2 (>= 2.6) + virtualenv (>= 1.4.1) + ReportLab Toolkit + Python Imaging Library (PIL) @@ -141,7 +141,7 @@ portable version you should run the following install steps. The OpenSlides install requires following programs, which should be installed first: - + Python Programming Language 2 (>= 2.5) + + Python Programming Language 2 (>= 2.6) + Setuptools a) Download and run 32bit MSI installer from http://www.python.org/: diff --git a/openslides/__init__.py b/openslides/__init__.py index 7cd9d7464..dcf78b46d 100644 --- a/openslides/__init__.py +++ b/openslides/__init__.py @@ -5,7 +5,7 @@ :license: GNU GPL, see LICENSE for more details. """ -VERSION = (1, 4, 0, 'alpha', 0) # During development it is the next release +VERSION = (1, 4, 0, 'alpha', 1) # During development it is the next release RELEASE = False diff --git a/openslides/agenda/templates/agenda/config.html b/openslides/agenda/templates/agenda/config.html index 4c2a85804..db29bde09 100644 --- a/openslides/agenda/templates/agenda/config.html +++ b/openslides/agenda/templates/agenda/config.html @@ -14,8 +14,8 @@ - - diff --git a/openslides/agenda/templates/agenda/edit.html b/openslides/agenda/templates/agenda/edit.html index 2291fbc2a..e022f59ac 100644 --- a/openslides/agenda/templates/agenda/edit.html +++ b/openslides/agenda/templates/agenda/edit.html @@ -19,7 +19,7 @@ {% trans "New item" %} {% endif %} - {% trans "Back to overview" %} + {% trans "Back to overview" %}
{% csrf_token %} @@ -42,8 +42,8 @@ - - diff --git a/openslides/agenda/templates/agenda/item_row.html b/openslides/agenda/templates/agenda/item_row.html index 4846b62e5..d8bfc5114 100644 --- a/openslides/agenda/templates/agenda/item_row.html +++ b/openslides/agenda/templates/agenda/item_row.html @@ -5,7 +5,7 @@ {% if perms.agenda.can_manage_agenda %} - + {% elif item.closed %} @@ -32,7 +32,7 @@ {% if perms.projector.can_manage_projector %} - + {% endif %} @@ -40,7 +40,7 @@ {% if not item.is_leaf_node %} - + {% endif %} diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index ed8f6f8e6..af86c2276 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -48,7 +48,7 @@

{% trans "Do you want to save the changed order of agenda items?" %}

- {% trans 'No' %} + {% trans 'No' %}

{% endif %} @@ -56,9 +56,9 @@

{% trans "Agenda" %} {% if perms.agenda.can_manage_agenda %} - {% trans "New" %} + {% trans "New" %} {% endif %} - PDF + PDF

@@ -95,7 +95,7 @@ {% if perms.projector.can_manage_projector %} - + diff --git a/openslides/agenda/templates/agenda/widget.html b/openslides/agenda/templates/agenda/widget.html index e638756b8..b1dc4bdd2 100644 --- a/openslides/agenda/templates/agenda/widget.html +++ b/openslides/agenda/templates/agenda/widget.html @@ -4,10 +4,10 @@