Commit Graph

347 Commits

Author SHA1 Message Date
Norman Jäckel
ee3ec3d4b6 Fixed flake8 errors. 2014-03-27 20:38:13 +01:00
Norman Jäckel
39de1924cb Added extra permission check to speaker widget, fixed #1191 only for 1.5.x branch 2014-03-13 00:50:49 +01:00
Oskar Hahn
bbd7542341 Fixed agenda_item.is_active_slide() with related item and list of speakers 2014-01-12 12:48:38 +01:00
Oskar Hahn
4c86c9cd07 Fix list_of_speaker overlay
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
2014-01-11 09:21:35 +01:00
Oskar Hahn
5541861176 Merge pull request #1125 from emanuelschuetze/documentation1.5
Documentation1.5
2013-11-25 11:08:25 -08:00
Emanuel Schuetze
0d149180dd Updated documentation for 1.5
- Updated all screenshots.
- Improved image handling with autoimage extension.
- Some minor content updates for 1.5 version.
- Fixed wrong list of speakers icon.
2013-11-25 17:14:11 +01:00
Oskar Hahn
49ca243153 Add function get_active_object and bugfixes
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
2013-11-25 11:35:03 +01:00
Oskar Hahn
f8048da76c Fixed countdown and projector update issues
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown

Fixes: #1078, #1076, #1075
2013-11-24 10:04:01 +01:00
Norman Jäckel
2af3b320c8 Merge pull request #1116 from emanuelschuetze/template-fix2
Minor template fixes
2013-11-23 08:25:33 -08:00
Emanuel Schuetze
f1fd3208bd Template fixes
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
2013-11-23 15:05:19 +01:00
Emanuel Schuetze
8ca4f0409f Use btn-mini class for list of speakers question in agenda view. 2013-11-22 20:39:28 +01:00
Emanuel Schuetze
301bc8ac7c Translate state.name in motion log message. 2013-11-22 15:34:32 +01:00
Emanuel Schuetze
94abda60b5 Added help text for duration field in agenda item form. (Fixed #1085) 2013-11-22 10:04:00 +01:00
Norman Jäckel
5bff907b34 Merge pull request #1091 from emanuelschuetze/template-fixes
Fixed a lot of template bugs from irc test session.
2013-11-21 10:48:40 -08:00
Dominik Breu
8e6269b495 fix #1085 maybe could be done better but for 1.5 integration this could be used . input 60< is converted to hh:mm 2013-11-21 08:13:24 +01:00
Emanuel Schuetze
9aed1f764d Fixed a lot of template bugs.
- agenda overview: Text align right for duration column.
- item summary slide: Show 'get_title_supplement' after each related agenda item.
- item detail view: Add ":" in button after item content_type
- projector: Show <hr> below title/subtitle line.
- motion view: Check manage permission for delete version button in version history table.
- motion detail view: Update version authorized badges and go to buttons.
- motion list: Link warning icon to newest version.
- assignment detail view: Added ballot paper pdf button.
- Group slide and overview: Show members.
- Use dynamic title column width in participants pdf.
- Fixed missing translations in user settings form.
- IE8/9 fix for projector template style.
- Style linebreak and border in h1 title with css.
2013-11-20 22:05:10 +01:00
Dominik Breu
0c32ef9c40 fix #1044 Remove GNU GPL header 2013-11-15 16:01:14 +01:00
Max Brauer
091a2bc35c Bugfix in agenda.js (fixes #1041) 2013-11-12 21:33:57 +01:00
Oskar Hahn
9d8d9f806f Fixed agenda slide
Fixes #1035
2013-11-12 08:59:20 +01:00
Emanuel Schuetze
1fb0a21d0b Some more template fixes:
- Fixed #992 (Use correct countdown format)
- Fixed #909 (Backend und projector template style)
  * Search bar with same border-radius like login button.
  * Projector: Fixed overlay message style. Allow HTML code (use template filter 'safe').
  * Dashboard: Tooltips, Buttons and Widget fixes.
- Fixed template does not exists error if custom slide is activated.
- Countdown: Add css to show negative countdown in red.
- Add missing translation strings to English po file (for transifex).
2013-11-10 20:50:30 +01:00
Emanuel Schuetze
34701c67a6 Template improvements.
- motion detail template: Fixes motion manage state template block.
- mediafile list template: Fixed missing activeline class.
- item detail template: Fixed is_active_slide conditions.
- assignment view template: Use bottongroup instead of single radio buttons.
- Projector template: Updated header and countdown style. Removed footer.
- Added config options to show logo and/or title/description.
- Projector template: New config options to set background color and font color for projector header.
- Make WLAN form labels not translateable.
2013-11-10 20:27:38 +01:00
Oskar Hahn
2a7a50a817 Show default_slide if an error occurs in a slide
See #925
2013-11-09 15:14:55 +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
Norman Jäckel
b2afa77e25 Add error message if a invalid answer was send via POST to a QuestionView. Fix #940. 2013-10-28 17:02:18 +01:00
Oskar Hahn
6f7dabe870 Merge pull request #955 from normanjaeckel/Fix927
Add message if someone adds himself to the list of speakers. Fix #927.
2013-10-25 23:59:00 -07:00
Norman Jäckel
218d0bad23 Add message if someone adds himself to the list of speakers. Fix #927. 2013-10-24 18:24:19 +02:00
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
Emanuel Schuetze
bac918a9e8 Some bug fixing for 1.5b1
- Fixed #921 (Check THANKS URL for jQuery UI Nested Sortable)
- Fixed #919 (Permission problem in agenda)
- Fixed #918 (Search does not work for guest users)
- Fixed search-bar position.
- Updated EN po files.
2013-10-21 14:39:28 +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
Norman Jäckel
40faaa39c6 Changed begin speach behavior. Fix merge conflicts. Add tests. 2013-10-19 14:52:37 +02:00
Emanuel Schuetze
40af20cedb New feature: couple countdown with list of speakers
'Begin speach' button starts countdown, 'end speach' button stops countdown.
2013-10-18 22:30:05 +02:00
Roland Geider
8f274c2691 Add CKeditor to the agenda item text field 2013-10-18 10:18:05 +02:00
Oskar Hahn
68b9a2e291 Cache the results of ItemDelete.get_answer_options
Fix #911
2013-10-18 07:49:39 +02:00
Oskar Hahn
d3f673a276 Merge pull request #912 from normanjaeckel/Fix910
Fix wrong question_url_name in ItemDelete view. Fix #910.
2013-10-17 22:36:04 -07:00
Norman Jäckel
d76a04f443 Fix wrong url_name_args in ItemDelete view. Fix #910. 2013-10-17 22:00:00 +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
Roland Geider
95fe58eb99 Add prototype of full text search integration in openslides
Allow for empty title and text body, fix pep8 errors
2013-10-15 22:35:53 +02: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
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
Oskar Hahn
66679c8efe Merge branch 'stable/1.4.x'
Conflicts:
	openslides/__init__.py
2013-09-14 11:07:02 +02:00
Oskar Hahn
3bf1f24a4a Fixed wrong ordering of agenda items after order change
Fixed #875
2013-09-08 11:17:32 +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
Emanuel Schuetze
9dcdf67398 Fixed typo in English translation string in djangojs.po. 2013-09-06 21:59:53 +02:00
Oskar Hahn
b03e8cc06b Fixed #833 2013-07-29 19:45:06 +02:00
Oskar Hahn
b39cb8e8a4 Fixed tooltip and duration in agenda.
The tooltip did not show the end of an agenda item, but of the hole event.

If a item was closed, it was not used to calculate the end of the event.

Fixed #833
2013-07-27 10:02:40 +02:00
Oskar Hahn
f39e8dd92e Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend 2013-07-08 13:44:44 +02:00
Emanuel Schuetze
64e7cfd98e Some template and doc fixes
- Fixed #766 (agenda overview parent item look).
- Fixed #767 (Documentation sphinx bootstrap theme: html header)
- Fixed #785 (Enlarged doc screenshots by hover via CSS)
- Updated sphinx-bootstrap-theme to 0.2.4
- Add btn class for agenda end time tooltip
2013-06-25 22:15:51 +02:00