Commit Graph

123 Commits

Author SHA1 Message Date
Norman Jäckel
21ff62dd32 Changes in projector and core app and in utils.
Changed api for main menu entries.
Enhanced http error pages using a classed based views.
Moved dashboard and select widgets view from projector to core app.
Also some small clean ups.
2014-01-10 16:17:54 +01:00
Norman Jäckel
1fb1f17d15 New API for widgets using a metaclass.
It is now possible to define a default state and to submit extra stylefiles and javascript files when defining a widget in an app. This is done by a new metaclass in openslides.utils.dispatch. Also fixed some other tests.
2013-12-01 21:30:12 +01:00
Oskar Hahn
0752d476e4 Change to MIT Licence
* Remove headers
* Changed lineendings to linux style in AUTHORS and CHANGELOG
2013-11-04 14:57:30 +01:00
Oskar Hahn
d937262d28 Use flake8 instead of pep8. Orderd the imports with isort
* changed the fab-command pep8 to check
* checked and fixed any code with flake8. Also the urls.py
* checkt the projector app with pylint
2013-10-14 18:43:12 +02:00
Oskar Hahn
d644d49579 Cleaned up utils 2013-10-13 20:43:26 +02:00
Oskar Hahn
6aae8bff15 More projector fixtures
* Update projector when polls are updated.
* Update projector when assignment candidates are updated
* Update projector when motion submitter are updated
* Fixed the assignment publish poll view
* Added projector.api.register_slide_model
2013-10-10 18:40:24 +02:00
Max Brauer
bf4825a3e0 Refactored assignments app to use class based views instead of
functions.
2013-09-14 18:20:35 +02:00
Norman Jäckel
a50617676a Add default sorting of widgets. Fix #493 2013-09-07 15:13:27 +02:00
Norman Jäckel
c800884a43 Use GenericForeignKey for agenda related items, fix #865 2013-09-07 14:30:25 +02:00
Norman Jäckel
3afc58be9e Add request to all widgets, fixed #653 2013-06-13 23:45:30 +02:00
Oskar Hahn
efd10eaecc Fixed #718
An string argument was not used in the assignment app
2013-06-13 16:47:35 +02:00
Emanuel Schuetze
4849955a16 Some more template improvements
- Better config icon.
- Renamed media to files (only for GUI).
- Add datatable function for motion and asssignemnt overview table. Removed old filter/sorting code.
- Some more template styling work.
2013-05-15 09:43:11 +02:00
Emanuel Schuetze
e268d43580 Fixed motion poll pdf (use correct delegates group, use template without header/footer) 2013-04-24 15:14:29 +02:00
Emanuel Schuetze
abad75c129 A lot of template improvements and translation fixes
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
2013-04-24 10:38:03 +02:00
Norman Jäckel
e1b149cde3 New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly.
Changes after some reviews are done.

Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
2013-03-28 15:31:13 +01:00
Oskar Hahn
27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion
Conflicts:
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
2013-02-06 09:25:27 +01:00
Emanuel Schuetze
82e35bebff Fixed wrong deletion if user clicks "no" in confirm form. 2013-02-05 21:31:45 +01:00
Oskar Hahn
90614cc637 Updated some views for the new utils.views style 2013-02-03 19:43:36 +01:00
Oskar Hahn
139ba74459 Merge remote-tracking branch 'emanuel/newtemplate' into new_template
Conflicts:
	.travis.yml
	INSTALL.txt
	openslides/agenda/templates/agenda/base_agenda.html
	openslides/agenda/templates/agenda/edit.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/agenda/templates/agenda/widget.html
	openslides/assignment/templates/assignment/base_assignment.html
	openslides/assignment/templates/assignment/config.html
	openslides/assignment/templates/assignment/edit.html
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/poll_view.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/templates/assignment/widget.html
	openslides/config/templates/config/general.html
	openslides/motion/templates/motion/base_motion.html
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/motion/templates/motion/widget.html
	openslides/motion/views.py
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/edit.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_widget.html
	openslides/participant/templates/participant/import.html
	openslides/participant/templates/participant/login.html
	openslides/participant/templates/participant/overview.html
	openslides/participant/templates/participant/password_change.html
	openslides/participant/templates/participant/settings.html
	openslides/participant/templates/participant/user_widget.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/control_countdown.html
	openslides/projector/templates/projector/control_overlay_message.html
	openslides/projector/templates/projector/custom_slide_widget.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/projector/templates/projector/new.html
	openslides/projector/templates/projector/overlay_widget.html
	openslides/templates/base.html
	openslides/utils/template.py
	openslides/utils/views.py
	requirements.txt
