diff --git a/bower.json b/bower.json index 765171cbf..d0082fb0b 100644 --- a/bower.json +++ b/bower.json @@ -2,18 +2,9 @@ "name": "OpenSlides", "private": true, "dependencies": { - "bootstrap": "2.3.2", + "bootstrap": "3.3.1", + "datatables-bootstrap3-plugin": "0.2.0", "jquery": "1.11.2", "jquery.cookie" : "1.4.1" - }, - "overrides": { - "bootstrap": { - "main": [ - "docs/assets/js/bootstrap.js", - "docs/assets/css/bootstrap.css", - "img/glyphicons-halflings.png", - "img/glyphicons-halflings-white.png" - ] - } } } diff --git a/gulpfile.js b/gulpfile.js index db3df08da..2cdd0723e 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -46,13 +46,13 @@ gulp.task('css', function() { .pipe(gulp.dest(path.join(output_directory, 'css'))); }); -// Catches all PNG image files from all bower components. -gulp.task('img', function() { +// Catches all font files from all bower components. +gulp.task('fonts', function() { return gulp.src(mainBowerFiles({ - filter: /\.png$/ + filter: /\.(eot)|(svg)|(ttf)|(woff)$/ })) - .pipe(gulp.dest(path.join(output_directory, 'img'))); + .pipe(gulp.dest(path.join(output_directory, 'fonts'))); }); // Gulp default task. Runs all other tasks before. -gulp.task('default', ['js', 'css', 'img'], function() {}); +gulp.task('default', ['js', 'css', 'fonts'], function() {}); diff --git a/openslides/agenda/main_menu.py b/openslides/agenda/main_menu.py index a90ef18c3..00e578e57 100644 --- a/openslides/agenda/main_menu.py +++ b/openslides/agenda/main_menu.py @@ -11,4 +11,4 @@ class AgendaMainMenuEntry(MainMenuEntry): required_permission = 'agenda.can_see_agenda' default_weight = 20 pattern_name = 'item_overview' - icon_css_class = 'icon-calendar' + icon_css_class = 'glyphicon-calendar' diff --git a/openslides/agenda/templates/agenda/overview.html b/openslides/agenda/templates/agenda/overview.html index 19de2f53d..5d6d6ac40 100644 --- a/openslides/agenda/templates/agenda/overview.html +++ b/openslides/agenda/templates/agenda/overview.html @@ -12,49 +12,44 @@ {% block javascript %} - {% if perms.agenda.can_manage_agenda %} - - - - - {% endif %} {% endblock %} {% block content %} -