From 963bebac2930e95c1f1a492984873bd4f0338236 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 7 Feb 2016 19:49:15 +0100 Subject: [PATCH 1/7] CKEditor v4.5.7 does not work (Syntax Error). Go back to last working version 4.5.6. --- bower.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bower.json b/bower.json index e7186bf71..51ebe4e00 100644 --- a/bower.json +++ b/bower.json @@ -27,7 +27,7 @@ "js-data": "~2.8.2", "js-data-angular": "~3.1.0", "ng-file-upload": "~11.2.3", - "ckeditor": "~4.5.6", + "ckeditor": "4.5.6", "angular-ckeditor": "~1.0.3", "angular-pdf": "~1.3.0", "roboto-condensed": "~0.3.0", From 4bbb153c4277f5d8ec05e5b5e949acd933e41cee Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 8 Feb 2016 20:27:59 +0100 Subject: [PATCH 2/7] Use Roboto font in projector header/footer. --- openslides/core/static/css/projector.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/openslides/core/static/css/projector.css b/openslides/core/static/css/projector.css index 080a0e6f1..811ac4384 100644 --- a/openslides/core/static/css/projector.css +++ b/openslides/core/static/css/projector.css @@ -16,6 +16,7 @@ body{ box-shadow: 0 0 7px rgba(0,0,0,0.6); height: 70px; margin-bottom: 20px; + font-family: 'Roboto Condensed Light'; } #logo { position: relative; @@ -46,6 +47,7 @@ body{ opacity: 0.8; } #currentTime { + font-family: 'Roboto Condensed Light'; border: 0 solid #000000; font-size: 24px; position: absolute; @@ -56,6 +58,7 @@ body{ color: #fff; } #footer { + font-family: 'Roboto Condensed Light'; position: fixed; bottom: 0; height: 35px; From f89f3a99334908af099f4ccfb73b8f19c06784e9 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 8 Feb 2016 20:34:12 +0100 Subject: [PATCH 3/7] Improved motion state dropdown element. --- openslides/core/static/css/app.css | 28 ++++++++++----- openslides/motions/static/js/motions/base.js | 2 ++ .../templates/motions/motion-detail.html | 35 +++++++++++-------- 3 files changed, 42 insertions(+), 23 deletions(-) diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css index 752293fdf..c229a6f9f 100644 --- a/openslides/core/static/css/app.css +++ b/openslides/core/static/css/app.css @@ -51,7 +51,13 @@ h4 { font-size: 18px; color: #222; } - +.heading a { + color: #444; +} +.heading a:hover { + color: #2b6883; + text-decoration: none; +} p { padding-bottom: 14px; @@ -284,11 +290,6 @@ img { color: #444; } -.col1 .meta h3 { - padding-bottom: 0; - margin-bottom: 5px; -} - .col1 .details { padding: 20px; width: auto; @@ -317,14 +318,25 @@ img { width: 70px; } -#content .col2 h4, .col1 .meta h3 { +#content .col2 h4 { font-size: 22px; line-height: 24px; font-family: 'Roboto Condensed Light'; font-weight: 300; color: #444; } - +#content .col1 .meta .heading, #content .col1 .meta h3 { + font-size: 22px; + line-height: 24px; + font-weight: 300; + color: #444; + padding-bottom: 0; + margin-top: 20px; + margin-bottom: 5px; +} +#content .col1 .meta .heading .drop-down-name, #content .col1 .meta h3 { + font-family: 'Roboto Condensed Light'; +} #content .col2 a:hover h4 { text-decoration: none; diff --git a/openslides/motions/static/js/motions/base.js b/openslides/motions/static/js/motions/base.js index 6ed8e28a1..3f399cf5c 100644 --- a/openslides/motions/static/js/motions/base.js +++ b/openslides/motions/static/js/motions/base.js @@ -248,6 +248,8 @@ angular.module('OpenSlidesApp.motions', ['OpenSlidesApp.users']) return operator.hasPerms('motions.can_manage'); case 'reset_state': return operator.hasPerms('motions.can_manage'); + case 'can_manage': + return operator.hasPerms('motions.can_manage'); default: return false; } diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html index 424e43799..db735b7b2 100644 --- a/openslides/motions/static/templates/motions/motion-detail.html +++ b/openslides/motions/static/templates/motions/motion-detail.html @@ -90,22 +90,27 @@ -

State

- +

State

