Emanuel Schuetze
210df06c76
Minor template fixes.
2013-04-24 11:58:09 +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
fa95119936
New Feature: List of speakers.
2013-04-15 19:23:37 +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
Norman Jäckel
571649d5a6
Fix typo in assignment.
2013-03-18 21:31:24 +01:00
Emanuel Schuetze
71b1bede6f
Set new button als primary/blue button.
2013-03-09 14:17:30 +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
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
