Commit Graph

41 Commits

Author SHA1 Message Date
Norman Jäckel 6566a2897c Fixed #675: CSS for list of speakers slide and overlay 2013-05-24 00:52:09 +02:00
Emanuel Schuetze b082f8a8fc A lot of template improvements
- Translate group name in participant overview table.
- Move 'status_link' function from participants.js to utils.js for using in VoteCollector plugin.
- Added hook 'post_js' for VoteCollector plugin.
- Fixed poll id in poll_form.
- Improved 'show log' button
- Used welcome_title for default custom slide
- Used bootstraps' fluid grid nesting for responsive layout of widgets.
- Added microphone icon for 'add-me-to-list-of-speakers' button.
- Format motion identifier and title in (motion and account) widgets.
- Format list of speakers (slide, overlay, view, overview)
- Format list of speakers widget and view. Added view to link to current list of speakers (without add to list).
- Fixed motion slide. Made up/down animation faster and the scroll way shorter.
- Fixed icon name.
- Set default context of 'extra_javascript' to use kwargs['context']['extra_javascript'].append('...') without error.
- Fixed translation of motion state.

Moved css code.
2013-05-14 23:20:54 +02:00
Norman Jäckel 719b6ff790 Rework on list of speakers. Insert a method to get a formated list for various use in the templates. 2013-04-29 20:17:50 +02:00
Tobias Hößl 5865a73a3e sortable and disableSelection are not always defined; lead to issue #615 2013-04-24 19:51:33 +02:00
Tobias Hößl acba281581 Sorting agenda items with nestedSortable. 2013-04-23 17:24:27 +02:00
Oskar Hahn 33f74c3025 List of speakers. Part 2 2013-04-15 19:28:44 +02:00
Emanuel Schuetze 1a416e5726 Updated template and some minor fixed for list of speakers. Updated projector slide. 2013-04-15 19:23:37 +02:00
Oskar Hahn fa95119936 New Feature: List of speakers. 2013-04-15 19:23:37 +02:00
Norman Jäckel 623cf60adf Moved javascript code for agenda config into extra file. Moved translation to correct area for javascript files. 2013-04-03 14:51:19 +02:00
Emanuel Schuetze 4e6818fb1a Compressed jquery-ui files (for agenda config). 2013-03-18 20:22:54 +01:00
Stefan Frauenknecht 8103c09b81 PEP8 errors resolved 2013-02-16 10:41:22 +01:00
Emanuel Schuetze e9c996340a Used custom build jquery-ui javascript components file. Integrated required jquery-ui styles (no remote link). Added used jquery components/addons to THANKS file. 2013-02-15 08:39:36 +01:00
Emanuel Schuetze e3428d3e83 Some style work. 2013-02-11 23:01:48 +01:00
Emanuel Schuetze e101fb8212 Merge branch 'master' into agenda-orga-items
Conflicts:
	openslides/agenda/static/styles/agenda.css
	openslides/agenda/templates/agenda/config.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/locale/de/LC_MESSAGES/django.mo
	openslides/locale/de/LC_MESSAGES/django.po
	openslides/static/styles/base.css
	requirements.txt
2013-02-11 22:36:19 +01:00
Emanuel Schuetze a51a296434 Changed agenda start/end time to djangos DATETIME_FORMAT. 2013-02-09 22:59:15 +01:00
Emanuel Schuetze 0c5459f96e template: Removed old icons. Added some new glyphicons. Updated template style. Some fixes. 2013-02-05 20:40:55 +01:00
Stefan Frauenknecht d6084f7c8b Create items with duration loger than 23:59. Show start and end date. Duration has tooltip showing end date and time. 2013-02-05 16:36:57 +01:00
Stefan Frauenknecht c595701597 Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel) 2013-02-01 14:41:52 +01:00
Emanuel Schuetze d3b679442c Agenda orga items and time scheduling: Formatting improved. Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. 2013-02-01 12:55:04 +01:00
Emanuel Schuetze 82ad5e2de0 Major changes for new twitter bootstrap template (e.g. replaced icons) 2013-01-31 10:19:56 +01:00
Stefan Frauenknecht 65ebcbc991 #41 Time for each agenda item finished 2013-01-30 17:39:53 +01:00
Emanuel Schuetze 586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
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
Oskar Hahn 84324cf317 Updated translations 2012-12-09 12:59:56 +01:00
Oskar Hahn 56e3fe7a37 fix translation 2012-09-13 21:56:50 +02:00
Oskar Hahn ef7deb90c9 translate agenda hidden filter in js 2012-09-13 15:21:43 +02:00
Emanuel Schuetze 7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Emanuel Schuetze 969816be37 Use new close icon to keep old done icon. 2012-07-13 07:58:00 +02:00
Emanuel Schuetze 0c64309c91 Rename summary icon. 2012-07-12 17:11:33 +02:00
Oskar Hahn 47ff052c22 fix close and unclose link via ajax 2012-07-04 15:49:33 +02:00
Oskar Hahn 7f2d10c9ca fix hide-closed-item function for non-manager 2012-07-04 13:12:07 +02:00
Oskar Hahn f903f350b8 insert item-summary link in the widget 2012-07-01 16:13:34 +02:00
Oskar Hahn e8e664b92e #237, #238 only show the first line of a comment in the agenda 2012-06-30 10:39:58 +02:00
Emanuel Schuetze 9b6b969f8a Added missing license header (for js and css). 2012-04-25 22:48:27 +02:00
Emanuel Schuetze d56dcba7d4 #119: Adjusted icon filenames. 2012-04-23 21:27:22 +02:00
Emanuel Schuetze 3886449b2c #106: Action column for applications.
#121 (partly): Activate links for agenda and applications table.
2012-04-20 22:43:12 +02:00
Emanuel Schuetze a35e1917a4 Removed unused icons. 2012-04-18 19:52:37 +02:00
Emanuel Schuetze 4ce8facd1a #98: Add new filter for active/inactive items. 2012-04-18 18:29:31 +02:00
Emanuel Schuetze f44f2723dc Added link to activate agenda item in overview table. 2012-04-15 15:53:05 +02:00
Emanuel Schuetze 0657ff340d Show clickable done action in first column in agenda overview. 2012-04-15 14:28:01 +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