Commit Graph

173 Commits

Author SHA1 Message Date
Emanuel Schuetze
7e5ea61b34 Hide candidate list if assignment phase is finished (2). 2016-04-12 22:41:15 +02:00
Norman Jäckel
5af25351fa Merge pull request #2049 from emanuelschuetze/fix2028
Catch 404 errors in resolve promise if user has not all required permissions
2016-03-20 20:48:58 +01:00
Emanuel Schuetze
03f08628c7 Catch 404 errors in resolve promise if user has not all required permissions.
- fix motion detail/list, agenda item detail, assignment list, mediafile list
- add fontpage permission check
- use agenda item title for motion title if available (to show item number)
- fix groupFilter reset in users list
- fix users permission string

Fixes #2028. Fixes #2038.
2016-03-18 21:41:16 +01:00
Emanuel Schuetze
140869ebd7 Fix translation strings. 2016-03-18 20:11:04 +01:00
Emanuel Schuetze
89446ce4f6 Use angular-chosen instead of ui-select for better performance.
The jQuery select field from angular-chosen is used for all ui-select
fields. See https://github.com/leocaseiro/angular-chosen/

Use input delay on users filter field with 'debounce'.

Fixed #2006.
2016-03-18 14:37:03 +01:00
Emanuel Schuetze
16fd87cc93 Use a global variable for the limiting number of users in select fields. (Fixed #1989) 2016-02-23 22:24:41 +01:00
Emanuel Schuetze
2473a6ef69 Updated angular-gettext EN source. 2016-02-17 17:58:04 +01:00
Emanuel Schuetze
84ea0bf1f5 Several important fixes for beta4
- Fix socket error in autoupdate (Check if socket exists)
- Add missing translation string for core permission
- Fix KeyError in extract_default_password function in users/views.py
- Improve Pagination. Fix users list for users without can_see_extra_data permissions.
- Limit the number of users in ui-select field
- Fix csv header names in users import help text.
- Use config options (enable logo/title) on projector.
- Nicer font style for main and sub items on agenda slide.
- Fix JS error if this.groups is undefined for anonymous.
2016-02-17 17:49:44 +01:00
Norman Jäckel
75f4a2e62d Work on JavaScript coding style. 2016-02-16 00:56:56 +01:00
Emanuel Schuetze
503325220f Show selected poll on assignment slide. 2016-02-15 23:47:31 +01:00
Emanuel Schuetze
eae50b46de Fixed closing tag for correct translation string 2016-02-09 16:49:32 +01:00
Emanuel Schuetze
82f2c4f003 Fixed quickEdit mode in agenda, motion, assignment.
Refresh motion object after cancel.
2016-02-08 21:37:20 +01:00
Emanuel Schuetze
494c9aee94 Refactored AssignmentPoll (Fixed #1848)
Add percents and progressbars.
Template fixes and improvements for polls.
2016-02-05 00:32:18 +01:00
Emanuel Schuetze
deea222434 Translate permission strings. (Fixes #1895)
Remove unused gettextCatalog content provider.
2016-01-27 20:23:53 +01:00
Emanuel Schuetze
23503eb4ba Several template fixes and clean up
- Use ng-cloak for hide template parts while loading.
- Set html lang attribute dynamically (Fixes #1546)
- Clean up: Rename 'dashboard' to 'home'.
- Show duration of speech in minutes. (Fixes #1882)
- Save agenda specific stuff for customslides. (Fixes #1887)
- Remove title from QuickEdit from.
- Checkbox for item.closed is now visible for manager only.
- Agenda list view: Show list of speakers link also for normal users.
- Improve slide templates: Show agenda item number and subtitle.
- Fixed agenda title for motions and assignments.
  (Don't load motions and assignmetn in agenda app.)
- Added missing seach template.
2016-01-27 12:10:40 +01:00
Emanuel Schuetze
2a9e0b4b81 Implement full text search (client side) Fixes #1699 2016-01-27 00:16:30 +01:00
Emanuel Schuetze
f4e4166e24 Refactoring mediafile templates. (Fixes #1839, #1818, #1833)
- uploader not visible/loaded after reload list view
- use same list view style as in other apps
- use dialog for create/edit form
- show error message in form
- edit form: remove file upload form element, add uploader form element
- create form: add uploader form element (only if user has manager permissions)
- Refactor mediafile upload method
- show not-implemented message for project pdf
- use pdf filter in list view
2016-01-25 10:11:16 +01:00
Emanuel Schuetze
9ddc558085 Add checkbox 'show as agenda item'. (Fixes #1783)
Used for customslide, motion and assignment forms.
Changed default value of agenda.type to HIDDEN_ITEM (=2) in model.py.
2016-01-23 20:22:56 +01:00
Emanuel Schuetze
7bc1851a09 Use osFilter for motions, assignments and mediafiles. (Fixes #1784) 2016-01-21 23:20:14 +01:00
Emanuel Schuetze
94366f35ab Use os-perms instead of os-perms-lite. Removed os-perms-lite. (Fixes #1826) 2016-01-21 22:26:11 +01:00
Emanuel Schuetze
42f9cfdf45 List views: show number of filtered AND total rows.
Improve css animation for ng-enter/ng-leave.
2016-01-21 20:43:04 +01:00
Emanuel Schuetze
4125efbfe6 Added agendaSupplement for agenda item title.
Added padding-left for child item cells.
2016-01-18 21:40:50 +01:00
Emanuel Schuetze
76dc29cddf Use uib-alert instead of deprecated alert tag. 2016-01-18 21:09:28 +01:00
Emanuel Schuetze
d083309a30 Show candidates on assignments slide. 2016-01-18 16:27:50 +01:00
Emanuel Schuetze
8bf82a0306 Added meta box in assignment detail view (Fixes #1866) 2016-01-17 22:32:52 +01:00
Emanuel Schuetze
851252dfe8 Format all JavaScript functions in same syntax.
Required for use minified js code in production mode.
2016-01-17 22:32:48 +01:00
Emanuel Schuetze
0e24d9b632 Modify motion/assignment/customslide in form dialog without updating list/detail view. 2016-01-17 21:19:32 +01:00
Oskar Hahn
ffe80e8da3 Merge pull request #1852 from normanjaeckel/AssignmentFixes
Fixed several things in assignment app. See #1838.
2016-01-15 09:37:18 +01:00
Emanuel Schuetze
694ed6f1cc Motion template fixes
- Add has_votes to motion serializer and add poll.has_votes check in motion detail view.
- Fix motion meta box 3 column layout.
- Added missing intents
- Show motionPoll edit form in dialog. Moved into new template.
- Clean up assignmentpoll form (like motionPoll)
2016-01-15 00:03:29 +01:00
Emanuel Schuetze
bc60b7e7ca Several template improvements
- Move Languages services from site.js to base.js
  Now the detected browser language is used as projector language.
- Use verboseName instead of agendaSupplement.
- Show submitters on projector (load Users on Controller).
- Improve list of speakers (slide and item detail).
2016-01-14 00:14:48 +01:00
Norman Jäckel
441c297986 Fixed several things in assignment app. See #1838.
Fixed "Add Me" and "Remove Me" button.

Show poll results for normal users.

Reverse ballot tab order.
2016-01-13 16:11:01 +01:00
Emanuel Schuetze
93e2296bdc A lot of template fixes
- Reset password from current (unsaved) value of default_password.
- MotionForm, AssignmentForm and UserForm factory for open ngDialog.
  Fixes edit url redirect problem.
- Added back-to-detail-view-button to list of speakers view.
- Add translation context.
- Fixed (missing) translation strings.
- Fixed tags and category list views.
- motion detail: Use select box for changing state.
- motion slide updated
2016-01-13 10:22:24 +01:00
Norman Jäckel
e2145f9777 Fixed candidate button. 2016-01-10 11:27:17 +01:00
Norman Jäckel
896ac28c30 Added number of candidates to assignment list view. 2016-01-10 10:23:55 +01:00
Emanuel Schuetze
071b0a76be Fixed permissions in list views. 2016-01-10 01:02:13 +01:00
Emanuel Schuetze
2c46d3ae0a Mark candidate as elected. Updated assignment detail. 2016-01-09 22:35:04 +01:00
Emanuel Schuetze
4a9f265b68 Used is_hidden instead of item.typ. Improve hidden filter.
Fixed JS error in users and assignments.
2016-01-09 16:55:21 +01:00
Emanuel Schuetze
54b1c8e350 Show agenda titles with correct numbering 2016-01-09 14:01:30 +01:00
Emanuel Schuetze
4faf3dd2c0 Send assignments OPTION request for phases once only. 2016-01-09 11:45:25 +01:00
Emanuel Schuetze
de77cfc38c Fixed zooming/scrolling on slides. 2016-01-08 21:31:58 +01:00
Oskar Hahn
c63bd31db0 Merge pull request #1778 from emanuelschuetze/fix1718
Fix publish assignment poll function. (Fixes#1718)
2015-12-22 00:02:44 +01:00
Emanuel Schuetze
6b8aa56e87 Fix publish assignment poll function.
Set 'votes' to required=False in AssignmentAllPollSerializer.
2015-12-19 12:38:07 +01:00
Norman Jäckel
d3e8c68a51 Merge pull request #1775 from emanuelschuetze/templateStuff
Fixed some template bugs (#1727)
2015-12-19 11:53:53 +01:00
Oskar Hahn
99b4e8c494 Merge pull request #1771 from emanuelschuetze/fix1729
Added whitespace before triple dots in template (Fixes #1729)
2015-12-12 11:05:58 +01:00
Emanuel Schuetze
f5efca1d1e Added whitespace before triple dots in template (Fixes #1729) 2015-12-12 10:16:44 +01:00
Emanuel Schuetze
c275b08178 Fixed some template bugs (#1727)
- Fixed z-index of messages and countdowns.
- Sidebar: Live view open by default. Improve section style.
- Set default value for open_posts in assignments create form.
- Redefine default values in motions create form.
2015-12-12 00:30:05 +01:00
Emanuel Schuetze
ca94a4e720 Rename template variable 'isFilter' to 'isFilterOpen' (Fixes #1728) 2015-12-11 19:50:50 +01:00
Emanuel Schuetze
3c5f49a127 Updated English translation strings. 2015-12-07 15:15:12 +01:00
Emanuel Schuetze
5c6977c46d Template fixes 2015-12-06 17:26:10 +01:00
Emanuel Schuetze
232ce522fe Updated translation strings and pot file. 2015-12-06 07:25:07 +01:00
Emanuel Schuetze
b81704a88f Fixed translations in agendaSupplement. 2015-12-01 13:45:54 +01:00
Emanuel Schuetze
bf940b177c Fixed gettext strings in JavaScript.
- Added browser lanugage detection.
- Use gettextCatalog.getString(..) instead of gettext(..) in JS code.
- updated pot file
2015-11-30 23:52:42 +01:00
Norman Jäckel
f84b8f29ac Template and translation changes. Updated English language files. 2015-11-30 21:06:31 +01:00
Emanuel Schuetze
fa267b68c2 New template design
- Great thanks to Jörn Bensch (from triagonale.de) for new base
  template!
- A lot of adaptations in all templates for new design.
2015-11-30 20:36:33 +01:00
Emanuel Schuetze
2b5c9c09b2 Template improvements
- use modal dialogs for new/edit views of customslide/motions/assigments
- use hover actions in all list views
- Show assignment candidate names
- support yesnoabstain/vote assignment poll
- Generic solution for open edit dialog.
2015-11-29 22:26:59 +01:00
Norman Jäckel
6f924e6686 Merge pull request #1714 from ostcar/assignment_poll_candidate
AngularJS: Added js-data models for assignment poll candidates
2015-11-28 13:26:56 +01:00
Oskar Hahn
99ef185502 Angular: Added js-data models for assignment poll candidates 2015-11-28 00:27:14 +01:00
Oskar Hahn
9a7dea26e0 Angular: Eject assignment related users before a assignment is updated 2015-11-27 22:26:30 +01:00
Emanuel Schuetze
35a8042759 Assignments template improvements
- list view with quickview
- ngDialog for create/update view
- candidates
- polls
2015-11-27 00:19:37 +01:00
Oskar Hahn
e67897941e Added assignment poll and assignment related user to js 2015-11-25 19:28:35 +01:00
Oskar Hahn
c379544e97 Fixed motion states, handled workflow field. 2015-11-11 10:50:49 +01:00
Oskar Hahn
12a08b9732 New Agenda Item
Changed agenda item, so it can not be manualy created, but is always created
when a custom slide, motion or assignment is created.
2015-10-29 15:44:43 +01:00
Norman Jäckel
32b23df763 Split and cleaned up JS files. Added test. 2015-10-22 00:28:01 +02:00
Norman Jäckel
8c48d67df0 Fixed projector. 2015-09-14 20:30:37 +02:00
Oskar Hahn
2da2177c49 Autogenerate the main menu. 2015-09-05 17:23:47 +02:00
Emanuel Schuetze
0e124dbbae Use tags in agenda. Fix motions.js. 2015-09-05 10:07:53 +02:00
Oskar Hahn
6674ea85b7 Updated js-data to 2.0
Added js-data relation for the motion and agenda app

Added improved load function
2015-09-04 21:05:49 +02:00
Emanuel Schuetze
f75516c7bb Agenda slide templates. Some template improvements.
- User import
- show linebreaks for long text
- some style work
- item detail and agenda list slide
2015-06-25 14:19:43 +02:00
Emanuel Schuetze
c2920407bb Template improvements
- Activate slides for users, customslides, motions, assignments.
- Add delete confirm message.
- Fixed required form fields.
- Added version template.
- Improved user import. Updated csv files.
2015-06-25 00:15:56 +02:00
Oskar Hahn
a4c00d5ee3 Angular Client
* Split angular app into a site- and a projector app
* Created client slide api and slides for customslide and user
* JS-function to activate a slide
2015-06-18 23:23:34 +02:00
Oskar Hahn
dc675e173b Removed old static files 2015-06-18 18:24:54 +02:00
Emanuel Schuetze
8d638a908d Added new angularjs templates
for agenda, motions, assignments, users and mediafiles apps.

Users app:
- Show permissions in group form (Fixed #1500)
- Added experimental csv import for users.

Agenda:
- new agenda sort view.
- Added experimental angular-xeditable for item-list view.

General:
- Added core.tag templates.
- Added mediafiles templates.
- Remove old template and js files. Remove old views.
- Skip old tests.

Added external angular modules:
- angular-loading-bar (Fixed #1448)
- ui-tree (for sorting agenda tree)
- ng-fab-forms (for better form validation)
- ui-bootstrap (for modal window, dropdown, popover)
- ngBootbox (for confirm delete dialogs in agenda and users app)
2015-05-06 09:19:16 +02:00
Oskar Hahn
0b5f75339e Rename apps and permissions
* Fixed agenda permissions
* Renamed assignment to assignments, fixed assignments permission names
* Renamed mediafile to mediafiles
* Renamed motion to motions. Fixed motions permission names
2015-03-29 20:35:53 +02:00