ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,045 Commits 6 Branches 42 Tags 64 MiB
d2f5302e28
Commit Graph

194 Commits

Author SHA1 Message Date
Oskar Hahn
1dab39012c Merge pull request #661 from normanjaeckel/PermitRejectVersionLog 
Log permitting and rejecting motion versions (Fixed #657)
 2013-05-16 04:31:41 -07:00
Norman Jäckel
c163d6984d Insert motion preamble in text field of the form of new motions (Fixed #643) 2013-05-16 01:38:51 +02:00
Norman Jäckel
5adf55bc8c Log permitting and rejecting motion versions (Fixed #657) 2013-05-16 01:28:39 +02:00
Norman Jäckel
27da18f489 Fixed #655 Log Entry for imported motions 2013-05-16 00:58:37 +02:00
Norman Jäckel
bca8d3af15 Update view contains possibility for managers to change the workflow. Also other small fixes. 2013-05-16 00:25:44 +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
Oskar Hahn
cefd509ae4 Merge pull request #650 from emanuelschuetze/template-improvements 
Template improvements
 2013-05-14 14:31:53 -07: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
f07485627f Motion identifier setting and versioning. 
Now the view decides, whether to setup a new version or not. Automatic identifier setting is the default. Also some fixes of the motion save method.
 2013-05-13 23:13:14 +02:00
Oskar Hahn
b8b5acd5f2 Merge pull request #639 from normanjaeckel/Url_name_args 
Fixed 'Can't create agenda item of a motion'
 2013-05-13 11:51:15 -07:00
Norman Jäckel
0f17f74fee Fix and update motion csv import. 2013-05-13 18:30:20 +02:00
Oskar Hahn
485518975a motion csv import 2013-05-13 18:25:59 +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
Norman Jäckel
96f5122c00 Show category in motion table. Fix template when a motion has no category. 2013-05-11 00:20:42 +02:00
Oskar Hahn
04edef9d8a Fixed #604 2013-04-28 10:02:19 +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
210df06c76 Minor template fixes. 2013-04-24 11:58:09 +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
7fbe609d04 Rename the state flag dont_set_new_version_active to leave_old_version_active. 2013-04-22 22:31:58 +02:00
Oskar Hahn
02d1025346 Motion poll PDF 2013-04-22 21:47:40 +02:00
Oskar Hahn
2d7bf8ca9a fixed #558 2013-04-19 19:56:59 +02:00
Oskar Hahn
10b51f6897 Fixed #595 2013-04-19 19:39:33 +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
Tobias Hößl
ce333d4c40 Initial attempt to integrate CKEditor into OpenSlides 2013-04-18 13:20:27 +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
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
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
d180b4f331 Reverted support/unsupport changes (question) 2013-03-14 23:45:17 +01:00
Emanuel Schuetze
20118ae833 Improved version.get command 2013-03-14 23:35:57 +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
Emanuel Schuetze
b2dc3820bd Changed motion.number to motion.identifier. 2013-03-14 23:04:32 +01:00
Emanuel Schuetze
88a32dc546 Updated motion version warnings (not latest/authorized version) 2013-03-14 22:56:25 +01:00
Emanuel Schuetze
73430e45d8 Changed style for empty category table. 2013-03-14 22:54:33 +01:00
Emanuel Schuetze
fa098f6bd3 Typo. 2013-03-14 22:54:00 +01:00
Emanuel Schuetze
247f6c9431 Merge remote branch 'upstream/master' into motiontemplate 
Conflicts:
	openslides/motion/models.py
	openslides/motion/views.py
 2013-03-14 21:36:02 +01:00
Emanuel Schuetze
a1a11ff53c New motion version diff view. Improved version history table in motion detail template. 2013-03-14 21:28:03 +01:00
Oskar Hahn
2944b6ded3 fixed travis 2013-03-13 00:29:53 +01:00
Oskar Hahn
71b9bd0a08 dont set identifier prefix, if it is empty 2013-03-12 23:54:37 +01:00
Oskar Hahn
b2c888b151 set identifier 2013-03-12 23:35:08 +01:00
Oskar Hahn
304887e8f3 Changed comlex workflow automaticly set the identifier 2013-03-12 22:13:17 +01:00
Oskar Hahn
d21185a449 Merge branch 'master' of github.com:OpenSlides/OpenSlides into category 2013-03-12 22:05:20 +01:00
Oskar Hahn
9cd69f59e0 Motion Identifier 2013-03-12 22:03:56 +01:00
Emanuel Schuetze
196ad217b0 Fixed version history. 2013-03-11 23:58:45 +01:00
Emanuel Schuetze
d41ce146e2 Added category_delete function to template. 2013-03-11 21:50:16 +01:00
Emanuel Schütze
db97d3c312 Merge pull request #2 from ostcar/category 
Category Delete View
 2013-03-11 13:45:54 -07: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
Emanuel Schuetze
d9fbaf9aa7 Updated motion category template. 2013-03-11 21:29:56 +01:00
Emanuel Schütze
ff848a865a Merge pull request #1 from ostcar/category 
Category
 2013-03-11 12:46:42 -07:00
Oskar Hahn
f411040c3a Append missing files 2013-03-11 20:43:23 +01:00
Oskar Hahn
bc7be27131 Add CategoryFormField to the MotionForm 2013-03-11 20:41:02 +01:00
Oskar Hahn
2614a1cb2f Categories for Motions 2013-03-11 20:17:19 +01:00
Emanuel Schuetze
1b93cec209 Merge remote branch 'upstream/master' 
Conflicts:
	openslides/motion/models.py
 2013-03-11 19:16:16 +01:00
Emanuel Schuetze
42c847dfba Update motion templates to new template design. Added some missing model and view functions. 2013-03-11 18:26:22 +01:00
Emanuel Schuetze
5c70b4a044 Update after comments: Removed user context var. Removed condition in unupport state check. 2013-03-11 16:56:56 +01:00
Emanuel Schuetze
ee0e599a6c Update motion templates to new template design. Added some missing model and view functions. 2013-03-09 14:29:40 +01:00
Norman Jäckel
03d57d17b0 Fix state attributes in motion pdf. 2013-02-19 23:43:20 +01:00
Norman Jäckel
6b71142747 Recover commit 6a639fe498 2013-02-18 22:08:21 +01:00
Oskar Hahn
ce1e1c112f fixed pep8 2013-02-18 18:59:24 +01:00
Oskar Hahn
051723e686 Merge branch 'master' of github.com:OpenSlides/OpenSlides 
Conflicts:
	openslides/motion/models.py
	openslides/motion/workflow.py
 2013-02-18 18:31:35 +01:00
Norman Jäckel
2603d93d69 Fix PEP8 and tests. 2013-02-17 17:07:44 +01:00
Norman Jäckel
8363b06fc1 Move motion exceptions to its own file in the motion app. 2013-02-14 19:27:36 +01:00
Norman Jäckel
2e37e4c18b Comment the dev-file workflow.py 2013-02-14 11:16:46 +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
6a639fe498 Add todos 2013-02-06 11:11:49 +01:00
Oskar Hahn
5573077b88 fixed pep8 2013-02-06 09:34:44 +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
ce51f0ef7e template: minor style changes 2013-02-05 23:42:30 +01:00
Emanuel Schuetze
e49efb40d8 template: Added new css class for minimum column width. 2013-02-05 22:03:43 +01:00
Emanuel Schuetze
64e3c1f3cb template: Removed unused 'load staticfiles'. 2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12 template: Minor style changes. 2013-02-05 21:33:07 +01:00
Emanuel Schuetze
0c5459f96e template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes. 2013-02-05 20:40:55 +01:00
Oskar Hahn
042f1a8571 Fixed typo 2013-02-05 18:49:32 +01:00
Oskar Hahn
a08cf84ab8 Wrote docstrings to the motion app 2013-02-05 18:46:46 +01:00
Emanuel Schuetze
e822efdc81 Some template style work. 2013-02-04 13:06:36 +01:00
Oskar Hahn
a34731c00e fixed pep8 in motion.pdf 2013-02-03 20:12:44 +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
b8a353fa7c Added PDF view for the motions 2013-02-03 18:18:29 +01:00
Oskar Hahn
42082ae3c2 fixed pep8 2013-02-03 14:14:07 +01:00
Oskar Hahn
cbd4acbd4b fixed motion tests 2013-02-03 13:55:42 +01:00
Oskar Hahn
ef7f6cf476 Permission system for MotionVersions 2013-02-03 13:24:29 +01:00
Oskar Hahn
f4ea611fb8 Wrote log messages for motion changes 2013-02-03 10:02:06 +01:00
Oskar Hahn
65a18953bd Added translatable log to the new motion system 2013-02-02 21:40:23 +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
4cc6539f0c Added get_allowed_actions to new motion app 2013-02-02 10:24:28 +01:00
Oskar Hahn
a27bd7eade Add motion to agenda 2013-02-02 00:51:08 +01:00
Oskar Hahn
910e0f17e7 Add slide Date to the motion 2013-02-02 00:37:43 +01:00
Oskar Hahn
1518543a9a Added motion widget and deletion of motions 2013-02-02 00:27:16 +01:00
Oskar Hahn
bd317aed31 Wrote tests for openslides.motion.models.Motion 2013-02-01 19:19:18 +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
ac41a02ac5 Block supporting, unsupporting and creation of poll in some states 2013-02-01 16:44:06 +01:00
Oskar Hahn
fb82a1787b Add workflows for motions 2013-02-01 16:33:45 +01:00