ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
3,435 Commits 6 Branches 42 Tags 64 MiB
bf8e4fa585
Commit Graph

554 Commits

Author SHA1 Message Date
Oskar Hahn
bbd7542341 Fixed agenda_item.is_active_slide() with related item and list of speakers 2014-01-12 12:48:38 +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
cde6232477 Merge branch 'stable/1.5.x' 
Conflicts:
	openslides/projector/projector.py
	openslides/templates/base.html
 2014-01-11 22:30:14 +01:00
Oskar Hahn
ad09a18e3f removed edit and view in get_absolute_view 2014-01-11 17:39:16 +01:00
Oskar Hahn
4c86c9cd07 Fix list_of_speaker overlay 
* Issue a warning message, if a overlay raises a exception
* Fixed #1131
 2014-01-11 09:21:35 +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
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
Oskar Hahn
5541861176 Merge pull request #1125 from emanuelschuetze/documentation1.5 
Documentation1.5
 2013-11-25 11:08:25 -08:00
Emanuel Schuetze
0d149180dd Updated documentation for 1.5 
- Updated all screenshots.
- Improved image handling with autoimage extension.
- Some minor content updates for 1.5 version.
- Fixed wrong list of speakers icon.
 2013-11-25 17:14:11 +01:00
Oskar Hahn
49ca243153 Add function get_active_object and bugfixes 
* Dont throw errors in overlay.get_projector_html if debug == False
* fixe check of active slide in agenda
* Fix #1121
 2013-11-25 11:35:03 +01:00
Oskar Hahn
f8048da76c Fixed countdown and projector update issues 
* agenda_item.get_absolute_url('projector') returns the activate-url of the related slide.
* agenda_item.is_activate() returns True, if the related item is active
* Fixed set_active_slide to accept kwargs
* Reset countdown when saving a new duration time
* Update countdown overlay when begin_speak and end_speak is called
* Fixed blinking countdown

Fixes: #1078, #1076, #1075
 2013-11-24 10:04:01 +01:00
Norman Jäckel
2af3b320c8 Merge pull request #1116 from emanuelschuetze/template-fix2 
Minor template fixes
 2013-11-23 08:25:33 -08:00
Emanuel Schuetze
f1fd3208bd Template fixes 
- Agenda overview: Fixed padding of duration column.
- Agenda overview: Optimize header information for small devices with bootstrap's row-fluid class.
- Fixed text align in assignment detail template.
 2013-11-23 15:05:19 +01:00
