From fa267b68c29cf11e3df845f9f0d27de64f41360a Mon Sep 17 00:00:00 2001 From: Emanuel Schuetze Date: Sun, 29 Nov 2015 22:25:01 +0100 Subject: [PATCH] New template design MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Great thanks to Jörn Bensch (from triagonale.de) for new base template! - A lot of adaptations in all templates for new design. --- AUTHORS | 1 + bower.json | 5 +- openslides/agenda/static/js/agenda/site.js | 1 + .../static/templates/agenda/item-detail.html | 83 +- .../static/templates/agenda/item-form.html | 51 - .../static/templates/agenda/item-import.html | 23 +- .../static/templates/agenda/item-list.html | 383 +++--- .../static/templates/agenda/item-sort.html | 29 +- .../assignments/static/js/assignments/site.js | 11 +- .../assignments/assignment-detail.html | 243 ++-- .../assignments/assignment-list.html | 287 +++-- .../assignments/assignmentpoll-form.html | 2 +- openslides/core/signals.py | 2 +- openslides/core/static/css/app.css | 1126 ++++++++++------- openslides/core/static/img/favicon.png | Bin 1060 -> 642 bytes openslides/core/static/img/logo-login.png | Bin 13251 -> 0 bytes openslides/core/static/img/logo-projector.png | Bin 0 -> 37362 bytes openslides/core/static/img/logo-small.png | Bin 5139 -> 0 bytes openslides/core/static/img/logo.png | Bin 7273 -> 0 bytes openslides/core/static/img/nav_active.png | Bin 0 -> 1109 bytes openslides/core/static/img/nav_dark-bg.png | Bin 0 -> 925 bytes .../static/img/nav_projector_sidebar_min.png | Bin 0 -> 1100 bytes .../core/static/img/openslides-logo-dark.png | Bin 0 -> 37362 bytes .../core/static/img/openslides-logo.png | Bin 0 -> 46248 bytes .../core/static/img/voting-abstention.png | Bin 3384 -> 0 bytes openslides/core/static/img/voting-invalid.png | Bin 3555 -> 0 bytes openslides/core/static/img/voting-no.png | Bin 3354 -> 0 bytes openslides/core/static/img/voting-total.png | Bin 912 -> 0 bytes .../core/static/img/voting-yes-grey.png | Bin 3134 -> 0 bytes openslides/core/static/img/voting-yes.png | Bin 3483 -> 0 bytes openslides/core/static/js/core/base.js | 2 - openslides/core/static/js/core/site.js | 26 +- openslides/core/static/templates/config.html | 48 +- .../templates/core/customslide-detail.html | 47 +- .../templates/core/customslide-form.html | 2 +- .../templates/core/customslide-list.html | 55 - .../static/templates/core/login-form.html | 2 +- .../templates/core/projector-controls.html | 360 +++--- .../core/static/templates/core/tag-form.html | 21 +- .../core/static/templates/core/tag-list.html | 81 +- .../core/static/templates/dashboard.html | 10 +- openslides/core/static/templates/index.html | 117 +- .../core/static/templates/projector.html | 2 +- openslides/core/static/templates/version.html | 25 +- .../templates/mediafiles/mediafile-form.html | 65 +- .../templates/mediafiles/mediafile-list.html | 154 +-- .../templates/motions/category-detail.html | 24 +- .../templates/motions/category-form.html | 53 +- .../templates/motions/category-list.html | 111 +- .../templates/motions/motion-detail.html | 467 +++---- .../static/templates/motions/motion-list.html | 381 +++--- openslides/users/static/js/users/site.js | 2 +- .../static/templates/users/group-detail.html | 29 +- .../static/templates/users/group-form.html | 57 +- .../static/templates/users/group-list.html | 106 +- .../templates/users/user-detail-password.html | 78 +- .../templates/users/user-detail-profile.html | 84 +- .../static/templates/users/user-detail.html | 84 +- .../static/templates/users/user-import.html | 197 +-- .../static/templates/users/user-list.html | 262 ++-- 60 files changed, 2749 insertions(+), 2450 deletions(-) delete mode 100644 openslides/agenda/static/templates/agenda/item-form.html delete mode 100644 openslides/core/static/img/logo-login.png create mode 100644 openslides/core/static/img/logo-projector.png delete mode 100644 openslides/core/static/img/logo-small.png delete mode 100644 openslides/core/static/img/logo.png create mode 100644 openslides/core/static/img/nav_active.png create mode 100644 openslides/core/static/img/nav_dark-bg.png create mode 100644 openslides/core/static/img/nav_projector_sidebar_min.png create mode 100644 openslides/core/static/img/openslides-logo-dark.png create mode 100644 openslides/core/static/img/openslides-logo.png delete mode 100644 openslides/core/static/img/voting-abstention.png delete mode 100644 openslides/core/static/img/voting-invalid.png delete mode 100644 openslides/core/static/img/voting-no.png delete mode 100644 openslides/core/static/img/voting-total.png delete mode 100644 openslides/core/static/img/voting-yes-grey.png delete mode 100644 openslides/core/static/img/voting-yes.png delete mode 100644 openslides/core/static/templates/core/customslide-list.html diff --git a/AUTHORS b/AUTHORS index 30d597ba2..4bad0b219 100644 --- a/AUTHORS +++ b/AUTHORS @@ -16,3 +16,4 @@ Authors of OpenSlides in chronological order of first contribution: Dominik Breu André Böhlke René von der Haar (Logo design) + Jörn Bensch (Template design) diff --git a/bower.json b/bower.json index 6684fe652..bc7667e17 100644 --- a/bower.json +++ b/bower.json @@ -20,7 +20,6 @@ "angular-ui-switch": "~0.1.1", "angular-ui-tree": "~2.2.0", "angular-gettext": "~2.1.2", - "angular-xeditable": "~0.1.9", "angular-scroll-glue": "~2.0.6", "ngBootbox": "~0.1.2", "ng-dialog": "~0.5.6", @@ -30,6 +29,8 @@ "js-data-angular": "~3.1.0", "ng-file-upload": "~9.1.2", "ckeditor": "~4.5.4", - "angular-ckeditor": "~1.0.0" + "angular-ckeditor": "~1.0.0", + "roboto-condensed": "~0.3.0", + "opensans-webfont-for-bower": "a4b3b75afa" } } diff --git a/openslides/agenda/static/js/agenda/site.js b/openslides/agenda/static/js/agenda/site.js index 09f9f0a11..c09c64140 100644 --- a/openslides/agenda/static/js/agenda/site.js +++ b/openslides/agenda/static/js/agenda/site.js @@ -83,6 +83,7 @@ angular.module('OpenSlidesApp.agenda.site', ['OpenSlidesApp.agenda']) $scope.items = AgendaTree.getFlatTree(Agenda.getAll()); }); $scope.alert = {}; + $scope.isFilter = true; // project related item (content object) $scope.project = function (item) { diff --git a/openslides/agenda/static/templates/agenda/item-detail.html b/openslides/agenda/static/templates/agenda/item-detail.html index 673abf51b..1c2d1b3ee 100644 --- a/openslides/agenda/static/templates/agenda/item-detail.html +++ b/openslides/agenda/static/templates/agenda/item-detail.html @@ -1,51 +1,53 @@ -

{{ item.title }}

- -