Commit Graph

106 Commits

Author SHA1 Message Date
Oskar Hahn 23df763b1f fix message issus: #134, also defined some default config-values 2012-04-18 18:35:02 +02:00
Oskar Hahn 0dde1738cf fixed active line #88 2012-04-18 18:07:24 +02:00
Oskar Hahn 49e2f73df4 #92 preview for slides 2012-04-18 15:47:51 +02:00
Oskar Hahn 67384d0644 indent items in control view 2012-04-18 14:53:19 +02:00
Oskar Hahn 6aa241b268 fixed error in get_active_slide() 2012-04-17 12:07:32 +02:00
Emanuel Schuetze 131d84bee4 Reduced custom jquery.ui to minimum (ui core, widget, mouse and sortable).
Changed jquery.ui style to humanity.
Some layout things in control template.
2012-04-17 09:13:02 +02:00
Oskar Hahn 03792c0b05 put projector message in the center of the presentation 2012-04-16 17:14:39 +02:00
Oskar Hahn 7d16717ca8 clean button for message 2012-04-16 16:38:47 +02:00
Oskar Hahn 534a81c46c rewrote projector_messages system. Recalled it projector_overlay and added a special overlay for unique messages 2012-04-16 16:35:30 +02:00
Oskar Hahn 90038c1ad2 fix error by activating the Agenda 2012-04-15 15:46:32 +02:00
René Köcher b620c0afb7 Add 'zoom' css attribute if we detect MSIE. 2012-04-15 14:51:50 +02:00
René Köcher 82d4a2de4b Try to get a working beamer preview for more browsers. 2012-04-15 14:27:27 +02:00
René Köcher 82993e3da8 Allow clicking on the beamer preview to open the real beamer view. 2012-04-15 10:44:15 +02:00
Oskar Hahn 500b418f91 Automated merge with ssh://openslides.de/openslides 2012-04-14 20:10:56 +02:00
Oskar Hahn 3a849880fb code for control view in apps 2012-04-14 20:10:49 +02:00
Emanuel Schuetze ad1e87cd99 Some style work. Move countdown to message portlet. 2012-04-14 17:50:31 +02:00
Emanuel Schuetze fc5b738b87 Automated merge with ssh://openslides.org/openslides 2012-04-14 16:17:30 +02:00
Emanuel Schuetze 3ba6f9c26d Projector control: Moved MessagesView to ControlView. Removed messages template. 2012-04-14 16:17:26 +02:00
Oskar Hahn 75b9d6c63d set message id in JS 2012-04-14 16:01:36 +02:00
René Köcher 7e56911aca Ich will meine Anführungszeichen zurück!!! 2012-04-14 15:00:24 +02:00
René Köcher f674897505 Split static files in application specific directories and use django 1.4 staticfiles app. 2012-04-14 14:51:56 +02:00
Oskar Hahn 535795391d remove default permission after syncdb 2012-04-14 14:31:09 +02:00
Oskar Hahn 6f377453bc rename system in config. Add default config in each apps 2012-04-14 12:52:56 +02:00
Oskar Hahn 15a34fda97 project ProjectorSlide 2012-04-14 11:37:12 +02:00
Oskar Hahn 491c65cf24 use app name for projector category 2012-04-14 11:18:47 +02:00
Oskar Hahn e8337278a1 Automated merge with ssh://openslides.de/openslides 2012-04-14 09:47:41 +02:00
Oskar Hahn 0de8228537 rewrote message api and countdown 2012-04-14 09:47:34 +02:00
René Köcher 7e12e1d5e2 Support for localized permissions on top of the untranslated django model. 2012-04-14 09:28:28 +02:00
Emanuel Schuetze 5e6180a465 Some style changes for projector and agenda template. 2012-04-10 21:11:50 +02:00
Emanuel Schuetze fdc83048f4 More AJAX for projector control template. Moved projector stuff from agenda overview to new control page. 2012-04-10 20:09:10 +02:00
Emanuel Schuetze 83ba0cbcf9 Fixed projector portlet style. 2012-04-02 20:59:17 +02:00
Emanuel Schuetze a11ed6cfdb Minor template fixes. 2012-03-22 17:30:02 +01:00
Emanuel Schuetze 7e48dc737f Scaled Live View. Added active slide icon. 2012-03-21 22:21:23 +01:00
Oskar Hahn c4c42611b4 generate tab liste by app list 2012-03-18 17:11:58 +01:00
Oskar Hahn f5414b18d2 fixed error in projector Control 2012-03-18 14:35:01 +01:00
Oskar Hahn ccdce52caa start a way to send messages to the projector. Start to use this api for the countdown 2012-03-16 12:28:42 +01:00
Oskar Hahn 7a63ec6f10 created model for pojector slides 2012-03-12 18:22:18 +01:00
Emanuel Schuetze 2ab6ff4143 Projector control template: Used portlets instead of accordion. 2012-03-07 06:44:43 +01:00
Emanuel Schuetze 687f5ea710 Automated merge with ssh://openslides.org/openslides 2012-03-06 19:55:26 +01:00
Emanuel Schuetze 8d514e9fcf Renamed SettingView to ControlView. 2012-03-06 19:55:19 +01:00
Oskar Hahn 027655270e Automated merge with ssh://openslides.de/openslides 2012-03-06 12:16:21 +01:00
Oskar Hahn 062e9bd4cb added signals for template-context-manipulation 2012-03-06 12:16:03 +01:00
Emanuel Schuetze 55c4299a7f Updated projector control template. Fixed some slidemodel strings and urls.
Updated jquery to 1.7.1. Added jquery-ui.
2012-03-06 08:19:49 +01:00
Oskar Hahn 50360dde96 side-menu for projector 2012-03-03 11:19:58 +01:00
Oskar Hahn a25d980f92 publish assignment polls 2012-03-03 11:16:10 +01:00
Oskar Hahn a69ddffea5 put links in projector settings in categories 2012-03-03 10:47:32 +01:00
Oskar Hahn 654b101dac beamer setting page 2012-03-03 09:11:56 +01:00
Oskar Hahn c55f240e84 some bug fixes 2012-02-20 20:35:12 +01:00
Oskar Hahn 7e076dc6c4 removed some unneedet dependencies 2012-02-20 00:39:52 +01:00
Oskar Hahn c4874ae6a0 present a poll 2012-02-15 12:36:50 +01:00
Oskar Hahn bc05b78648 rewrote the config api 2012-02-15 12:04:11 +01:00
Oskar Hahn 6498095e2b create setup.py to install openslides 2012-02-09 16:57:10 +01:00
Oskar Hahn 28170becb3 cleand the apenda-app 2012-02-09 02:29:38 +01:00
Oskar Hahn 7808783145 register functions als slide 2012-02-09 01:46:58 +01:00
Oskar Hahn 8c27c731f8 rename Element to Slide 2012-02-06 22:22:16 +01:00
Oskar Hahn 16c37661f7 renamed beamer in projector 2012-02-06 22:08:08 +01:00