+
+ + + State + + + + +
+
{{ motion.state.name | translate }} - -
- -
From 6ba47a64d3d2f061a88e79759d9003896d560741 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 8 Feb 2016 21:07:35 +0100 Subject: [PATCH 4/7] Agenda list view: allow to delete also motion and assignment items. Fixes #1943 --- openslides/agenda/static/js/agenda/site.js | 12 ++++-------- .../agenda/static/templates/agenda/item-list.html | 12 +++++------- 2 files changed, 9 insertions(+), 15 deletions(-) diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 67d2f5825..004919c6f 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -71,13 +71,13 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) '$scope', '$http', '$state', + 'DS', 'operator', 'ngDialog', 'Agenda', 'AgendaTree', - 'Customslide', 'Projector', - function($scope, $http, $state, operator, ngDialog, Agenda, AgendaTree, Customslide, Projector) { + function($scope, $http, $state, DS, operator, ngDialog, Agenda, AgendaTree, Projector) { // Bind agenda tree to the scope $scope.$watch(function () { return Agenda.lastModified(); @@ -143,9 +143,7 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) }; // delete related item $scope.deleteRelatedItem = function (item) { - if (item.content_object.collection == 'core/customslide') { - Customslide.destroy(item.content_object.id); - } + DS.destroy(item.content_object.collection, item.content_object.id); }; // *** delete mode functions *** @@ -169,9 +167,7 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) $scope.delete = function () { angular.forEach($scope.items, function (item) { if (item.selected) { - if (item.content_object.collection == 'core/customslide') { - Customslide.destroy(item.content_object.id); - } + DS.destroy(item.content_object.collection, item.content_object.id); } }); $scope.isDeleteMode = false; diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 5509c6bde..1a8735249 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -151,13 +151,11 @@ List of speakers | Edit | - QuickEdit - | - Delete - + QuickEdit | + Delete
From 82f2c4f0032a69ea99f8016242c30265f4f79216 Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Mon, 8 Feb 2016 21:19:13 +0100 Subject: [PATCH 5/7] Fixed quickEdit mode in agenda, motion, assignment. Refresh motion object after cancel. --- openslides/agenda/static/js/agenda/site.js | 6 ++ .../static/templates/agenda/item-list.html | 62 +++++++++---------- .../assignments/static/js/assignments/site.js | 6 ++ .../assignments/assignment-list.html | 4 +- openslides/motions/static/js/motions/site.js | 6 ++ .../static/templates/motions/motion-list.html | 4 +- 6 files changed, 52 insertions(+), 36 deletions(-) diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 004919c6f..f647c3c80 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -126,6 +126,12 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) $state.go(item.content_object.collection.replace('/','.')+'.detail', {id: item.content_object.id}); }; + // cancel QuickEdit mode + $scope.cancelQuickEdit = function (item) { + // revert all changes by restore (refresh) original item object from server + Agenda.refresh(item); + item.quickEdit = false; + }; // save changed item $scope.save = function (item) { Agenda.save(item).then( diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html index 1a8735249..4ced3496b 100644 --- a/openslides/agenda/static/templates/agenda/item-list.html +++ b/openslides/agenda/static/templates/agenda/item-list.html @@ -168,42 +168,40 @@ -

{{ item.getTitle() }} – QuickEdit

- - {{ alert.msg }} - -
-
- - -
-
- - -
+ + {{ alert.msg }} + +
+
+ +
-
-
- - - Show as agenda item -
-
- - -
+
+ +
-
-   - - Edit ... +
+
+
+ + + Show as agenda item
- +
+ + +
+
+
+   + + Edit ... +
diff --git a/openslides/assignments/static/js/assignments/site.js b/openslides/assignments/static/js/assignments/site.js index 4f2c9bdda..d7e31e766 100644 --- a/openslides/assignments/static/js/assignments/site.js +++ b/openslides/assignments/static/js/assignments/site.js @@ -203,6 +203,12 @@ angular.module('OpenSlidesApp.assignments.site', ['OpenSlidesApp.assignments']) $scope.openDialog = function (assignment) { ngDialog.open(AssignmentForm.getDialog(assignment)); }; + // cancel QuickEdit mode + $scope.cancelQuickEdit = function (assignment) { + // revert all changes by restore (refresh) original assignment object from server + Assignment.refresh(assignment); + assignment.quickEdit = false; + }; // save changed assignment $scope.save = function (assignment) { Assignment.save(assignment).then( diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html index 5da6398cf..6d266de11 100644 --- a/openslides/assignments/static/templates/assignments/assignment-list.html +++ b/openslides/assignments/static/templates/assignments/assignment-list.html @@ -162,7 +162,7 @@ - +

{{ assignment.title }} – Quick Edit

{{ alert.msg }} @@ -187,7 +187,7 @@
-  
-