Commit Graph

235 Commits

Author SHA1 Message Date
Norman Jäckel
d49d087f4e Merge pull request #1208 from ostcar/customslide
Move projector.models.ProjectorSlide to core.models.CustomSlide
2014-01-29 04:09:52 -08:00
Oskar Hahn
2392c1ab36 Move projector.models.ProjectorSlide to core.models.CustomSlide 2014-01-28 08:32:26 +01:00
Emanuel Schuetze
d15488478d Fixed #1195: Correct path to circle.png on ballot paper (assignment and motion). 2014-01-27 20:54:32 +01:00
Emanuel Schuetze
d8d2ad002a Rename and clean up static direcories.
- rename static subdirs to css and js
- move global static dir to core/static, changed
- move global templates dir to core/templates
- check comments and code style of all our own CSS and JS files
- minor changes related to the changes of template and static files
2014-01-14 23:27:12 +01:00
Oskar Hahn
c82ee4ce1f Added AbsoluteUrlMixin and used it in any model.
cleaned up get_absolute_url() in some models
2014-01-12 00:35:16 +01:00
Oskar Hahn
90f9313faa Use the jsonfield as requirement 2014-01-11 23:01:29 +01:00
Oskar Hahn
ad09a18e3f removed edit and view in get_absolute_view 2014-01-11 17:39:16 +01:00
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
9a3243706b Inserted api for the personal info widget. 2013-12-09 12:16:16 +01:00
Norman Jäckel
405fadb6f5 Rename some classes of the poll api. Clean up the poll api. 2013-12-07 00:24:11 +01:00
Norman Jäckel
bdf1679eb0 Rename classes in the config api.
Also change attributes for config collection without view.
2013-12-06 10:47:20 +01:00
Oskar Hahn
2cf2774e58 Merge pull request #1139 from DerPate/fix_last_gpl_header
remove the last occurence of gnu gpl license header fix #1130
2013-12-02 07:46:09 -08:00
Dominik Breu
a3bf29acf2 remove the last occurence of gnu gpl license header fix #1130 2013-12-01 22:52:08 +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
Emanuel Schuetze
301bc8ac7c Translate state.name in motion log message. 2013-11-22 15:34:32 +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
Norman Jäckel
31af5c0ce6 Add check for set state view, fix #1080. 2013-11-19 01:06:38 +01:00
Emanuel Schuetze
28271019fd Improved #1023 - Motion csv import: Collect all warnings and errors in one message. 2013-11-18 17:21:21 +01:00
Oskar Hahn
c4c9483b5e Merge pull request #1046 from emanuelschuetze/translation-fix
Fixed typo (titel->title).
2013-11-12 05:07:45 -08:00
Emanuel Schuetze
b8e30188ad Fixed #1040: Show only last motion poll results on projector. 2013-11-12 11:13:36 +01:00
Emanuel Schuetze
06b91b89bb Fixed typo (titel->title). 2013-11-12 10:57:07 +01:00
Emanuel Schuetze
92b111c0bd Fixed #1039: Motion poll edit view: projector icon needs 'if slide is activate' check. 2013-11-11 17:36:12 +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
Emanuel Schuetze
45588024fd Fixed #957 (Allow list-style in CKEditor)
Allowed additional css styles 'color' and 'background-color'
for span html fields in ck-editor (and bleach).
2013-11-10 19:33:38 +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
Emanuel Schuetze
ccdf5ef2e0 Motion PDF: Keep whitespaces in monospace <pre> tags and replace it with '&nbsp;'. 2013-10-29 14:57:23 +01: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
Norman Jäckel
6175ce25c5 Fix #934: Error in motion import with bad csv file. 2013-10-22 00:18:58 +02:00
Norman Jäckel
9d80c05f90 Fix url_name_args bug.
Fix delete view for motion categories. Add test for custom slide delete view.
2013-10-21 22:51:38 +02:00
Norman Jäckel
b0e3c7d456 Fix missing url_name_args = [] lines in different views.
Fix custom slide create and update view.
Fix motion category create and update view.
2013-10-21 19:10:53 +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
30371e964f Insert new feature: attachments for motions.
Fixed #522. Database struture changed.
2013-10-18 12:32:29 +02:00
Roland Geider
8f274c2691 Add CKeditor to the agenda item text field 2013-10-18 10:18:05 +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
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
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
Oskar Hahn
477daa3fdf Success_message in utils.views 2013-09-14 11:09:45 +02:00
Oskar Hahn
b228a02429 Merge remote-tracking branch 'openslides/stable/1.4.x' 2013-09-07 15:42:16 +02:00
Norman Jäckel
a50617676a Add default sorting of widgets. Fix #493 2013-09-07 15:13:27 +02:00
Emanuel Schuetze
1045f14026 Fixed missing creation time of motion version.
Show now string if identifier is not set set (in widgets and motion detail).
2013-09-07 14:31:21 +02:00
Norman Jäckel
c800884a43 Use GenericForeignKey for agenda related items, fix #865 2013-09-07 14:30:25 +02:00
Emanuel Schuetze
cb7d54973d Fixed #858: Removed max value (8) of config field "motion_min_supporters".
Removed supporters signature field in motion pdf to prevent the unused signature fields
which are printed for each required supporters if you have a high minimum supporters number.
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
48f8e82eda Fixed #859: New config option to disable paragraph numbering in motion pdf
Default value: disabled
2013-09-06 21:59:54 +02:00
Emanuel Schuetze
67175042f9 Fixed #857: Use jquery plugin 'bsmSelect' for <select multiple> form elements. 2013-09-06 21:59:52 +02:00
Emanuel Schuetze
20d7a3b539 Add paragraph around each motion version warning (to show each warning in one line). 2013-07-29 09:06:36 +02:00