Emanuel Schuetze
8ca4f0409f Use btn-mini class for list of speakers question in agenda view. 2013-11-22 20:39:28 +01:00
Emanuel Schuetze
301bc8ac7c Translate state.name in motion log message. 2013-11-22 15:34:32 +01:00
Emanuel Schuetze
94abda60b5 Added help text for duration field in agenda item form. (Fixed #1085) 2013-11-22 10:04:00 +01:00
Norman Jäckel
5bff907b34 Merge pull request #1091 from emanuelschuetze/template-fixes 
Fixed a lot of template bugs from irc test session.
 2013-11-21 10:48:40 -08:00
Dominik Breu
8e6269b495 fix #1085 maybe could be done better but for 1.5 integration this could be used . input 60< is converted to hh:mm 2013-11-21 08:13:24 +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
Dominik Breu
0c32ef9c40 fix #1044 Remove GNU GPL header 2013-11-15 16:01:14 +01:00
Max Brauer
091a2bc35c Bugfix in agenda.js (fixes #1041) 2013-11-12 21:33:57 +01:00
Oskar Hahn
9d8d9f806f Fixed agenda slide 
Fixes #1035
 2013-11-12 08:59:20 +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
Oskar Hahn
2a7a50a817 Show default_slide if an error occurs in a slide 
See #925
 2013-11-09 15:14:55 +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
Norman Jäckel
b2afa77e25 Add error message if a invalid answer was send via POST to a QuestionView. Fix #940. 2013-10-28 17:02:18 +01:00
Oskar Hahn
6f7dabe870 Merge pull request #955 from normanjaeckel/Fix927 
Add message if someone adds himself to the list of speakers. Fix #927.
 2013-10-25 23:59:00 -07:00
Norman Jäckel
218d0bad23 Add message if someone adds himself to the list of speakers. Fix #927. 2013-10-24 18:24:19 +02: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
Emanuel Schuetze
bac918a9e8 Some bug fixing for 1.5b1 
- Fixed #921 (Check THANKS URL for jQuery UI Nested Sortable)
- Fixed #919 (Permission problem in agenda)
- Fixed #918 (Search does not work for guest users)
- Fixed search-bar position.
- Updated EN po files.
 2013-10-21 14:39:28 +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
40faaa39c6 Changed begin speach behavior. Fix merge conflicts. Add tests. 2013-10-19 14:52:37 +02:00
Emanuel Schuetze
40af20cedb New feature: couple countdown with list of speakers 
'Begin speach' button starts countdown, 'end speach' button stops countdown.
 2013-10-18 22:30:05 +02:00
Roland Geider
8f274c2691 Add CKeditor to the agenda item text field 2013-10-18 10:18:05 +02:00
Oskar Hahn
68b9a2e291 Cache the results of ItemDelete.get_answer_options 
Fix #911
 2013-10-18 07:49:39 +02:00
Oskar Hahn
d3f673a276 Merge pull request #912 from normanjaeckel/Fix910 
Fix wrong question_url_name in ItemDelete view. Fix #910.
 2013-10-17 22:36:04 -07:00
Norman Jäckel
d76a04f443 Fix wrong url_name_args in ItemDelete view. Fix #910. 2013-10-17 22:00:00 +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
Roland Geider
95fe58eb99 Add prototype of full text search integration in openslides 
Allow for empty title and text body, fix pep8 errors
 2013-10-15 22:35:53 +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
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
66679c8efe Merge branch 'stable/1.4.x' 
Conflicts:
	openslides/__init__.py
 2013-09-14 11:07:02 +02:00
Oskar Hahn
3bf1f24a4a Fixed wrong ordering of agenda items after order change 
Fixed #875
 2013-09-08 11:17:32 +02:00
Norman Jäckel
a50617676a Add default sorting of widgets. Fix #493 2013-09-07 15:13:27 +02:00
Norman Jäckel
c800884a43 Use GenericForeignKey for agenda related items, fix #865 2013-09-07 14:30:25 +02:00
Emanuel Schuetze
9dcdf67398 Fixed typo in English translation string in djangojs.po. 2013-09-06 21:59:53 +02:00
Oskar Hahn
b03e8cc06b Fixed #833 2013-07-29 19:45:06 +02:00
Oskar Hahn
b39cb8e8a4 Fixed tooltip and duration in agenda. 
The tooltip did not show the end of an agenda item, but of the hole event.

If a item was closed, it was not used to calculate the end of the event.

Fixed #833
 2013-07-27 10:02:40 +02:00
Oskar Hahn
f39e8dd92e Fixed #794 bug when a non speaking list slide was active, when a projector tab was opend 2013-07-08 13:44:44 +02:00
Emanuel Schuetze
64e7cfd98e Some template and doc fixes 
- Fixed #766 (agenda overview parent item look).
- Fixed #767 (Documentation sphinx bootstrap theme: html header)
- Fixed #785 (Enlarged doc screenshots by hover via CSS)
- Updated sphinx-bootstrap-theme to 0.2.4
- Add btn class for agenda end time tooltip
 2013-06-25 22:15:51 +02:00
Oskar Hahn
c14302dd6f small translation update 2013-06-16 18:44:14 +02:00
Oskar Hahn
575da78f3a Editview for releated agenda items. 
Releated Agenda Items need there own edit view to edit some agenda specifc
values.

Also added a new filter 'trans' to translate variables.

Fixes #710
 2013-06-16 00:55:07 +02:00
Emanuel Schuetze
a383a4305b Fixed some (pdf) template issues and updated (DE) translation. 
- Fixed #737 (Motion edit link is missing for normal delegate users)
- Fixed motion pdf filename errors (now use motion-<identifier>.pdf or if no identifier: motion-<title>.pdf with using djangos slugify for special chars in title)
- Fixed motion pdf build error if there is an unauthorized version
- Enlarge max_length of event name field to 50 chars.
- Align participant import instruction with motion import page.
- Added title field to particpants-demo_en.csv.
- participant overview: Show comma after last_name only if first_name and last_name are given.
- Changed all page titles to "<specific action page> - <event-name>" (moved event-name to the end of the string)
- Updated EN tranlation string.
- Updated DE translations.
 2013-06-15 17:50:30 +02:00
Norman Jäckel
3afc58be9e Add request to all widgets, fixed #653 2013-06-13 23:45:30 +02:00
Oskar Hahn
4b0c62d29a Fixes #721 
Saving the anonymous user into a list of speakers.

Also raises an AttributeError if someone tries to save the anonymous user
into any person field.
 2013-06-09 18:57:42 +02:00
Emanuel Schuetze
cf791e599a Updated EN translation strings and updated EN po files. 
Template fixes and improvements.
 2013-06-03 23:33:01 +02:00
Emanuel Schuetze
bdfdb4c064 Fixed #652: Button for ageda item with related sid. 2013-06-03 22:42:16 +02:00
Emanuel Schuetze
4126c180c8 Fixed #701: Check bootstrap tooltips on all buttons. 2013-06-03 22:42:16 +02:00
Emanuel Schuetze
cd84d64071 Fixed #702: list of speakers projetor/overlay style. 2013-06-03 22:42:15 +02:00
Emanuel Schuetze
ef6eaf8fa4 Fixed #703: Mcrophon icons for list of speakers 2013-06-03 22:42:14 +02:00
Emanuel Schuetze
e5e7e1bcce Template improvements. 
Improved agenda and participants overview.
 2013-06-03 22:38:45 +02:00
Norman Jäckel
5c18635418 Change order of agenda fields 2013-06-03 19:16:42 +02:00
Norman Jäckel
e5db00b637 Add tests for the list of speakers global links. Add end_speach link on the list of speakers widget. 2013-05-31 17:25:48 +02:00
Stefan Frauenknecht
1e188761d4 Validator for agenda_start_time aded. PEP8 issue 'missing whitespace after ','' resolved 2013-05-31 14:01:30 +02:00
Norman Jäckel
9e5088d49e Fixed #683 2013-05-31 13:15:55 +02:00
Emanuel Schuetze
d5becd5c18 Fixed #431: Template improvements (removed unused loaded tags and check of all html template files) 2013-05-30 23:25:49 +02:00
Emanuel Schuetze
4ec33106ed Fixed #680 (Open all PDFs in new tab). 2013-05-29 22:59:33 +02:00
Emanuel Schuetze
9fb2052b3d Bugfixing, template improvements, translation updates. 
- Fixed #649: Clean old motion fragments in template and pdf (about motion notes).
- Fixed motion pdf issues: missing submitters, voting result and make motion state translateable- Added post_save function also for UserUpdateView.
 2013-05-29 22:59:24 +02:00
Norman Jäckel
9d698854a9 Insert Next Speaker Button in speaker widget 2013-05-24 01:44:58 +02:00
Norman Jäckel
6566a2897c Fixed #675: CSS for list of speakers slide and overlay 2013-05-24 00:52:09 +02:00
Norman Jäckel
00910b218e Fix appearance of agenda items with related sid, also some other small fixes and template fixes 2013-05-24 00:31:52 +02:00
Norman Jäckel
099ed76d0e Insert info to list of speakers overlay widget checkbox 2013-05-23 23:31:57 +02:00
Norman Jäckel
894f16ec53 Several template and bug fixes, some minor view behavior changes 2013-05-23 00:32:32 +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
a469831f1f Fixed link 'Put me on the list of speakers' when the list is already closed. 2013-05-12 02:06:55 +02:00
Norman Jäckel
af6659a67e Hide list of speakers overlay on list of speakers slide 2013-05-12 01:16:41 +02:00
Norman Jäckel
411f8d0892 Fixed hiding of orga items on summary slides 2013-05-11 16:26:43 +02:00
Norman Jäckel
98c7611622 Fixed wrong permission on agenda detail view 2013-05-11 13:53:43 +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
Oskar Hahn
52e16d2e34 Show a defined value of last speakers 
Some work on the design of the speaker-list on the projector
 2013-04-29 20:05:42 +02:00
Norman Jäckel
0b85164b84 Add second time field for list of speakers. Now you can click begin and end speach. 2013-04-29 20:05:42 +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
Emanuel Schuetze
81b82c559d Updated jQuery UI to v1.10.2. 
Changed link in agenda view to static file.
 2013-04-24 11:34:24 +02:00
Emanuel Schuetze
abad75c129 A lot of template improvements and translation fixes 
- Fixed agenda widget for special slide views (e.g. list of speakers, summary).
- Fixed back to motion(s) link
- Set icon for list of speakers widget.
- Fixed overlay widget layout of form elements.
- Added submenu with other config_pages to version.html.
- Updated completly DE translations, fixed EN strings.
- Coding style: Use correct ugettext and ugettext_lazy strings. Use "as _" for ugettext only.
Updated translation.
- Improved projector template (clock image, fixed facicon, added subtitle for list of speakers)
- Changed permission strings ('oneself'). Added check if group(pk=3) exists.
- Added event name and description to base template. Some minor template layout fixes.
- Use static subtile (no context var). Show last 2 old_speakers for projector.
- Cut old_speakers.
- Projektor template style changes (e.g. overlay list of speakers).
 2013-04-24 10:38:03 +02:00
Oskar Hahn
f581169e1e Fixed saving anonymous user in a PersonField 2013-04-24 09:28:58 +02:00
Tobias Hößl
acba281581 Sorting agenda items with nestedSortable. 2013-04-23 17:24:27 +02:00
Oskar Hahn
ba75a34017 Fixed list of speakers overlay cache problem 2013-04-22 22:09:09 +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
Norman Jäckel
e1b149cde3 New config app. Apps only have to define config vars once. Config pages, forms and so on are created automaticly. 
Changes after some reviews are done.

Problematic is still that the JS can not be moved to an extra file because of the template tags in the code.
 2013-03-28 15:31:13 +01:00
Emanuel Schuetze
4e6818fb1a Compressed jquery-ui files (for agenda config). 2013-03-18 20:22:54 +01:00
Emanuel Schuetze
71b1bede6f Set new button als primary/blue button. 2013-03-09 14:17:30 +01:00
Emanuel Schuetze
48e1282cb9 Show duration clock only if start/end time is set. 2013-03-09 14:15:03 +01:00
Stefan Frauenknecht
45856fc9b0 add signal callback to provide defaults 2013-02-20 23:50:34 +01:00
Stefan Frauenknecht
f81abe215f Revert last changes 2013-02-20 23:48:04 +01:00
Oskar Hahn
4f3f917812 some small code design changes 2013-02-18 18:56:37 +01:00
Stefan Frauenknecht
1d1d72d45a Fixed if condition with duration property which can be None 2013-02-16 11:55:40 +01:00
Stefan Frauenknecht
8103c09b81 PEP8 errors resolved 2013-02-16 10:41:22 +01:00
Emanuel Schuetze
0b3b91b8d5 Show item-tooltip in bootstrap tooltip style. 2013-02-15 08:51:08 +01:00
Emanuel Schuetze
4f60160667 Added missing success_url_name. 2013-02-15 08:50:42 +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
Oskar Hahn
27c73092e1 Merge remote-tracking branch 'emanuel/newtemplate' into new_motion 
Conflicts:
	openslides/motion/templates/motion/overview.html
	openslides/motion/templates/motion/poll_view.html
	openslides/motion/templates/motion/view.html
 2013-02-06 09:25:27 +01:00
Emanuel Schuetze
6b4ee0e4f6 Updated translation. 2013-02-05 23:09:23 +01:00
Emanuel Schuetze
c8ddb21760 Fixed wrong hiding of open agenda child items if parent item is closed 2013-02-05 22:36:05 +01:00
Emanuel Schuetze
e49efb40d8 template: Added new css class for minimum column width. 2013-02-05 22:03:43 +01:00
Emanuel Schuetze
64e3c1f3cb template: Removed unused 'load staticfiles'. 2013-02-05 21:41:26 +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
Oskar Hahn
90614cc637 Updated some views for the new utils.views style 2013-02-03 19:43:36 +01:00
Oskar Hahn
139ba74459 Merge remote-tracking branch 'emanuel/newtemplate' into new_template 
Conflicts:
	.travis.yml
	INSTALL.txt
	openslides/agenda/templates/agenda/base_agenda.html
	openslides/agenda/templates/agenda/edit.html
	openslides/agenda/templates/agenda/item_row.html
	openslides/agenda/templates/agenda/overview.html
	openslides/agenda/templates/agenda/widget.html
	openslides/assignment/templates/assignment/base_assignment.html
	openslides/assignment/templates/assignment/config.html
	openslides/assignment/templates/assignment/edit.html
	openslides/assignment/templates/assignment/overview.html
	openslides/assignment/templates/assignment/poll_view.html
	openslides/assignment/templates/assignment/view.html
	openslides/assignment/templates/assignment/widget.html
	openslides/config/templates/config/general.html
	openslides/motion/templates/motion/base_motion.html
	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/motion/templates/motion/widget.html
	openslides/motion/views.py
	openslides/participant/templates/participant/base_participant.html
	openslides/participant/templates/participant/config.html
	openslides/participant/templates/participant/edit.html
	openslides/participant/templates/participant/group_edit.html
	openslides/participant/templates/participant/group_widget.html
	openslides/participant/templates/participant/import.html
	openslides/participant/templates/participant/login.html
	openslides/participant/templates/participant/overview.html
	openslides/participant/templates/participant/password_change.html
	openslides/participant/templates/participant/settings.html
	openslides/participant/templates/participant/user_widget.html
	openslides/projector/templates/projector/base_projector.html
	openslides/projector/templates/projector/control_countdown.html
	openslides/projector/templates/projector/control_overlay_message.html
	openslides/projector/templates/projector/custom_slide_widget.html
	openslides/projector/templates/projector/live_view_widget.html
	openslides/projector/templates/projector/new.html
	openslides/projector/templates/projector/overlay_widget.html
	openslides/templates/base.html
	openslides/utils/template.py
	openslides/utils/views.py
	requirements.txt
 2013-02-03 19:03:18 +01:00
Oskar Hahn
6c3eb0f765 fixed urls in views from the participant app 2013-02-01 17:35:27 +01:00
Stefan Frauenknecht
7f03e02e9a Item type changed from CharField to IntegerField. Constant type names added. 2013-02-01 15:13:40 +01:00
Stefan Frauenknecht
9f3dae8059 ConfigForm: Base classes reordered 2013-02-01 14:47:51 +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
Stefan Frauenknecht
5a9b7fdca5 Use permission 'can_see_orga_items' also to show/hide duration column and agenda time scheduling. (via Emanuel) 2013-01-31 20:37:55 +01:00
Stefan Frauenknecht
9746b3818f Rework code to ommit unnecessary filter call. 2013-01-31 20:32:29 +01:00
Stefan Frauenknecht
3dfd16558a Blanks removed 2013-01-31 18:35:52 +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
Stefan Frauenknecht
bc9dcffff4 #41 Time for each agenda item 2013-01-29 14:28:42 +01:00
Emanuel Schuetze
a4592ec849 Reworked projector activate buttons in agenda widget. 2013-01-18 21:44:47 +01:00
Emanuel Schuetze
586425354d Reworked new template, especially agenda and dashboard. 2013-01-08 23:05:35 +01:00
Stefan Frauenknecht
aee24425bc Ticket 433 - Organisational items 2013-01-05 23:52:29 +01:00
Emanuel Schuetze
13cd52bd96 Merged (conflicts). 2013-01-05 15:29:57 +01:00
Stefan Frauenknecht
bb74674c41 Deprecated import django.conf.urls.defaults adjusted. 2013-01-05 12:39:20 +01:00
Oskar Hahn
3229d86d4d Import urls.py needed django functions from django.conf.urls 2013-01-05 01:05:38 +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
804f842650 Updated the url template tag 2012-12-14 15:10:14 +01:00
Oskar Hahn
84324cf317 Updated translations 2012-12-09 12:59:56 +01:00
Oskar Hahn
6b2645d11c reordered the tests 
moved the tests from the openslides-module to an own module
configured coverage
 2012-11-24 15:00:17 +01:00
Oskar Hahn
bd32994296 cleanup 
Removed unused imports and fixed pep8 errors
 2012-11-24 14:01:21 +01:00
Norman Jäckel
af6c403936 Fix perms for agenda, motion and assignment widget. It is now set to projector.can_manage_projector. 2012-11-21 15:14:38 +01:00
Emanuel Schuetze
e601d8a5a3 Fixed display_name of widgets. 2012-11-08 09:43:04 +01:00
Oskar Hahn
79c5e93422 Redesigned the QuestioMixin 2012-10-28 19:59:41 +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
473c2c347f Removed unused base_agenda.html template. 2012-09-10 23:37:59 +02:00
Emanuel Schuetze
ce233fc870 Updated config template. 2012-09-10 17:40:41 +02:00
Emanuel Schuetze
6a3bead5f6 Cleanup template code and style. 2012-09-06 23:59:03 +02:00
Emanuel Schuetze
7fde53a09e Updated template with twitter bootstrap. Step 1: agenda and application. 2012-09-05 00:20:28 +02:00
Oskar Hahn
705fb972b1 removed projector link from agenda 2012-08-15 13:44:15 +02:00
Oskar Hahn
6b7ea558fc rewrote widgets for the dashboard 2012-08-15 11:56:43 +02:00
Oskar Hahn
bd64a6cb5c Merge branch 'stable/1.2.x' 
Conflicts:
	openslides/application/models.py
	openslides/application/views.py
	openslides/participant/forms.py
	openslides/participant/views.py
 2012-08-13 19:16:42 +02:00
Oskar Hahn
87af568eeb redesign the DeleteView 
Append a QuestionMixin to send a question via the django message api
 2012-08-10 21:00:13 +02:00
Oskar Hahn
c52f8f3ca7 changed application to motion and permitted to authorized in message-strings 2012-08-05 22:31:20 +02:00
Oskar Hahn
4873cd7163 fixted #330. Error if the related slide for an Agenda Item does not exists 2012-08-05 11:28:56 +02:00
Emanuel Schuetze
bf5181e241 Fixed missing translation in PDF title and filename. 2012-07-23 12:57:47 +02:00
Norman Jäckel
e74e80299f Fix application links in the widgets. 2012-07-23 00:41:44 +02:00
Oskar Hahn
fedfe802e3 #315 remove 'application' from agenda/widget.html, too 2012-07-20 13:26:45 +02:00
Oskar Hahn
ff4529d8eb #315 remove application from agenda by appending a new methode get_application_title_supplement 2012-07-20 11:22:09 +02:00
Oskar Hahn
469e93e21d rm beamer.html from agenda. created by merging the 1.2-dev branch in the default branch 2012-07-20 10:55:57 +02:00
Emanuel Schuetze
7ff3d1382d #304: Added link to projector-view for non-admins 2012-07-19 07:54:49 +02:00
Oskar Hahn
8f4970e16c merge 1.2-dev with default branch 2012-07-18 10:37:23 +00:00
Oskar Hahn
0b033271f8 fix some typos, mostly {%trans to {% trans 2012-07-16 14:00:29 +02:00
Norman Jäckel
5d5e7c10f5 Change strings in agenda overview and agenda widget concerning application items 2012-07-16 00:39:46 +02:00
Emanuel Schuetze
969816be37 Use new close icon to keep old done icon. 2012-07-13 07:58:00 +02:00
Norman Jäckel
e99e5ab290 Clean up browsertitles (#282) in assignment and participant tab 2012-07-13 01:10:58 +02:00
Norman Jäckel
32c80caa37 Clean up browsertitles (#282) in agenda and application 2012-07-13 00:44:12 +02:00
Emanuel Schuetze
ed7221e0f0 Changed to other 'done' icon to better defferentiate the projector activate icon. 
Changed link help text.
 2012-07-12 17:17:53 +02:00
Emanuel Schuetze
0c64309c91 Rename summary icon. 2012-07-12 17:11:33 +02:00
Emanuel Schuetze
531f0d9abb Added link help text. 2012-07-12 17:02:59 +02:00
Emanuel Schuetze
7487cf1601 Set summary icon in agenda widget at the right side to other action 
icons.
 2012-07-12 16:57:23 +02:00
Oskar Hahn
8cdcc95fd9 #286 import error in the agenda overview slide 2012-07-12 14:06:58 +02:00
Oskar Hahn
aa130ab2da cleanup openslides base files. 
Do not manipulate the pythonpath anymore.
 2012-07-10 14:00:51 +02:00
Oskar Hahn
5fcef8aba4 cleanup utils 2012-07-10 13:19:12 +02:00
Oskar Hahn
debaa505fb fix problems with reportlab and ugettext_lazy 2012-07-10 12:11:07 +02:00
Oskar Hahn
8d961f4940 fix translation by using ugettext_lazy 2012-07-10 01:33:03 +02:00
Norman Jäckel
812d7a3c83 Fix #275 2012-07-05 00:23:42 +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
29d25d30d6 cleanup the agenda app 2012-07-04 12:50:33 +02:00
Oskar Hahn
a72832842b #267 fixt typo. 
syncdb is required
 2012-07-04 11:00:58 +02:00
Norman Jäckel
32a5b61da8 Insert type of an related item in the agenda widget as string behind the name 
of the item
 2012-07-04 00:55:37 +02:00
Oskar Hahn
f903f350b8 insert item-summary link in the widget 2012-07-01 16:13:34 +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
Norman Jäckel
c19118e774 Fix #230 2012-06-30 14:17:15 +02:00
Oskar Hahn
b9f783e9f1 #237 translate the related type 2012-06-30 11:06:32 +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
Oskar Hahn
3d1e4f5489 #216 delete releated agenda-item, if the releated object (application or assignment) is deleted 2012-06-23 11:41:32 +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
b12ae6b0a0 #191 Create assignment-agenda Items 2012-06-23 10:27:58 +02:00
Oskar Hahn
b6cb4223f2 #217 show agenda text again. 2012-06-19 10:19:43 +02:00
Oskar Hahn
239f328372 rewrote projector-widget system 2012-06-11 13:43:48 +02:00
Oskar Hahn
43e30057b3 delete item, not application by releated agenda-items 2012-06-03 10:19:08 +02:00
Oskar Hahn
965b682abc edit, delete, slide for releated item in agenda 2012-06-03 09:35:26 +02:00
Emanuel Schuetze
0ab900cb7a Fixed missing permission of agenda submenu. 2012-05-23 14:30:42 +02:00
Emanuel Schuetze
92a64d38cf Add projector view link on front page. Fixed column for can_manage_projector permission. 2012-05-20 20:51:11 +02:00
Emanuel Schuetze
23fb97c7a2 #170: Use second submenu for agenda items. 2012-05-19 08:26:59 +02:00
Emanuel Schuetze
c99deb8a2a Increase max_length of agenda title field. 2012-05-18 10:24:43 +02:00
Emanuel Schuetze
4cef2762fe Fixed style in empty agenda overview table. 2012-05-17 21:38:37 +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
114b719cad Added comment column in agenda overview. 2012-05-14 21:55:36 +02:00
Emanuel Schuetze
fbf2256493 #182: Wrong permission for edit button in view template. 2012-05-14 21:55:02 +02:00
Emanuel Schuetze
3a0d243a6c Added agenda 'edit' button in view template. 2012-04-29 20:47:54 +02:00
Emanuel Schuetze
59c342ba8d #158: Move 'change tree' notification to correct position (above page title). 2012-04-27 21:53:50 +02:00
Emanuel Schuetze
822264ef7b #158: Added success notification for ItemCreate/ItemUpdate View. 2012-04-27 21:36:12 +02:00
Emanuel Schuetze
8ed8ca0c58 Automated merge with ssh://openslides.org/openslides 2012-04-27 08:04:53 +02:00
Emanuel Schuetze
3bcf4fd9c3 Added missing 'required' helptext to all forms. 2012-04-26 17:50:46 +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
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
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
81a0c9661e #119: Adjusted some icon filenames. 2012-04-23 08:07:21 +02:00
Emanuel Schuetze
f1908bca89 Fixed permissions for action columns. 2012-04-20 22:58:57 +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
42a2e44390 Updated translations. 2012-04-20 11:15:15 +02:00
Emanuel Schuetze
ae5efcfa9d Some minor fixes for agenda, application, participant overview table. 2012-04-20 08:14:23 +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
4adb221a9d #92: Projector control: Add projector preview icon for all entries. 2012-04-18 22:00:58 +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
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
fbaa88c23a #99 fixed problem with agenda-items and mptt 2012-04-18 14:36:03 +02:00
Emanuel Schuetze
81f4a8c5d5 Automated merge with ssh://openslides.org/openslides 2012-04-15 16:13:32 +02:00
Oskar Hahn
92305bf363 use item for item sid 2012-04-15 16:02:13 +02:00
Oskar Hahn
d2d3725eb6 fix agenda.test 2012-04-15 16:00:25 +02:00
Emanuel Schuetze
bc31a2df1a Automated merge with ssh://openslides.org/openslides 2012-04-15 15:53:10 +02:00
Emanuel Schuetze
f44f2723dc Added link to activate agenda item in overview table. 2012-04-15 15:53:05 +02:00
Oskar Hahn
90038c1ad2 fix error by activating the Agenda 2012-04-15 15:46:32 +02:00
Emanuel Schuetze
4967b2b358 New agenda view template. 2012-04-15 15:21:19 +02:00
Emanuel Schuetze
0657ff340d Show clickable done action in first column in agenda overview. 2012-04-15 14:28:01 +02:00
Emanuel Schuetze
ddeaea88c4 Moved agenda pdf link to submenu. 2012-04-15 14:16:00 +02:00
Emanuel Schuetze
4d7940cb12 Automated merge with ssh://openslides.org/openslides 2012-04-15 12:39:35 +02:00
Emanuel Schuetze
95d5929449 Added participant and version config page. Moved system settings to general. Some style work. 2012-04-15 12:39:28 +02:00
Oskar Hahn
a46e96841b remove AgendaSummary 2012-04-15 11:33:26 +02:00
Oskar Hahn
48558504c4 only ask to delete children from agenda-items, if there are some 2012-04-15 10:08:10 +02:00
Oskar Hahn
361bc40821 view for Agenda.item 2012-04-15 09:55:21 +02:00
Oskar Hahn
785bd7c9a4 rename agenda.item.transcript in agenda.item.comment for Version 1.2 2012-04-15 09:41:17 +02:00
Oskar Hahn
3a849880fb code for control view in apps 2012-04-14 20:10:49 +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
c0bf5ba822 Automated merge with ssh://openslides.de/openslides 2012-04-14 11:18:54 +02:00
Oskar Hahn
491c65cf24 use app name for projector category 2012-04-14 11:18:47 +02:00