Commit Graph

224 Commits

Author SHA1 Message Date
Emanuel Schuetze
b5a5acbf2c Some last (template) improvements for next release
- Added dataTable function for group overview table.
- Added default form help text for groups and an explanation for group overview table.
- Updated translation.
- Translate group name in form.
- Username: FirstName instead of First_Name
- Hide group 'registered' from UserForm
- Linked persons/candidates/submitter etc. to UserView
- Fixed permissions in template

Translation
2013-05-16 21:03:42 +02:00
Emanuel Schuetze
b082f8a8fc A lot of template improvements
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.

Moved css code.
2013-05-14 23:20:54 +02:00
Norman Jäckel
864d20274e Fixed #636. Insert general url_name_args attribute to some generic views in utils.views. 2013-05-13 18:15:53 +02:00
Oskar Hahn
b0e5854833 Fixed #629 2013-04-28 10:21:31 +02:00
Oskar Hahn
100238bc66 Fixed #580 2013-04-28 09:37:15 +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
Oskar Hahn
f581169e1e Fixed saving anonymous user in a PersonField 2013-04-24 09:28:58 +02:00
Oskar Hahn
0549d22ec8 Fixed manage.py runserver.
The reload function did not work
2013-04-21 18:42:58 +02:00
Oskar Hahn
db1503ad7b Format fix 2013-04-19 19:15:57 +02:00
Roland Geider
56844d93f2 Move CKeditor configuration to a separate JS file
Remove unneeded try-except block
2013-04-18 13:26:01 +02:00
Emanuel Schuetze
1d1f5fa218 Added html support for motion text.
Use html parser 'beautifulsoup' to replace html tags which not supported by reportlab pdf.
'pip install bs4' required.

Fixed nested ol lists and unicode warning.

New requirement: beautifulsoup4

HTML support for reportlab.

Move parse html code into new function. Added missing html support in pdf for motion reason.

Added version number for bleach and beautifulsoup4. Moved to core requirements block.

Added bs4, bleach and html5lib requirements to portable build script. Updated portable readme for 1.4.
2013-04-18 13:23:40 +02:00
Roland Geider
01885c9304 Add first version of server-side filtering of HTML with bleach
Fix formatting (pep8 and otherwise)

Make the CleanHtml a mixin so it can be used easier, add a test case

Mark HTML fields as 'safe' in the template

Update list of allowed HTML tags, take special care for reportlab

Add heading tags to white list

Rename get_clean_html to get_clean_html_fields
2013-04-18 13:20:27 +02:00
Oskar Hahn
fa95119936 New Feature: List of speakers. 2013-04-15 19:23:37 +02:00
Norman Jäckel
82c804e2d6 Inserted a new config variable 'Stop submitting of new motions'
Normal delegates can not submit a new motion when this is set to true. Inserted also a new template filter to relate to config variables in if-clauses.
2013-04-05 11:49:57 +02:00
Roland Geider
e40a2e9332 Restart tornado on file changes, respect port and adress flags 2013-04-03 23:20:56 +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
Emanuel Schuetze
71ac7a1cdb New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')

Fixed pep8 issues. Create qr-code image for system url one time only.

New feature: qr-code for system url on participants password pdf.
(Note: New dependency! Run 'pip install qrcode')

Fixed pep8 issues. Create qr-code image for system url one time only.

Print qrcode image from StringIO stream.
Adapted table stylesheet for better integration of reportlab's Image object.

Fixed pep8 issue.

Made qrcode import as optional feature. Fixed pep8 issue.
2013-03-22 14:35:40 +01:00
Norman Jäckel
ad0e157bd1 Insert new app to upload files via the frontend. Let tornado server media files. Insert icon-mediafile css class. Insert extra_stylfiles context variable. 2013-03-18 21:44:02 +01:00
Oskar Hahn
3832aa4178 Tests for the motion views 2013-03-15 12:18:27 +01:00
Oskar Hahn
c46ec570bf Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-15 02:16:26 +01:00
Oskar Hahn
81eb92a761 fixed pep8 2013-03-15 02:14:15 +01:00
Oskar Hahn
1a2ebf7b3b removed some unused functions 2013-03-15 01:34:17 +01:00
Emanuel Schuetze
2a2c704bf2 GetVersionMixin not required. Fixed htmldiff function. 2013-03-14 23:26:41 +01:00
Emanuel Schuetze
3f4df58807 Moved htmldiff function to utils.py. Fixed travis build error (pep8). 2013-03-14 23:22:11 +01:00
Oskar Hahn
43cd5aba00 Merge branch 'master' of github.com:OpenSlides/OpenSlides 2013-03-14 22:44:11 +01:00
Oskar Hahn
545d4be04f fixed update of person_api 2013-03-14 22:32:00 +01:00
Oskar Hahn
d21185a449 Merge branch 'master' of github.com:OpenSlides/OpenSlides into category 2013-03-12 22:05:20 +01:00
Norman Jäckel
03fff46517 Add new TestCase class in utils to call the signal on running every test. 2013-03-12 21:38:22 +01:00
Oskar Hahn
31ba70efd1 Category Delete View 2013-03-11 21:38:07 +01:00
Norman Jäckel
514577f7c6 Built-in Workflows are created by listening to a signal which is sent after syncdb. 2013-03-11 21:32:09 +01:00
Oskar Hahn
51a9e41015 Set new django setting. Put tornado code in a seperate file. 2013-02-27 18:54:06 +01:00
Oskar Hahn
2822c39f8a Merge branch 'master' into tornado 2013-02-18 19:08:58 +01:00
Norman Jäckel
f2dde228c9 Work on motion workflow system.
Also: Insert new base exception for OpenSlides.

Also: Insert a workflow field to the state class. Update tests. Rename versioning attribute.
2013-02-13 23:04:24 +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
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
Oskar Hahn
e7c65b3db1 Moved some methodes from utils.views.DeleteView to QuestionMixin 2013-02-03 13:23:55 +01:00
Oskar Hahn
15b13c2bcd Handel null=True in PersonField 2013-02-02 21:19:37 +01:00
Oskar Hahn
2e430b4406 check permission in motion view 2013-02-02 10:59:07 +01:00
Oskar Hahn
3ffb16d4d8 Fixed pep8 errors 2013-02-02 10:52:13 +01:00
Oskar Hahn
6c3eb0f765 fixed urls in views from the participant app 2013-02-01 17:35:27 +01:00
Oskar Hahn
1a2f0a1b5a Added links to set and reset the state of a motion 2013-02-01 17:20:11 +01:00
Oskar Hahn
b6256b73e0 Changed utils.views.DeleteView 2013-02-01 13:24:30 +01:00
Oskar Hahn
adeaf248ef Changed utils.- and poll.views 2013-02-01 12:51:01 +01:00
Oskar Hahn
d3b340769b Added motion config tab 2013-01-26 16:33:55 +01:00
Oskar Hahn
ecb6419f8c fixed apply and success url in utils.views 2013-01-26 16:19:53 +01:00
Oskar Hahn
1f87749742 Save the submitters to the motion 2013-01-26 15:25:54 +01:00
Roland Geider
3bfead298d Add custom management command to start the application with tornado 2013-01-23 21:12:36 +01:00
Emanuel Schuetze
586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
Oskar Hahn
0231fe37f5 Start to rewrite the motion app 2013-01-08 20:22:03 +01:00