2013-02-03 19:03:18 +01:00
Emanuel Schuetze
b8532fabe4 Removed files from images to img dir. 2013-01-18 22:23:31 +01:00
Oskar Hahn
5d754984a3 fixed pep8 errors 2013-01-04 12:39:42 +01:00
Emanuel Schuetze
4ae7f3e243 Merge remote branch 'upstream/master' into newtemplate
Conflicts:
	openslides/application/views.py
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/views.py
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/motion/templates/motion/config.html
	openslides/motion/templates/motion/edit.html
	openslides/motion/templates/motion/import.html
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_overview.html
	openslides/participant/templates/participant/overview.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/dashboard.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/static/styles/base.css
	openslides/templates/base.html
	openslides/templates/front_page.html
	openslides/utils/utils.py
2013-01-02 23:01:43 +01:00
Oskar Hahn
bd32994296 cleanup
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn
8014f327a2 Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api 2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780 sort persons 2012-11-22 16:19:09 +01:00
Emanuel Schuetze
c5a2f896e2 Fixed typo in identifier 'assignment_candidates'. 2012-11-21 20:12:08 +01:00
Emanuel Schuetze
17d813e08b Show error message for NameError. 2012-11-21 19:36:12 +01:00
Norman Jäckel
af6c403936 Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector. 2012-11-21 15:14:38 +01:00
Emanuel Schuetze
e601d8a5a3 Fixed display_name of widgets. 2012-11-08 09:43:04 +01:00
Emanuel Schuetze
71790a345b Fixed some English strings. Updated translations. 2012-11-07 22:37:33 +01:00
Norman Jäckel
d6ebbdc541 Fix plural-error on ballot paper, ticket #393 2012-10-25 21:57:02 +02:00
Oskar Hahn
57d591fee8 Renamed category to detail 2012-10-24 12:30:45 +02:00
Oskar Hahn
3e1938941f Append a default class for the person-api.
Also fixed the assignment-ballot-paper for group-persons
2012-10-24 12:15:29 +02:00
Emanuel Schuetze
1548479069 Fixed application and assigment ballot paper: don't use old profile object. 2012-09-18 22:47:12 +02:00
Emanuel Schuetze
9cb9270df3 Assignment: Fixed generating ballot pdf paper (typo: surfix). 2012-09-18 22:37:53 +02:00
Norman Jäckel
77ae543ff2 Using Meta Class for ordering assignments by name 2012-09-14 00:21:59 +02:00
Oskar Hahn
f0f14861e8 fixed message for unblocking users 2012-09-13 21:51:50 +02:00
Oskar Hahn
20ac817d49 Fixed error message when delrun after the list is closed 2012-09-13 15:07:24 +02:00
Oskar Hahn
e64f4f5efc show blocked candidates of an assignment 2012-09-13 14:59:14 +02:00
Oskar Hahn
760f8e042e some fixes 2012-09-12 10:17:51 +02:00
Oskar Hahn
8732b67bd8 Merge pull request #14 from ostcar/no_recandidate
block a user to be a candidate from a assignment, if he delete his candidation by him self
2012-09-11 00:52:50 -07:00
Emanuel Schuetze
2bf992117c Updated widget titel and icons. 2012-09-11 00:00:44 +02:00
Oskar Hahn
75eb596547 block a user to be a candidate from a assignment, if he delete his
candidation by him self
2012-09-06 15:57:42 +02:00
Norman Jäckel
d84a8d2bdd Sorting assignments by name in the widget 2012-09-05 22:19:53 +02:00
Emanuel Schuetze
7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Oskar Hahn
6b7ea558fc rewrote widgets for the dashboard 2012-08-15 11:56:43 +02:00
Oskar Hahn
df40de67b0 rename openslidesuser to user and openslidesgroup to group 2012-08-12 12:52:38 +02:00
Oskar Hahn
75443808af fix some errors in participant 2012-08-08 10:52:13 +02:00
Oskar Hahn
1719aa588d rename some user api and participant names 2012-08-07 22:43:57 +02:00
Oskar Hahn
ab33b9f05a fix error in application-supporters an assignment-candidates, for non admin users 2012-08-06 14:58:52 +02:00