Emanuel Schuetze
7fde53a09e
Updated template with twitter bootstrap. Step 1: agenda and application.
2012-09-05 00:20:28 +02:00
Emanuel Schuetze
777d2266bc
Fixed drag'n'drop of widgets into empty dashboard column. Renamed
...
projector-control{js|css} files into dashboard{js|css}.
2012-08-22 09:39:20 +02:00
Oskar Hahn
423f04d0be
send overlay message data to own view
2012-08-15 18:00:22 +02:00
Oskar Hahn
416f3f6ff3
added select widgets view
2012-08-15 13:42:25 +02:00
Oskar Hahn
6b7ea558fc
rewrote widgets for the dashboard
2012-08-15 11:56:43 +02:00
Oskar Hahn
c6bc50e2fd
rename projector to dashboard
2012-08-15 10:58:29 +02:00
Emanuel Schuetze
f36ad67bb9
Removed additional <hr> tag from custom slides widget.
2012-07-23 19:21:47 +02:00
Oskar Hahn
0b033271f8
fix some typos, mostly {%trans to {% trans
2012-07-16 14:00:29 +02:00
Emanuel Schuetze
e4250b6ba1
Some style fixes.
2012-07-13 16:04:00 +02:00
Norman Jäckel
28d6fb54a7
Clean up browsertitles ( #282 ) in config projector
2012-07-13 00:47:53 +02:00
Emanuel Schuetze
accb329a44
#232 : Removed spaces from links.
2012-07-12 17:24:37 +02:00
Oskar Hahn
aa130ab2da
cleanup openslides base files.
...
Do not manipulate the pythonpath anymore.
2012-07-10 14:00:51 +02:00
Norman Jäckel
25df1b8693
Deactivate the projector message overlay by default
2012-07-10 01:44:42 +02:00
Oskar Hahn
8d961f4940
fix translation by using ugettext_lazy
2012-07-10 01:33:03 +02:00
Oskar Hahn
15621b7702
clean up the projector App
2012-07-07 14:01:40 +02:00
Oskar Hahn
4eb4d2ee8d
use s for sec in projector-control
2012-07-04 15:47:52 +02:00
Oskar Hahn
67426f239b
only refresh the projector, if the content has changed
2012-07-04 15:00:08 +02:00
Norman Jäckel
d654c268f7
Zusammenführen
2012-07-04 03:26:27 +02:00
Oskar Hahn
03fe1f84dd
clear overlay-message via ajax
2012-07-04 03:21:03 +02:00
Norman Jäckel
a149d5a6bc
Ticket #229
2012-07-04 03:19:42 +02:00
Oskar Hahn
198eefbfdd
rewrote projector overlay widget
2012-07-04 02:43:26 +02:00
Oskar Hahn
ff19e6d2c8
#247 summary of items for the projector
2012-07-01 16:10:26 +02:00
Oskar Hahn
00eb365b91
rewrote active_slide in generic view
...
also reordert some imports
2012-07-01 15:35:05 +02:00
Oskar Hahn
6c206fa740
#246 open activate slide view ajax
2012-07-01 11:07:04 +02:00
Oskar Hahn
ea4da31b0c
rewrite projector_edit view as class based view
2012-07-01 10:52:08 +02:00
Oskar Hahn
2ba1b7e3bc
rewrote countdown view as class based view
2012-07-01 10:44:41 +02:00
Norman Jäckel
c19118e774
Fix #230
2012-06-30 14:17:15 +02:00
Oskar Hahn
e9c680f5e1
update translation
2012-06-24 21:55:46 +02:00
Oskar Hahn
1a4e164dd2
refresh the projector only ones a second
2012-06-24 21:55:31 +02:00
Norman Jäckel
d110934f62
Insert title tag to Clean Message Button ( #219 )
2012-06-23 11:39:07 +02:00
Norman Jäckel
b1ed56176e
Edit and View Links and Symbols in Widgets fixed ( #206 )
2012-06-23 10:43:01 +02:00
Oskar Hahn
239f328372
rewrote projector-widget system
2012-06-11 13:43:48 +02:00
Oskar Hahn
960543b64e
load all models in projector.views
2012-06-10 10:43:50 +02:00
Oskar Hahn
43e30057b3
delete item, not application by releated agenda-items
2012-06-03 10:19:08 +02:00
Oskar Hahn
2e498403cb
#167 fallback slide, if the slide does not exist
2012-06-03 09:43:28 +02:00
Oskar Hahn
965b682abc
edit, delete, slide for releated item in agenda
2012-06-03 09:35:26 +02:00
Oskar Hahn
79893687f3
fixed error by activating a message, if it was only on a specific slide.
2012-06-03 09:05:12 +02:00
Emanuel Schuetze
58fc689f14
Updated overlay message style in projector template.
2012-05-21 09:21:36 +02:00
Emanuel Schuetze
5eb29ba9dd
Fixed width of countdown input field.
2012-05-20 22:06:07 +02:00
Emanuel Schuetze
5581ed1222
#168 : Improved countdown control buttons.
2012-05-20 22:01:44 +02:00
Emanuel Schuetze
4389f5f548
#89 : Added missing control_customslide.html template.
2012-05-20 20:15:49 +02:00
Emanuel Schuetze
406a2d18e3
Fixed can_manage_projector permission.
2012-05-20 19:43:38 +02:00
Emanuel Schuetze
f2a93c4505
#89 : Delete custom slides.
2012-05-18 23:24:54 +02:00
Emanuel Schuetze
90787b2597
#89 : Edit custom slides.
2012-05-18 23:07:09 +02:00
Andy Kittner
3815ef26af
Fix wrong translations in forms/ models
...
Converted utils.translation_ex.ugettext to use ugettext_lazy and changed
forms modules to import ugettext from there (models where already importing
it from there)
2012-05-15 01:08:08 +02:00
Emanuel Schuetze
eb7672074e
Some more style work for application projector template.
2012-04-30 08:30:04 +02:00
Emanuel Schuetze
e28c15eff9
Improve projector style of application voting results.
2012-04-30 08:23:50 +02:00
Emanuel Schuetze
7eaf9899f6
Minor code comment changes.
2012-04-28 22:32:33 +02:00
Emanuel Schuetze
64eed5ff22
#90 : Projector control: Save portlet state in session.
2012-04-28 22:31:30 +02:00
René Köcher
842e8de065
#160 : Wrong scaling of projector live view in IE8/Konqueror
...
IE8 has a scaling bug - check the browser version and resize the iframe 4x bigger if needed..
2012-04-28 09:38:31 +02:00
Emanuel Schuetze
710882c28a
#96 Countdown: Improve control icons
2012-04-27 17:42:05 +02:00
René Köcher
030ff09ec0
#97 : (Aftermath)
...
Quick cross-browser fix: remove the spin-buttons and use input type=number.
If your browser is HTML5 it should show a spin box, otherwise the fallback
(type=text) will work equally well.
2012-04-27 07:59:23 +02:00
René Köcher
c3c7228ab9
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:51:42 +02:00
René Köcher
c0b78f52ea
Backout changeset 3dafb78cc57f4ce55b8e4517eb48fd9e9e744e2d
2012-04-27 07:50:20 +02:00
René Köcher
f45eb68fb4
#159 Countdown reset should change 'pause' back to 'play'.
2012-04-27 07:46:47 +02:00
René Köcher
7b7f43b04a
#97 : Countdown: move countdown config input field from config tab to portlet
2012-04-26 12:43:35 +02:00
Emanuel Schuetze
aac48a0b02
Redesign overlays.
2012-04-26 08:52:20 +02:00
Emanuel Schuetze
b0d64c2bcc
Updated jquery ui style.
2012-04-25 22:59:49 +02:00
Emanuel Schuetze
9b6b969f8a
Added missing license header (for js and css).
2012-04-25 22:48:27 +02:00
Emanuel Schuetze
7ef298881d
Updated license header.
2012-04-25 22:29:19 +02:00
René Köcher
053021a08f
#XX Countdown: Only show valid controls for the active countdown
...
When clicking on 'play' the button will morph into 'stop' and vice-versa.
This is persistent across clients e.g. when A starts the countdown and
then B opens the control page B will see a pause button.
(Updates for all but the local client happen only on page reload)
2012-04-25 18:45:02 +02:00
René Köcher
07b5614fac
#94 Countdown: support for pause/resume / #95 Countdown: show correct time format as mm:ss
2012-04-25 17:17:24 +02:00
Emanuel Schuetze
719ea6ec79
#93 : Show application number in header of projector template.
...
Some more projetor style work.
2012-04-24 22:27:16 +02:00
Emanuel Schuetze
20f17d6235
Fixed untranslateable model string.
2012-04-23 22:17:45 +02:00
Emanuel Schuetze
dc863cc3b9
Added custom slides portlet.
2012-04-23 22:07:52 +02:00
Emanuel Schuetze
d56dcba7d4
#119 : Adjusted icon filenames.
2012-04-23 21:27:22 +02:00
Emanuel Schuetze
6125f1d88b
Minor javascript fix.
2012-04-20 22:41:57 +02:00
Oskar Hahn
4e904c7356
now it is possible to create a item, witch is realted to another object, for example an application.
2012-04-19 12:46:04 +02:00
Emanuel Schuetze
9849140d2e
Remove submenu from static slides.
2012-04-18 22:06:41 +02:00
Emanuel Schuetze
6be853f202
Removed default font from jquery-ui css.
2012-04-18 22:06:18 +02:00
Emanuel Schuetze
4adb221a9d
#92 : Projector control: Add projector preview icon for all entries.
2012-04-18 22:00:58 +02:00
Oskar Hahn
a77038fbf4
removed some old countdown code, defined some default values
2012-04-18 18:55:33 +02:00
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
