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 |
|
Emanuel Schuetze
|
f3c865ee3c
|
#176: Adjusted user slide. Show only relevant information in a nice and clear layout.
|
2012-11-21 21:05:56 +01:00 |
|
Oskar Hahn
|
eb267acf08
|
removed scrollbar in projector-template
|
2012-09-15 09:13:36 +02:00 |
|
Emanuel Schuetze
|
51ab5e3850
|
Minor style for widgets.
|
2012-09-11 00:05:20 +02:00 |
|
Emanuel Schuetze
|
889bd66e04
|
Adjusted dashboard templates for twitter bootstrap.
Reduced jquery-ui stuff to really neccessary files.
|
2012-09-10 23:28:19 +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 |
|
Emanuel Schuetze
|
e4250b6ba1
|
Some style fixes.
|
2012-07-13 16:04:00 +02:00 |
|
Oskar Hahn
|
198eefbfdd
|
rewrote projector overlay widget
|
2012-07-04 02:43:26 +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
|
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 |
|
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
|
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
|
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
|
d56dcba7d4
|
#119: Adjusted icon filenames.
|
2012-04-23 21:27:22 +02:00 |
|
Emanuel Schuetze
|
6be853f202
|
Removed default font from jquery-ui css.
|
2012-04-18 22:06:18 +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
|
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 |
|
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 |
|
Emanuel Schuetze
|
ad1e87cd99
|
Some style work. Move countdown to message portlet.
|
2012-04-14 17:50:31 +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 |
|