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
Emanuel Schuetze
4abd79e7b5
Added PDF document title.
2012-04-14 10:54:22 +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
a1c5766e7a
Adjusted app prefix in urls.py (outsource in global urls.py). Some code formatting.
2012-04-13 21:43:16 +02:00
Oskar Hahn
bb430fd2a7
remove admin, add plugin system for openslides
2012-04-13 14:05:51 +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
e5ef0ac424
#79 : Replaced winner cup icon of elected candidates into green check.
2012-04-02 07:30:52 +02:00
Emanuel Schuetze
0976206eb4
Reverted changset r279 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:20:43 +02:00
Emanuel Schuetze
ac9d31d7d4
Reverted changset r280 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:18:18 +02:00
Emanuel Schuetze
c6a40f4dcb
Reverted changset r281 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:17:50 +02:00
Emanuel Schuetze
a06d20a8d8
Reverted changset r282 from Default branch (because it's for
...
1.2-dev-branch only).
2012-03-28 15:17:29 +02:00
Oskar Hahn
c4c42611b4
generate tab liste by app list
2012-03-18 17:11:58 +01:00
Oskar Hahn
ad38a8eead
put some lines in agenda template in seperate File
2012-03-18 15:11:01 +01:00
Oskar Hahn
fb17b16fae
config pages in apps
2012-03-16 14:31:59 +01:00
Oskar Hahn
7a63ec6f10
created model for pojector slides
2012-03-12 18:22:18 +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
a2230c9077
fixed error when deleting item without the children
2012-02-21 13:36:00 +01:00
Oskar Hahn
898cab4aa8
Generate Agenda-PDF in a generic View. Added PDFView in utils.views.py
2012-02-21 13:17:42 +01:00
Oskar Hahn
c55f240e84
some bug fixes
2012-02-20 20:35:12 +01:00
Oskar Hahn
e85822ebc9
updated agenda unittests
2012-02-20 19:39:53 +01:00
Oskar Hahn
4e16c6639b
some minor bug fixes
2012-02-20 19:39:26 +01:00
Oskar Hahn
8c597a2eb3
load form-css-classes from utils.forms.py instead to define it on every form
2012-02-20 18:44:02 +01:00
Oskar Hahn
8c52ecd669
generic views for the Agenda-App
2012-02-20 17:46:45 +01:00
Oskar Hahn
ab99f791f1
we don't need the item-sort-def anymore
2012-02-20 00:15:44 +01:00
Oskar Hahn
22ef402a50
use django-mptt to ordner the Agenda
...
http://django-mptt.github.com
you have to run:
pip install django-mptt
2012-02-20 00:14:54 +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
0957de83a9
start to rewrite the poll-api
2012-02-14 16:31:21 +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
Oskar Hahn
8275484d84
some errors occured with the new beamer app in agenda
2012-02-06 10:10:20 +01:00
Oskar Hahn
5f6c96b3e8
assignment and application can be beamt without a item-element
2012-02-03 23:12:28 +01:00
Oskar Hahn
fe2efb03fa
import some functions from beamer.api
2012-02-03 20:57:08 +01:00
Oskar Hahn
6273f0ff44
beamer zeug in extra app ausgelagert
2012-02-03 20:49:16 +01:00
Emanuel Schuetze
3992b04dc2
#69 : Added missing config option to publish voting results for selected
...
winners only.
2012-01-27 08:51:05 +01:00
Emanuel Schuetze
69befddc90
Added incompleted unit tests from changeset 247 for ongoing work of next release.
2011-11-17 17:06:39 +01:00
Emanuel Schuetze
c88ff41805
Reordered config tab subpages.
2011-11-14 23:40:19 +01:00
Emanuel Schuetze
3ae853f082
Removed incompleted unit tests for 1.1 release.
2011-11-14 22:54:31 +01:00
Emanuel Schuetze
763b8c15e1
Improve confirm agenda item delete message dependent on childrens available or not.
2011-11-14 21:52:33 +01:00
Emanuel Schuetze
b0f9ab09d5
Added link to countdown timer config option.
2011-11-14 20:17:48 +01:00
Emanuel Schuetze
9feca83bb3
Fixed IE CSS issues (with white-space: nowrap).
2011-11-14 20:14:56 +01:00
Emanuel Schuetze
eb35289e4e
Fixed #57 : <button> inside <a> tag not working in IE.; Added new icon for anonymous login.
2011-11-14 19:33:45 +01:00
Emanuel Schuetze
bc9326e567
Removed knockout.js (no longer required).
2011-11-09 21:26:05 +01:00
Emanuel Schuetze
076699ff45
#52 : Added countdown on projector view with control unit (agenda overview) and time variable (general settings).
2011-11-09 21:16:02 +01:00
Emanuel Schuetze
cea2992ca0
Application: Show profile instead of submitter username.
2011-09-21 21:26:44 +02:00
Emanuel Schuetze
54b148a704
Splitted up hidden agenda items in new table section.
2011-09-21 21:23:22 +02:00
Emanuel Schuetze
042eae9ecc
Allowed HTML for Item Text.
2011-09-21 21:23:00 +02:00
Emanuel Schuetze
bd9891fe5e
Show results for elected candidates only (assignment beamer view).
2011-09-21 21:21:01 +02:00
Emanuel Schuetze
28d7d17587
Removed empty character for no results cell.
2011-09-21 21:17:22 +02:00
Emanuel Schuetze
2f027663ed
Improved assignment projector view.
2011-09-21 21:14:19 +02:00
Emanuel Schuetze
10e8b95b1b
Show 'hidden' information in agenda item type column for hidden items (visible for managers only).
2011-09-21 21:13:33 +02:00
Emanuel Schuetze
d85b9e11fa
Added new item-done-column for all non-manager.
2011-09-21 21:12:15 +02:00
Emanuel Schuetze
947d54b8dd
Show blue elected line for beamer ajax view.
2011-09-21 21:10:23 +02:00
Emanuel Schuetze
e640241154
Updated translations. Fixed style and display of votes invalid, votes cast.
2011-09-11 22:43:15 +02:00
Oskar Hahn
10c3d624fe
replace -2 with undocumented in beamer view of polls
2011-09-09 22:34:55 +02:00
Emanuel Schuetze
475b7a1ffe
Updated application projector view.
2011-09-08 18:57:11 +02:00
Emanuel Schuetze
adebbf4125
Automated merge with ssh://openslides.org/openslides
2011-09-08 12:30:40 +02:00
Emanuel Schuetze
5a3f336cdf
Added "published" attribute for poll object. Adjusted assignment
...
views and templates.
2011-09-08 12:30:34 +02:00
Oskar Hahn
508be2f4eb
beamer clean link
2011-09-08 09:23:21 +02:00
Emanuel Schuetze
1f5d86a0fc
Show assignment vote results on projector view.
2011-09-07 23:25:59 +02:00
Emanuel Schuetze
fa71a1236d
Count numbers of application, assignments and participants. Some minor style fixes.
2011-09-07 19:35:06 +02:00
Emanuel Schuetze
d8a880105a
Some minor renames (applications # -> no., beamer -> projector etc.)
2011-09-06 23:23:05 +02:00
Emanuel Schuetze
ecc728c8e9
Some agenda style changes.
2011-09-06 18:45:34 +02:00
Emanuel Schuetze
cdfb6b24e3
Mark elected candidates in beamer view.
2011-09-06 07:33:13 +02:00
Emanuel Schuetze
7eac8cda5d
Beamer: Display election status finished.
2011-09-05 21:53:15 +02:00
Emanuel Schuetze
0b17ab10fe
Fixed candidates order in beamer view. Some style changes.
2011-09-05 20:47:55 +02:00
Emanuel Schuetze
b7a1afd3a2
Changed url 'item' to 'agenda'.
2011-09-04 19:22:30 +02:00
Emanuel Schuetze
53ee9c598d
Added icons for controling beamer view (pan,zoom)
2011-09-04 19:08:20 +02:00
Emanuel Schuetze
57ea883d51
Updated permissions.
2011-09-04 12:33:06 +02:00
Emanuel Schuetze
d1d0e7e9b4
Updated permissions.
2011-09-04 12:21:58 +02:00
Oskar Hahn
bd4504b40e
typo in agenda
2011-09-04 00:29:23 +02:00
Oskar Hahn
c22d35cd43
scroll and scall the beamer
2011-09-04 00:18:11 +02:00
Oskar Hahn
4639e77549
apply link redirect to edit-form, if it was a new form
2011-09-03 18:35:19 +02:00
Emanuel Schuetze
ba28afdc49
Added icons to hide/show hidden agenda items. Some style changes.
2011-09-03 18:11:05 +02:00
Emanuel Schuetze
762f09197d
Updated translations.
2011-09-03 16:36:49 +02:00
Emanuel Schuetze
e23a498b83
Merged.
2011-09-03 16:22:43 +02:00
Emanuel Schuetze
021fb27833
Added apply buttons. Some style changes. Fix permissions.
2011-09-03 16:20:10 +02:00
Oskar Hahn
aab2916d6d
hide closed elements in the agenda
2011-09-03 15:08:20 +02:00
Emanuel Schuetze
7c866e11e4
Removed ItemPoll and ItemFormPoll.
2011-09-03 14:36:01 +02:00
Emanuel Schuetze
8ef3d485fe
Exluded weight field from item forms.
2011-09-03 14:30:56 +02:00
Oskar Hahn
b626d049fe
ask, if by deleting an item, if the childen shoud be deleted as well
2011-09-03 12:45:19 +02:00
Oskar Hahn
0c931559a0
apply button in agenda edit form
2011-09-03 12:14:17 +02:00
Oskar Hahn
f5d2a503d0
Automated merge with ssh://oshahn.de/openslides
2011-09-03 11:46:22 +02:00
Oskar Hahn
dcbeb452fb
canidate in assignment can be marked as elected
2011-09-03 11:42:44 +02:00
Emanuel Schuetze
689b6e1706
Automated merge with ssh://openslides.org/openslides
2011-09-03 10:52:36 +02:00
Emanuel Schuetze
ca0c50caef
Many improvements for application and assignment poll system.
2011-09-03 10:52:29 +02:00
Emanuel Schuetze
ed40977403
Removed reduced agenda pdf. Not useable.
2011-09-03 01:24:50 +02:00
Oskar Hahn
a9775bdd73
api for ajax requests
2011-09-02 20:46:24 +02:00
Oskar Hahn
462cba2416
close and open a slide with ajax
2011-08-31 23:47:31 +02:00
Oskar Hahn
4e03fe90bc
active Item by ajax and prepared other ajax features
2011-08-31 18:25:03 +02:00
Oskar Hahn
628de1f954
typo
2011-08-31 14:32:02 +02:00
Oskar Hahn
78bd65a700
add knockout api
2011-08-31 14:26:46 +02:00
Oskar Hahn
67c6fdba29
use a-tag instead of onclick for nojs use
2011-08-31 14:17:11 +02:00
Emanuel Schuetze
d41a1c4791
Fixed: parent form field is not required.
2011-08-02 21:40:08 +02:00
Oskar Hahn
3db6a12024
Add code
2011-07-31 10:46:29 +02:00
