Commit Graph

1016 Commits

Author SHA1 Message Date
Oskar Hahn 68215e78d6 add Licence for django-jsonfield 2012-07-11 09:45:48 +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 e22467b06e cleanup poll app 2012-07-10 11:48:03 +02:00
Oskar Hahn 01f0823ed7 cleanup the assignment app 2012-07-10 11:27:06 +02:00
Oskar Hahn 81fc7ae560 update translation 2012-07-10 02:53:49 +02:00
Oskar Hahn 85bddf6872 use "forname lastname" as default username, with a space 2012-07-10 02:50:42 +02:00
Oskar Hahn 96aca54f61 update user setting page 2012-07-10 02:46:00 +02:00
Oskar Hahn 403f8e7917 update translation 2012-07-10 02:21:27 +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 333349a1f2 Only show voteresult-table where there is at least one published poll.
Also fix AssignmentPDF-Poll-Table
2012-07-10 00:47:00 +02:00
Andy Kittner cd245e4605 Convert MEDIA_ROOT to unicode to avoid UnicodeWarning 2012-07-08 18:09:25 +02:00
Andy Kittner 5438b2c318 Add a workaround for django bug 18404 (fixes #204) 2012-07-08 18:09:23 +02:00
Oskar Hahn f074cb5bfd cleanup the imports of the application app 2012-07-08 09:21:39 +02:00
Oskar Hahn 8feb195067 fix typo 2012-07-08 09:01:01 +02:00
Oskar Hahn dc9dabff6d cleaned up the participant app. Sort of... 2012-07-07 15:26:00 +02:00
Oskar Hahn e01d456e7b clean up the config app. Use jsonfield to save the config values.
Syncdb necessary.
2012-07-07 14:48:21 +02:00
Oskar Hahn 15621b7702 clean up the projector App 2012-07-07 14:01:40 +02:00
Oskar Hahn eb3adcd8ca update translation 2012-07-07 11:20:30 +02:00
Oskar Hahn f8a1c58fff #277 throw an error, in the invalid-field or the votecast-field is lower -2 2012-07-07 11:14:04 +02:00
Oskar Hahn 1889cff68b #276 fix unicode Error in html_string() function 2012-07-07 10:35:29 +02:00
Oskar Hahn b0f561d429 realy fix lineend in assignment/view 2012-07-06 18:00:43 +02:00
Oskar Hahn 719d12e333 fix lineend in assignment/view.py 2012-07-06 17:56:17 +02:00
Norman Jäckel e29cf868a5 Always hide Group in Assignment PDF vote_results-table 2012-07-06 15:37:22 +02:00
Norman Jäckel e4367051df Hide "Reason" in Application PDF if there is none. 2012-07-06 15:30:14 +02:00
Norman Jäckel 59e6218a80 First Draft for Assignment PDF with fixed vote_results table. 2012-07-06 15:02:31 +02:00
Norman Jäckel c1e9540699 Fix #280 2012-07-05 01:15:04 +02:00
Norman Jäckel 812d7a3c83 Fix #275 2012-07-05 00:23:42 +02:00
Oskar Hahn ff44439351 #266 fix assignment view on the projector 2012-07-04 16:14:19 +02:00
Oskar Hahn ef5b9e3281 #253 don't show unpublished polls for nonmanager in assignment view 2012-07-04 16:05:31 +02:00
Oskar Hahn 47ff052c22 fix close and unclose link via ajax 2012-07-04 15:49:33 +02:00
Oskar Hahn b8a77e5abe rename passwort change page 2012-07-04 15:48:56 +02:00
Oskar Hahn 4e0f8670f1 update translation 2012-07-04 15:48: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
Oskar Hahn 7f2d10c9ca fix hide-closed-item function for non-manager 2012-07-04 13:12:07 +02:00
Oskar Hahn 76d2a33fc2 merge 2012-07-04 12:52:09 +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 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 ad8d5585f1 merge 2012-07-04 02:43:46 +02:00
Oskar Hahn 198eefbfdd rewrote projector overlay widget 2012-07-04 02:43:26 +02:00
Norman Jäckel 40c2bf481f Fix #240 2012-07-04 02:10:06 +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
Norman Jäckel ad02cb05ae Draft for vote result table on assignment view and projector. Publishing still not working. 2012-07-04 00:40:25 +02:00
Oskar Hahn 2dc0cc83f1 rewrote assignment poll output 2012-07-03 00:05:48 +02:00
Oskar Hahn a21a96026b fix yes-no-abstain-poll in assigmnet-projector 2012-07-02 20:32:13 +02:00
Oskar Hahn ebc81d9236 #255 fixed assignment-poll delete message 2012-07-01 17:38:34 +02:00
Oskar Hahn 8d4df3236b #243 fixt but, which created a second version for a new application 2012-07-01 17:20:02 +02:00
Oskar Hahn e1d13e31ae #214 seperate page for password change 2012-07-01 16:56:01 +02:00
Norman Jäckel 68e26ff8c5 Fix #256 2012-07-01 16:48:44 +02:00
Norman Jäckel acd9ba1fd1 Zusammenführen 2012-07-01 16:30:56 +02:00
Norman Jäckel d22118ac72 Fix #252 2012-07-01 16:28:11 +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
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
Oskar Hahn 0a269ce601 help_text for the application config page 2012-06-30 16:28:15 +02:00
Oskar Hahn 60570ea962 #245 update translation 2012-06-30 15:21:27 +02:00
Oskar Hahn 0f42dd06fd #234 take 75 chars at maximum 2012-06-30 14:50:52 +02:00
Oskar Hahn aeb8a40875 fix typo in trivial changes 2012-06-30 14:50:14 +02:00
Norman Jäckel c19118e774 Fix #230 2012-06-30 14:17:15 +02:00
Oskar Hahn 35e112a7d7 update translation 2012-06-30 12:24:23 +02:00
Oskar Hahn fe7266097f #249 improve assignment PDF 2012-06-30 12:07:55 +02:00
Oskar Hahn a48c63c132 #249 improve application pdf 2012-06-30 12:04:58 +02:00
Oskar Hahn 1b108603ea #239 don't show supporters in the application PDF, if they are disabled 2012-06-30 11:57:07 +02:00
Oskar Hahn 039446a7ca #239 don't show supporters in application edit form, if there are not needed 2012-06-30 11:50:46 +02:00
Oskar Hahn 018d53b3df #236, #244 make trivial_changes optional, and only in the edit form 2012-06-30 11:31:35 +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
Norman Jäckel 818a15aa2b Cf. #249 but now for assignments. 2012-06-29 11:52:23 +02:00
Norman Jäckel aa30a1900b Short message on PDF if there are no applications (#249) 2012-06-29 11:42:28 +02:00
Norman Jäckel cb2a4b9897 Application PDF: Fix #241 and insert version number 2012-06-29 11:22:47 +02:00
Oskar Hahn 09e6eec6f2 fix translation error in professional support 2012-06-29 00:38:34 +02:00
Oskar Hahn 587ce4093d update translation 2012-06-29 00:27:27 +02:00
Oskar Hahn 6d3061f8af cleaned poll pdf for assignment and application 2012-06-29 00:19:06 +02:00
Oskar Hahn a00fe2b241 fix yesnoababstain in views.py 2012-06-28 22:49:02 +02:00
Oskar Hahn 4af19d091b remove elected users from an election. 2012-06-28 20:12:49 +02:00
Oskar Hahn 2fdbad55f1 rename AssignmentPoll.yesnoababstain in .yesnoabstain 2012-06-28 20:11:16 +02:00
Oskar Hahn eafff30c49 fixe error in reverse calls 2012-06-28 20:10:48 +02:00
Norman Jäckel 3156c8b4b5 Turn on Yes-No-Abstain Ballot for Assignments/Elections, #108 2012-06-28 18:45:00 +02:00
Norman Jäckel 59fb053283 Fix #260 2012-06-28 01:14:51 +02:00
Norman Jäckel 409bfda353 Fix #257 2012-06-27 23:29:06 +02:00
Oskar Hahn 5311c7ae31 fix problem by the assignment-poll view 2012-06-24 23:31:06 +02:00
Oskar Hahn 6c66e55fc0 show right label for posts in new assignments 2012-06-24 22:38:42 +02:00
Oskar Hahn 4339c3ae8a allow to save an empty poll 2012-06-24 22:34:11 +02:00
Oskar Hahn 48c53d3cd0 link for creating an application agenda item in the sidebare 2012-06-24 22:21:46 +02:00
Oskar Hahn 3c04f6af82 translate poll options for assignments 2012-06-24 22:21:15 +02:00
Oskar Hahn 3e7e894d62 fix #250 don't allow assignments with not posts.
But for the future, see #251
2012-06-24 22:10:14 +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
Oskar Hahn 6a0bdb7aa2 the submitter of an application must not edit the application, after it was accepted 2012-06-24 21:52:21 +02:00
Oskar Hahn 391a10bb03 fix typo in frontpage_title 2012-06-23 15:42:25 +02:00
Oskar Hahn b963b61385 update german translation 2012-06-23 15:36:02 +02:00
Oskar Hahn 7df1264abf rearange the userprofile. Only show first line from the user.profile.comment in the overview 2012-06-23 15:02:13 +02:00
Oskar Hahn 442a24ccd8 #222 fix to small db collumns for assignment.status and config.value
db-reset necessary
2012-06-23 13:17:50 +02:00
Norman Jäckel 4edc4f503c Edit Symbol in Application 2012-06-23 13:17:24 +02:00
Norman Jäckel 654388117b #208 and other symbol things 2012-06-23 13:14:18 +02:00
Oskar Hahn cc42792a38 #164 call a assignmentpoll by this ballot number 2012-06-23 12:43:18 +02:00
Oskar Hahn ae8876425a min value for polls is -2 2012-06-23 12:05:09 +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 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 b12ae6b0a0 #191 Create assignment-agenda Items 2012-06-23 10:27:58 +02:00
Oskar Hahn f13ee5f409 make application tests run again 2012-06-19 10:50:55 +02:00
Norman Jäckel a439794874 Insert Edit Symbol (Ticket 207) 2012-06-23 09:32:21 +02:00
Oskar Hahn b6cb4223f2 #217 show agenda text again. 2012-06-19 10:19:43 +02:00
Oskar Hahn e8bf2fce1a yes-no-abstain elections in assignments 2012-06-18 09:48:27 +02:00
Oskar Hahn bf46342d17 #205 show Application number in projector Tab 2012-06-11 14:22:09 +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 53dd1687ca fixed last commit 2012-06-10 10:11:38 +02:00
Oskar Hahn cdef473491 fixe last commit 2012-06-10 10:08:04 +02:00
Oskar Hahn bb816e0999 load config on each request 2012-06-09 19:39:52 +02:00
Emanuel Schuetze 2ce9815218 Prepared 1.2-beta3 release. 2012-06-06 16:40:05 +02:00
Emanuel Schuetze a2e1b77bd6 #213 fixed (User settings form - remove User groups and active
fields).
2012-06-06 14:28:37 +02:00
Emanuel Schuetze 07a682c436 Set is_active for new participants to True. 2012-06-06 13:59:46 +02:00
Emanuel Schuetze a6c220ca02 Reverted wrong testing code (for participants) from last commit. 2012-06-06 13:51:54 +02:00
Emanuel Schuetze d8cd0c2b6a Renamed logo files (typo). 2012-06-04 10:17:56 +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
Andy Kittner 7e7ab210ab Set system url on first run (#211) 2012-05-31 00:27:47 +02:00
Andy Kittner 29057b8b87 Fix exceptions if project path contains non-utf8 characters (#204)
Django converts byte strings in various places to unicode by decoding them from
utf-8, which will break if the filesystem encoding uses something else
(e.g. fileystem encoding is latin1 and the path contains german umlauts).

Avoid these problems by explicitly decoding all paths to unicode using an
appropriate encoding.
2012-05-30 23:30:24 +02:00
Emanuel Schuetze 8cdc062628 Set version number back to dev mercurial revision 2012-05-25 09:34:50 +02:00
Emanuel Schuetze f7eab29ed5 Fixed missing translation in poll_view assignment template (table head). 2012-05-23 14:31:12 +02:00
Emanuel Schuetze 0ab900cb7a Fixed missing permission of agenda submenu. 2012-05-23 14:30:42 +02:00
Emanuel Schuetze 279dade5c4 Fixed missing SITE_ROOT import. 2012-05-23 14:30:06 +02:00
Emanuel Schuetze 44c4fffc25 Added missing default TIME_ZONE in default.settings.py. 2012-05-23 14:29:11 +02:00
Emanuel Schuetze 0acf6734e9 Updated translations. 2012-05-21 22:02:55 +02:00
Emanuel Schuetze 7933dd2d5c Minor fixes. 2012-05-21 22:01:09 +02:00
Emanuel Schuetze 58fc689f14 Updated overlay message style in projector template. 2012-05-21 09:21:36 +02:00
Emanuel Schuetze a737ef7300 Prepared 1.2-beta2 release. 2012-05-21 08:16:40 +02:00
Andy Kittner 0007a1dfa8 Add log messages when poll is updated/deleted (#187) 2012-05-20 23:12:50 +02:00
Emanuel Schuetze 37619b0a80 #114: Set participants tab inactive if usersettings page is active 2012-05-20 22:34:41 +02:00
Emanuel Schuetze f8137da055 #203: Fixed highlighting more than one active line. 2012-05-20 22:20:17 +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 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 4389f5f548 #89: Added missing control_customslide.html template. 2012-05-20 20:15:49 +02:00
Emanuel Schuetze c4450bf14e Updated translations. 2012-05-20 20:02:48 +02:00
Emanuel Schuetze 97bea50b03 Use single url for toggle publish/unpublish election ballots. 2012-05-20 20:02:36 +02:00
Emanuel Schuetze 9b6640c2ae Removed unused link var. 2012-05-20 19:44:29 +02:00
Emanuel Schuetze 406a2d18e3 Fixed can_manage_projector permission. 2012-05-20 19:43:38 +02:00
Emanuel Schuetze 189c975137 Use same url to toggle participant status. 2012-05-19 19:22:20 +02:00
Emanuel Schuetze 3a52cd56c6 #165: Use AJAX instead of page reload to publish assignment polls 2012-05-19 16:25:55 +02:00
Andy Kittner fbc603b748 Fix initial value for pollform is value is a "special" value (#135) 2012-05-19 14:19:32 +02:00
Andy Kittner 182f20308b Fix exception in polls with special values (fallout from translation fix) 2012-05-19 13:41:30 +02:00
Andy Kittner e005863336 Changed/ added logmessages for applications (#184, #187)
- Added a logmessage when a version is accepted/ rejected

- Made logmessage for trivial changes more explicit and include
  the names of the changed fields

- Updated translations
2012-05-19 12:46:54 +02:00
Andy Kittner 5aead54a0c Improve error message for failed logins (#199)
While #199 was already closed I think passing on the original
error message is more userfriendly as it gives more details
what the actual error was (generates specific messages for
user inactive and disabled cookies)
2012-05-19 10:48:29 +02:00
Andy Kittner d3cf5c9311 Correctly handle first time passwords (#194)
- Save User object after setting the password

- Only generate first time password if none was explicitly specified
2012-05-19 10:33:59 +02:00
Emanuel Schuetze 3f4119f182 #199: Changed login error message. Updated translation. 2012-05-19 08:44:46 +02:00
Emanuel Schuetze 23fb97c7a2 #170: Use second submenu for agenda items. 2012-05-19 08:26:59 +02:00
Emanuel Schuetze 188fe4cce5 Fixed missing check for activeline in assignment overview. 2012-05-19 08:15:20 +02:00
Emanuel Schuetze 07c587a025 #186: Fixed published polls/ballot column on projector template. 2012-05-19 08:09:18 +02:00
Emanuel Schuetze 2dc156ef74 Automated merge with ssh://openslides.org/openslides 2012-05-18 23:25:51 +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 3f722d3b27 Add --insecure to runserver args in order to always server static files
See: https://docs.djangoproject.com/en/1.4/ref/contrib/staticfiles/
2012-05-18 22:34:59 +02:00
Emanuel Schuetze ebe5381439 Automated merge with ssh://openslides.org/openslides 2012-05-18 19:38:26 +02:00
Emanuel Schuetze b81469703b #198: Optimized submenu of application and assignment. 2012-05-18 19:38:21 +02:00
Emanuel Schuetze c99deb8a2a Increase max_length of agenda title field. 2012-05-18 10:24:43 +02:00
Emanuel Schuetze 8ec3099620 #197: Rename the default User Group "Delegierte" to "Delegierter" 2012-05-17 22:03:48 +02:00
Emanuel Schuetze 4cef2762fe Fixed style in empty agenda overview table. 2012-05-17 21:38:37 +02:00
Emanuel Schuetze 0351627234 Fixed title in assignment projector template. 2012-05-17 21:36:18 +02:00
Emanuel Schuetze ca2900e9d1 #195: Fixed unicode string in pdf header. 2012-05-17 21:34:19 +02:00
Emanuel Schuetze 92562aef28 #188: Fixed projector template style error. 2012-05-15 20:36:49 +02:00
Andy Kittner 298cefcb45 Fix error when creating new applications (introduced by translation fix) 2012-05-15 20:10:54 +02:00
Emanuel Schuetze 61fe84a780 Removed LANGUAGE_CODE and TIME_ZONE from default.settings.py. LANGUAGE_CODE no longer required after fix of rev615. 2012-05-15 19:51:40 +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 c19025ceb3 #190: Fixed typo in translation. 2012-05-14 23:10:17 +02:00
Emanuel Schuetze 3324ce6131 Removed help text of active form field by overriding. 2012-05-14 23:07:24 +02:00
Emanuel Schuetze 1d6a0bee4e #174: Change form field 'groups' to 'user groups'. 2012-05-14 23:04:00 +02:00
Emanuel Schuetze 31ae7c38c9 #192: i18n-de: Beamer -> Projektor 2012-05-14 22:16:13 +02:00
Emanuel Schuetze 304013649b Changed default event description. Updated tranlsations. 2012-05-14 22:08:40 +02:00
Emanuel Schuetze bc9765230c #185: Wrong permission to print assignments. 2012-05-14 22:02:45 +02:00
Emanuel Schuetze bb5fcf4d6d #183: Wrong permission to print application. 2012-05-14 22:00:22 +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 d8807ba979 #180: Ballot description. Fixed ballot number function. 2012-05-14 21:34:46 +02:00
Emanuel Schuetze 911b7ebac8 Changed po file header. 2012-05-11 07:38:56 +02:00
Emanuel Schuetze b65e21e08f #100: Fixed wrong permissions. 2012-04-30 08:50:35 +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 3faa91f5a4 Updated translation. 2012-04-30 08:23:06 +02:00
Emanuel Schuetze 1089e61011 Modified support help text. 2012-04-29 21:58:16 +02:00
Emanuel Schuetze 8bdd57cada Prepare 1.2-beta1 release. 2012-04-29 21:43:21 +02:00
Emanuel Schuetze 616a34e8a9 Changed style: td:hover to tr:hover. 2012-04-29 21:32:29 +02:00
Emanuel Schuetze 412e672ea1 Set default language for model/form translation strings. Have to changed for English installation!
(Template strings are translated automatically by selected browser language)
2012-04-29 21:17:15 +02:00
Emanuel Schuetze 8c8a3e9fc2 Updated translations. 2012-04-29 20:48:10 +02:00
Emanuel Schuetze 3a0d243a6c Added agenda 'edit' button in view template. 2012-04-29 20:47:54 +02:00
Emanuel Schuetze 2186561b6e Removed LANGUAGE_CODE ('de') because django uses language selected by browser. Default language is 'en'. 2012-04-29 19:33:57 +02:00
Emanuel Schuetze 79605531c5 Some minor style fixes for poll view templates. 2012-04-29 19:12:18 +02:00
Emanuel Schuetze 905d9d546c Fixe pdf icon path. 2012-04-29 19:01:18 +02:00
Emanuel Schuetze e1799b4c83 #155: remove header/footer in first-password-pdf 2012-04-29 18:58:51 +02:00
Emanuel Schuetze 4e8e9b5407 #155: Remove header/footer in frameless PDF. 2012-04-29 18:54:42 +02:00
Emanuel Schuetze dd10a59533 #109: New second submneu for election view. 2012-04-28 23:10:19 +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
René Köcher 4f98c0c571 #163: Sorting by title or creation time returns one entry for each version of an application 2012-04-28 08:45:11 +02:00
Andy Kittner 7b8f882f0d Fallback to localhost if IP of current hostname can't be determined 2012-04-27 22:54:20 +02:00
Emanuel Schuetze 2c2a99d738 Automated merge with ssh://openslides.org/openslides 2012-04-27 22:47:47 +02:00
Emanuel Schuetze 1a4a748e6c #112: Use monotype for printing first time password 2012-04-27 22:47:41 +02:00
René Köcher 537571ec69 #100 Delete applications by admin/superuser only: part2 2012-04-27 22:46:27 +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 20ce7579ce #158: Added from_invalid error notification for ItemCreate/Update. 2012-04-27 21:40:42 +02:00
Emanuel Schuetze 822264ef7b #158: Added success notification for ItemCreate/ItemUpdate View. 2012-04-27 21:36:12 +02:00
René Köcher 81bc19730b #100 Delete applications by admin/superuser only: part1 2012-04-27 21:22:44 +02:00
Emanuel Schuetze 710882c28a #96 Countdown: Improve control icons 2012-04-27 17:42:05 +02:00
Emanuel Schuetze 8ed8ca0c58 Automated merge with ssh://openslides.org/openslides 2012-04-27 08:04:53 +02:00
Emanuel Schuetze f97529518e Updated translations. 2012-04-27 08:04:16 +02:00
Emanuel Schuetze 804c3da59a Updated tranlation string. 2012-04-27 08:02:01 +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 7f54331d0c Merge r559.. 2012-04-27 07:52:53 +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
Andy Kittner 8da2f0f041 Fix start script broken by r550
Defer importing modules that require the DJANGO_SETTINGS_MODULE
to be available until  prepare_openslides() had a chance to set
everything up.
2012-04-27 01:09:12 +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 aac48a0b02 Redesign overlays. 2012-04-26 08:52:20 +02:00
Emanuel Schuetze 8a4163b019 Fixed scroll bug in base.css. 2012-04-25 23:07:54 +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
Andy Kittner dda3078fe0 Detect if the database was deleted and run syncdb if necessary (fixes #156) 2012-04-25 19:37:51 +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 3cb7417028 Minor CSS fixes. 2012-04-25 09:18:10 +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 3d0fe9b565 Updated translations. 2012-04-23 22:07:34 +02:00
Emanuel Schuetze cfcd2d10d7 Fixed wrong icon filename. 2012-04-23 21:48:20 +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 61b9d476ab Set default config values. 2012-04-22 16:55:16 +02:00
Emanuel Schuetze 1b8c1eda91 Updated translations. 2012-04-22 16:51:22 +02:00
Emanuel Schuetze 039bd4121c Some assignment poll template fixes. 2012-04-21 22:27:11 +02:00
Emanuel Schuetze 99bfd7257b #120: Add CSS class for helptext in forms. 2012-04-21 22:23:46 +02:00
Emanuel Schuetze 61d4d1ca2f #136: Fixed missing polls in projector view 2012-04-21 21:38:59 +02:00
Emanuel Schuetze 5f3c6c4821 #111: Move pdf creation code from utils to participant app. 2012-04-20 23:23:50 +02:00
Emanuel Schuetze f1908bca89 Fixed permissions for action columns. 2012-04-20 22:58:57 +02:00
Emanuel Schuetze f711f96265 #107: New actions column for elections. 2012-04-20 22:58:34 +02:00
Emanuel Schuetze 667582cdfb #106: add pdf link to actions column 2012-04-20 22:47:44 +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 6125f1d88b Minor javascript fix. 2012-04-20 22:41:57 +02:00
Emanuel Schuetze ccc1d2b707 #104: Updated second submneu for application. 2012-04-20 22:13:47 +02:00
Emanuel Schuetze 7a6eaf2660 Fixed building AssignmentPollPDF. 2012-04-20 14:33:40 +02:00
Emanuel Schuetze f393789f2d Show min. 1 application ballot. 2012-04-20 13:41:09 +02:00
Emanuel Schuetze 4ecff16aba copyright 2011 -> 2012. 2012-04-20 12:44:45 +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
Oskar Hahn e23c195388 show application title in presentation view 2012-04-19 11:10:36 +02:00
Oskar Hahn 74c704641c fixed yes, no, abstain values in the presentation View of an Application 2012-04-19 11:08:22 +02:00
Oskar Hahn 1d285a1c15 remove print 2012-04-18 23:36:52 +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 236bbfd3bc Automated merge with ssh://openslides.org/openslides 2012-04-18 22:01:06 +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 59225bf822 added default get_filename for PDFView 2012-04-18 20:57:44 +02:00
Oskar Hahn 07e9d8e9f9 rewrote application filters 2012-04-18 19:57:39 +02:00
Emanuel Schuetze a35e1917a4 Removed unused icons. 2012-04-18 19:52:37 +02:00
Emanuel Schuetze 7eb410f093 #104: Application submenu. 2012-04-18 19:50:51 +02:00
Emanuel Schuetze ee4d7da04a #105: Show Ballot number for applications. Some application PDF work. Set default config values. 2012-04-18 19:30:32 +02:00
Oskar Hahn 9f70b2ff1c rename ballout def in application and assignment 2012-04-18 19:02:41 +02:00
Oskar Hahn a77038fbf4 removed some old countdown code, defined some default values 2012-04-18 18:55:33 +02:00
Emanuel Schuetze 4b2211d59f Automated merge with ssh://openslides.org/openslides 2012-04-18 18:54:52 +02:00
Emanuel Schuetze 3812b5ebd1 #103: Set application filename. 2012-04-18 18:54:48 +02:00
Oskar Hahn 23df763b1f fix message issus: #134, also defined some default config-values 2012-04-18 18:35:02 +02:00
Emanuel Schuetze 67db762575 Automated merge with ssh://openslides.org/openslides 2012-04-18 18:29:34 +02:00
Emanuel Schuetze 4ce8facd1a #98: Add new filter for active/inactive items. 2012-04-18 18:29:31 +02:00
Oskar Hahn 0dde1738cf fixed active line #88 2012-04-18 18:07:24 +02:00
Oskar Hahn e9e9fa54b2 fixed problem with deleting the default permissions 2012-04-18 16:57:33 +02:00
Oskar Hahn 49e2f73df4 #92 preview for slides 2012-04-18 15:47:51 +02:00
Oskar Hahn 6798050ded added help_message 2012-04-18 15:04:16 +02:00
Oskar Hahn 67384d0644 indent items in control view 2012-04-18 14:53:19 +02:00
Andy Kittner aa54ac6d7d Fix settings.py creation on python-2.5 (Closes #133)
dir() was not overrideable on python2.5 so it doesn't trigger an import
of the real settings module. Use getattr() instead, this works accross all
versions.
2012-04-18 16:41:12 +02:00
Oskar Hahn fbaa88c23a #99 fixed problem with agenda-items and mptt 2012-04-18 14:36:03 +02:00
Oskar Hahn be6a63e48c show version from plugins 2012-04-18 09:33:09 +02:00
Emanuel Schuetze 040b5ffb45 Fixed #125: Assignment PDF: Invalid votes and votes cast doesn't support special values '-1' and '-2'. 2012-04-17 21:16:55 +02:00
Oskar Hahn a3d7cc98a9 #110 error in application pdf printing 2012-04-17 17:47:37 +02:00
Oskar Hahn 189cfa1309 translate poll values 2012-04-17 17:35:50 +02:00
Oskar Hahn 0a8d40e2ac slideUp read messages 2012-04-17 14:45:25 +02:00
Oskar Hahn 56f1a15cac added function to set messages in JavaScript 2012-04-17 13:41:43 +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 da8c3c0bba show pollresults in application projector 2012-04-16 17:21:41 +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 3bceca2359 use plugin.NAME for submenu-title in config-tab 2012-04-16 11:36:50 +02:00
Oskar Hahn 80c5bfbba9 translation in JS-files 2012-04-16 11:12:21 +02:00
Oskar Hahn c1cd0a2805 send class, not object, for template_manipulation 2012-04-16 11:11:45 +02:00
Emanuel Schuetze 81f4a8c5d5 Automated merge with ssh://openslides.org/openslides 2012-04-15 16:13:32 +02:00
Emanuel Schuetze 84731a07d5 Updated application view submenu. 2012-04-15 16:13:26 +02:00
Andy Kittner beaa3e341a Create portable win32 binary distribution 2012-04-15 16:04:08 +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 8b7fdc7a5c Automated merge with ssh://openslides.org/openslides 2012-04-15 15:21:23 +02:00
Emanuel Schuetze 4967b2b358 New agenda view template. 2012-04-15 15:21:19 +02:00
Oskar Hahn a3808c7b30 fixed problem in assignment poll 2012-04-15 14:58:05 +02:00
René Köcher b620c0afb7 Add 'zoom' css attribute if we detect MSIE. 2012-04-15 14:51:50 +02:00
Emanuel Schuetze da9861b9f7 Automated merge with ssh://openslides.org/openslides 2012-04-15 14:28:34 +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 82d4a2de4b Try to get a working beamer preview for more browsers. 2012-04-15 14:27:27 +02:00
Emanuel Schuetze ddeaea88c4 Moved agenda pdf link to submenu. 2012-04-15 14:16:00 +02:00
Emanuel Schuetze abf7721f3f Filled frontpage with config values. 2012-04-15 13:26:01 +02:00
Oskar Hahn 91c9e1e9ab some fixes 2012-04-15 13:10:24 +02:00
Oskar Hahn 6f0fd91ec2 some permission problems 2012-04-15 12:52:59 +02:00
Oskar Hahn ae5c6b84a8 fixed webkit error be disable a button 2012-04-15 12:40:35 +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 d4d91c8194 fixed printing applications 2012-04-15 12:11:03 +02:00
Oskar Hahn f4ed79b68d Application view: added link to edit a poll 2012-04-15 11:48:31 +02:00
Oskar Hahn bf5ae10552 remove Application.poll. projector slide 2012-04-15 11:39:38 +02:00
Oskar Hahn 5678d9dd5e deactivate supporters by default 2012-04-15 11:35:06 +02:00
Oskar Hahn a46e96841b remove AgendaSummary 2012-04-15 11:33:26 +02:00
Oskar Hahn 1d5455f8f9 frontpage 2012-04-15 11:24:40 +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 195ddddf7e Automated merge with ssh://openslides.org/openslides 2012-04-15 10:36:51 +02:00
Emanuel Schuetze c07c2ac853 Print openslides version number in separat config template. 2012-04-15 10:36:37 +02:00
Oskar Hahn 3222e75ab5 debounds from buttons 2012-04-15 10:30:34 +02:00
Emanuel Schuetze 5f2c778880 Automated merge with ssh://openslides.org/openslides 2012-04-15 10:10:35 +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
Emanuel Schuetze b1c86d4c19 Import template pages: Link to wiki page. 2012-04-15 10:07:45 +02:00
Oskar Hahn e752ddf3ee fixe error with tabs in DetailView 2012-04-15 10:02:53 +02:00
Oskar Hahn 361bc40821 view for Agenda.item 2012-04-15 09:55:21 +02:00
Emanuel Schuetze 8149686a04 Updated German translation from "Benutzergruppe" to "Benutzerrolle". Some translation fixes. 2012-04-15 09:48:01 +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
Emanuel Schuetze 36ca264931 Remove superuser function. 2012-04-15 09:35:51 +02:00
Emanuel Schuetze bd3bf9fb6f Updated translation. 2012-04-15 09:27:57 +02:00
René Köcher e9ad4de11f Minor template fix.. 2012-04-14 22:45:33 +02:00
René Köcher aef2a08666 Minor template fixes. 2012-04-14 22:41:02 +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 6df95a23f6 Updated translations. 2012-04-14 19:33:50 +02:00
Emanuel Schuetze df7883deeb Merged. 2012-04-14 19:18:36 +02:00