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
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
