Emanuel Schuetze
e49efb40d8
template: Added new css class for minimum column width.
2013-02-05 22:03:43 +01:00
Emanuel Schuetze
bfd01e67b6
template: Removed unused 'cycle' template tag.
2013-02-05 21:55:41 +01:00
Emanuel Schuetze
64e3c1f3cb
template: Removed unused 'load staticfiles'.
2013-02-05 21:41:26 +01:00
Emanuel Schuetze
8388774f12
template: Minor style changes.
2013-02-05 21:33:07 +01:00
Emanuel Schuetze
82e35bebff
Fixed wrong deletion if user clicks "no" in confirm form.
2013-02-05 21:31:45 +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
Emanuel Schuetze
36f5c97dbe
Added assignment context menu (more actions). Fixed 'back to election' link.
2013-02-04 13:18:10 +01:00
Emanuel Schuetze
e822efdc81
Some template style work.
2013-02-04 13:06:36 +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
Emanuel Schuetze
82ad5e2de0
Major changes for new twitter bootstrap template (e.g. replaced icons)
2013-01-31 10:19:56 +01:00
Emanuel Schuetze
b8532fabe4
Removed files from images to img dir.
2013-01-18 22:23:31 +01:00
Emanuel Schuetze
369f418b0e
Fixed missing endif
2013-01-05 15:43:52 +01:00
Emanuel Schuetze
13cd52bd96
Merged (conflicts).
2013-01-05 15:29:57 +01:00
Oskar Hahn
3229d86d4d
Import urls.py needed django functions from django.conf.urls
2013-01-05 01:05:38 +01:00
Oskar Hahn
5d754984a3
fixed pep8 errors
2013-01-04 12:39:42 +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
0369edae1e
Added translationcontext for posts in assignment
2012-12-09 10:48:45 +01:00
Emanuel Schuetze
a010df5d1f
Reverted person.sort_name AttributeError fix ( e0ce1052c0)
2012-11-27 22:54:07 +01:00
Emanuel Schuetze
40984a6508
Merge remote branch 'upstream/master'
2012-11-27 20:10:13 +01:00
Emanuel Schuetze
ec60207cfd
Fixed typo (candidation -> candidature)
2012-11-24 17:39:28 +01:00
Emanuel Schuetze
e0ce1052c0
Catch AttributeError for 'person.sort_name' in assignment/models.py
2012-11-24 17:34:56 +01:00
Oskar Hahn
bd32994296
cleanup
...
Removed unused imports and fixed pep8 errors
2012-11-24 14:01:21 +01:00
Oskar Hahn
8014f327a2
Merge branch 'master' of github.com:OpenSlides/OpenSlides into sort_person_api
2012-11-22 16:35:26 +01:00
Oskar Hahn
fbf81e7780
sort persons
2012-11-22 16:19:09 +01:00
Emanuel Schuetze
c5a2f896e2
Fixed typo in identifier 'assignment_candidates'.
2012-11-21 20:12:08 +01:00
Emanuel Schuetze
da0757e40f
#417 : Don't hide vote results table if status is reset
2012-11-21 19:39:55 +01:00
Emanuel Schuetze
17d813e08b
Show error message for NameError.
2012-11-21 19:36:12 +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
Norman Jäckel
06af94fb91
Fix assignment poll choosing the right method (yes-no-abstain True or False)
2012-11-21 15:03:29 +01:00
Emanuel Schuetze
7fa86f7de0
Used blocktrans instead of trans
2012-11-20 12:37:16 +01:00
Emanuel Schuetze
5e97ece5f4
#278 : Used cycle rowcolor in vote results table also for inavlid votes row
2012-11-19 23:52:48 +01:00
Emanuel Schuetze
93d2dc8d7d
Restructuring and optimization of assignment templates.
...
(Now: elected candidates are marked in candidate list; blocked candidates not visible for status 'finished')
2012-11-19 22:54:09 +01:00
Emanuel Schuetze
0cf4191934
Hide vote results if status is 'searching for candidates'. Hide blocked candidates title if empty.
2012-11-17 23:44:41 +01:00
Emanuel Schuetze
e601d8a5a3
Fixed display_name of widgets.
2012-11-08 09:43:04 +01:00
Emanuel Schuetze
71790a345b
Fixed some English strings. Updated translations.
2012-11-07 22:37:33 +01:00
Emanuel Schuetze
005cb2f15e
Updated translations.
2012-11-03 08:59:34 +01:00
Norman Jäckel
b213e75223
Enhancement to ticket # 389 (Message on assignment slide when no vote results yet available)
2012-10-29 10:16:12 +01:00
Norman Jäckel
0ec106a034
Fix message on assignment slide, ticket #389
2012-10-25 22:18:20 +02:00
Norman Jäckel
d6ebbdc541
Fix plural-error on ballot paper, ticket #393
2012-10-25 21:57:02 +02:00
Norman Jäckel
4052e137a2
Insert new list with all elected candidates, see ticket #374
2012-10-25 21:28:13 +02:00
Norman Jäckel
d0771063b3
Fix assignment overview table, ticket #372
2012-10-25 21:08:29 +02:00
Oskar Hahn
a0242c3c74
Show linebreaks in assignment description. #392
2012-10-24 12:48:11 +02:00
Oskar Hahn
57d591fee8
Renamed category to detail
2012-10-24 12:30:45 +02:00
Oskar Hahn
3e1938941f
Append a default class for the person-api.
...
Also fixed the assignment-ballot-paper for group-persons
2012-10-24 12:15:29 +02:00
Oskar Hahn
681d909fa3
rename application to motion
2012-10-24 11:07:36 +02:00
Emanuel Schuetze
9f9ea81fc6
Fixed attribute error if anonymous opens application/assignment view.
2012-09-19 14:16:17 +02:00
Emanuel Schuetze
613956b62a
Fixed missing blue 'candidate elected' line in assignment projector template.
2012-09-18 22:55:31 +02:00
Emanuel Schuetze
1548479069
Fixed application and assigment ballot paper: don't use old profile object.
2012-09-18 22:47:12 +02:00
Emanuel Schuetze
9cb9270df3
Assignment: Fixed generating ballot pdf paper (typo: surfix).
2012-09-18 22:37:53 +02:00
Norman Jäckel
77ae543ff2
Using Meta Class for ordering assignments by name
2012-09-14 00:21:59 +02:00
Oskar Hahn
f0f14861e8
fixed message for unblocking users
2012-09-13 21:51:50 +02:00
Oskar Hahn
0cf0e58af9
Merge branch 'master' of git://github.com/emanuelschuetze/OpenSlides
...
Conflicts:
openslides/assignment/models.py
2012-09-13 15:28:35 +02:00
Oskar Hahn
20ac817d49
Fixed error message when delrun after the list is closed
2012-09-13 15:07:24 +02:00
Oskar Hahn
e64f4f5efc
show blocked candidates of an assignment
2012-09-13 14:59:14 +02:00
Oskar Hahn
760f8e042e
some fixes
2012-09-12 10:17:51 +02:00
Emanuel Schuetze
7376b7a692
Updated translations.
2012-09-11 20:50:53 +02:00
Oskar Hahn
8732b67bd8
Merge pull request #14 from ostcar/no_recandidate
...
block a user to be a candidate from a assignment, if he delete his candidation by him self
2012-09-11 00:52:50 -07:00
Emanuel Schuetze
2bf992117c
Updated widget titel and icons.
2012-09-11 00:00:44 +02:00
Emanuel Schuetze
2f3e57bf4a
Removed unused base_assignment.html template.
2012-09-10 23:40:08 +02:00
Emanuel Schuetze
ce233fc870
Updated config template.
2012-09-10 17:40:41 +02:00
Emanuel Schuetze
65840d4261
Minor changes in assigment view template.
2012-09-10 17:15:43 +02:00
Emanuel Schuetze
ae51d9e7da
Adjusted template for assignment app.
2012-09-06 23:58:20 +02:00
Oskar Hahn
75eb596547
block a user to be a candidate from a assignment, if he delete his
...
candidation by him self
2012-09-06 15:57:42 +02:00
Norman Jäckel
d84a8d2bdd
Sorting assignments by name in the widget
2012-09-05 22:19:53 +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
6b7ea558fc
rewrote widgets for the dashboard
2012-08-15 11:56:43 +02:00
Oskar Hahn
df40de67b0
rename openslidesuser to user and openslidesgroup to group
2012-08-12 12:52:38 +02:00
Oskar Hahn
75443808af
fix some errors in participant
2012-08-08 10:52:13 +02:00
Oskar Hahn
1719aa588d
rename some user api and participant names
2012-08-07 22:43:57 +02:00
Oskar Hahn
ab33b9f05a
fix error in application-supporters an assignment-candidates, for non admin users
2012-08-06 14:58:52 +02:00
Oskar Hahn
1a1bcb2358
updated some parts of OpenSlides to the new user-api
2012-08-04 15:15:11 +02:00
Oskar Hahn
2bc2dad7a5
user-api: small fix for the second poll in assignment
2012-08-03 19:15:14 +02:00
Oskar Hahn
8fcf65e829
user-api: make the assignments work with the new user-api
2012-08-03 18:56:00 +02:00
Oskar Hahn
4f61c763d7
started to rewrite the assignment-code for the new user-api
2012-08-03 13:49:05 +02:00
Oskar Hahn
93020f9ead
mark group to be teated as user
2012-08-03 12:44:34 +02:00
Oskar Hahn
ecfeb170f3
we can not redirect from a poll, that does not exists to an assignment.
2012-07-27 22:49:38 +02:00
Emanuel Schuetze
f12d155651
Added linebreak.
2012-07-23 23:00:00 +02:00
Emanuel Schuetze
d58e8f4c84
Fixed filename of assignment poll pdf.
2012-07-23 12:58:46 +02:00
Oskar Hahn
797396d94d
#322 remove the dot at the end of a assignment-model verbose-name
2012-07-23 09:30:34 +02:00
Oskar Hahn
e2d658b0d8
#321 change assignment string for the comment on the ballot paper
2012-07-20 11:24:34 +02:00
Oskar Hahn
0c834532db
#317 change string for the automatic methode of choosind the right assignment-poll-methode
2012-07-20 10:59:34 +02:00
Emanuel Schuetze
0d3dcaf433
Merged.
2012-07-16 22:26:48 +02:00
Emanuel Schuetze
d428841735
Fixed translation.
2012-07-16 22:26:07 +02:00
Emanuel Schuetze
80d16a2852
Fixed missing error/condition ('candidate list already closed') for participants without manager permissions.
2012-07-16 22:21:23 +02:00
Oskar Hahn
76e52cf01a
#300 dont show votecast and voteinvalid symbols, if the vote has no votes
2012-07-16 14:29:30 +02:00
Oskar Hahn
0b033271f8
fix some typos, mostly {%trans to {% trans
2012-07-16 14:00:29 +02:00
Norman Jäckel
bd9c609dc0
Change design of assignment poll view (see #292 )
2012-07-15 23:17:10 +02:00
Norman Jäckel
bee6fa7147
Set initial value for posts in assingment.
2012-07-15 22:46:20 +02:00
Oskar Hahn
88cb44e0c3
#287 fix elected candidate in assignment-slide
2012-07-13 11:33:56 +02:00
Oskar Hahn
66b853a10a
redesign the poll api, so it don't creates poll-tables. Also, it is easier to get the poll for a vote object.
...
#288 show percent after the vote results
2012-07-13 11:16:06 +02:00
Norman Jäckel
e99e5ab290
Clean up browsertitles ( #282 ) in assignment and participant tab
2012-07-13 01:10:58 +02:00
Oskar Hahn
cea2bbbf7d
update translation
2012-07-12 14:19:08 +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
debaa505fb
fix problems with reportlab and ugettext_lazy
2012-07-10 12:11:07 +02:00
Oskar Hahn
01f0823ed7
cleanup the assignment app
2012-07-10 11:27:06 +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
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
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
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
a72832842b
#267 fixt typo.
...
syncdb is required
2012-07-04 11:00:58 +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
Norman Jäckel
68e26ff8c5
Fix #256
2012-07-01 16:48:44 +02:00
Norman Jäckel
d22118ac72
Fix #252
2012-07-01 16:28:11 +02:00
Oskar Hahn
6c206fa740
#246 open activate slide view ajax
2012-07-01 11:07:04 +02:00
Norman Jäckel
c19118e774
Fix #230
2012-06-30 14:17:15 +02:00
Oskar Hahn
fe7266097f
#249 improve assignment PDF
2012-06-30 12:07:55 +02:00
Norman Jäckel
818a15aa2b
Cf. #249 but now for assignments.
2012-06-29 11:52:23 +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
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
b963b61385
update german translation
2012-06-23 15:36:02 +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
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
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
Norman Jäckel
a439794874
Insert Edit Symbol (Ticket 207)
2012-06-23 09:32:21 +02:00
Oskar Hahn
e8bf2fce1a
yes-no-abstain elections in assignments
2012-06-18 09:48:27 +02:00
Oskar Hahn
239f328372
rewrote projector-widget system
2012-06-11 13:43:48 +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
279dade5c4
Fixed missing SITE_ROOT import.
2012-05-23 14:30:06 +02:00
Emanuel Schuetze
7933dd2d5c
Minor fixes.
2012-05-21 22:01:09 +02:00
Emanuel Schuetze
97bea50b03
Use single url for toggle publish/unpublish election ballots.
2012-05-20 20:02:36 +02:00
Emanuel Schuetze
3a52cd56c6
#165 : Use AJAX instead of page reload to publish assignment polls
2012-05-19 16:25:55 +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
b81469703b
#198 : Optimized submenu of application and assignment.
2012-05-18 19:38:21 +02:00
Emanuel Schuetze
0351627234
Fixed title in assignment projector template.
2012-05-17 21:36:18 +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
