Commit Graph

140 Commits

Author SHA1 Message Date
Emanuel Schuetze 84d2619289 Improved projector zoom and scroll behaviour.
Zoom and scroll the full content div (incl. title and sidebar).
Add zoom and scroll level in projector live view widget.
2013-10-23 19:44:37 +02:00
Oskar Hahn 82f0df4fea Send js to the projector
* fixed scroll and scale of the projector
2013-10-21 07:53:21 +02:00
Emanuel Schuetze e277b8babf Full text search with haystack and whoosh.
Updated THANKS file.
Portable: Added haystack and whoosh.
2013-10-16 08:58:35 +02:00
Emanuel Schuetze a4d024f45c Some template fixes and improvements:
- Fixed absoluteurl in motion detail template. Renamed '_edit' to '_update'.
- Fixed wrong projector link ind assigment poll template.
- Improved assignment projector slide.
- Fixed #884: Add PDF note to translation string "Show paragraph numbering"
2013-10-12 20:29:27 +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
Emanuel Schuetze 84d5293fbc Rework (projector) template with bootstrap.
- Always use templatetag 'absolute_url' instead of (depricated) 'model_url'.
  Search and replace all old arguments: edit -> update, view -> detail, delete
- Fixed bug in setting default value in 'absolute_url' templatetag
  (default value is defined in models.py only).

Updated 'backend' template.
2013-10-07 08:57:22 +02:00
Oskar Hahn ecf5248962 Rework of the projector with websocket
* Set a static projector title
* absolute_urls for the activate links
* update the projector when a slide changes (in save())
* insert the absolute_url template filter
* Preview to slides
* renamed is_active to is_active_slide
* The SlideMixin has to come before the PersonMixin
* Update list of speakers
* Render Countdown via JS
* Reconnect projector after connection lost
* Overlays can allways be active and do not appear in the widget
* Rewrote the clock as overlay
2013-09-24 23:35:05 +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 834851acbd Typo in assignment view (fixed #805) 2013-07-04 15:40:47 +02:00
Emanuel Schuetze c450dfb1d5 Fixed typo. 2013-06-17 10:44:55 +02:00
Emanuel Schuetze a383a4305b Fixed some (pdf) template issues and updated (DE) translation.
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
2013-06-15 17:50:30 +02:00
Norman Jäckel a0c023cf45 Use ordinal numbers in assignment and motion polls, fixes #456. Include humanize app to portable 2013-06-13 15:48:55 +02:00
Emanuel Schuetze 4126c180c8 Fixed #701: Check bootstrap tooltips on all buttons. 2013-06-03 22:42:16 +02:00
Emanuel Schuetze d5becd5c18 Fixed #431: Template improvements (removed unused loaded tags and check of all html template files) 2013-05-30 23:25:49 +02:00
Emanuel Schuetze 4ec33106ed Fixed #680 (Open all PDFs in new tab). 2013-05-29 22:59:33 +02:00
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 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 210df06c76 Minor template fixes. 2013-04-24 11:58:09 +02:00
Oskar Hahn fa95119936 New Feature: List of speakers. 2013-04-15 19:23:37 +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
Norman Jäckel 571649d5a6 Fix typo in assignment. 2013-03-18 21:31:24 +01:00
Emanuel Schuetze 71b1bede6f Set new button als primary/blue button. 2013-03-09 14:17: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 bfd01e67b6 template: Removed unused 'cycle' template tag. 2013-02-05 21:55:41 +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
Emanuel Schuetze 36f5c97dbe Added assignment context menu (more actions). Fixed 'back to election' link. 2013-02-04 13:18:10 +01:00
Emanuel Schuetze e822efdc81 Some template style work. 2013-02-04 13:06:36 +01:00
Emanuel Schuetze 82ad5e2de0 Major changes for new twitter bootstrap template (e.g. replaced icons) 2013-01-31 10:19:56 +01:00
Emanuel Schuetze 369f418b0e Fixed missing endif 2013-01-05 15:43:52 +01:00
Emanuel Schuetze 13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +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 0369edae1e Added translationcontext for posts in assignment 2012-12-09 10:48:45 +01:00
Emanuel Schuetze da0757e40f #417: Don't hide vote results table if status is reset 2012-11-21 19:39:55 +01:00
Emanuel Schuetze 7fa86f7de0 Used blocktrans instead of trans 2012-11-20 12:37:16 +01:00
Emanuel Schuetze 5e97ece5f4 #278: Used cycle rowcolor in vote results table also for inavlid votes row 2012-11-19 23:52:48 +01:00
Emanuel Schuetze 93d2dc8d7d Restructuring and optimization of assignment templates.
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
2012-11-19 22:54:09 +01:00
Emanuel Schuetze 0cf4191934 Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty. 2012-11-17 23:44:41 +01:00
Emanuel Schuetze 005cb2f15e Updated translations. 2012-11-03 08:59:34 +01:00
Norman Jäckel b213e75223 Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available) 2012-10-29 10:16:12 +01:00
Norman Jäckel 0ec106a034 Fix message on assignment slide, ticket #389 2012-10-25 22:18:20 +02:00
Norman Jäckel 4052e137a2 Insert new list with all elected candidates, see ticket #374 2012-10-25 21:28:13 +02:00
Norman Jäckel d0771063b3 Fix assignment overview table, ticket #372 2012-10-25 21:08:29 +02:00
Oskar Hahn a0242c3c74 Show linebreaks in assignment description. #392 2012-10-24 12:48:11 +02:00
Emanuel Schuetze 613956b62a Fixed missing blue 'candidate elected' line in assignment projector template. 2012-09-18 22:55:31 +02:00
Oskar Hahn e64f4f5efc show blocked candidates of an assignment 2012-09-13 14:59:14 +02:00
Emanuel Schuetze 2f3e57bf4a Removed unused base_assignment.html template. 2012-09-10 23:40:08 +02:00
Emanuel Schuetze ce233fc870 Updated config template. 2012-09-10 17:40:41 +02:00
Emanuel Schuetze 65840d4261 Minor changes in assigment view template. 2012-09-10 17:15:43 +02:00