ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2068 from emanuelschuetze/gulpfile

Browse Source 
Fixes for 2.0
This commit is contained in:
Norman Jäckel 2016-04-07 00:38:00 +02:00
commit b116aabac3
5 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bower.json
View File

@ -17,7 +17,7 @@
"angular-sanitize": "~1.4.9",
"angular-scroll-glue": "~2.0.6",
"angular-ui-router": "~0.2.17",
"angular-ui-tinymce": "~0.0.13",
"angular-ui-tinymce": "0.0.14",
"angular-ui-tree": "~2.5.0",
"bootstrap-css-only": "~3.3.6",
"font-awesome-bower": "~4.5.0",

5
gulpfile.js
View File

@ -83,6 +83,7 @@ gulp.task('tinymce-skins', function () {
// Catches all required i18n files for TinyMCE editor.
gulp.task('tinymce-i18n', function () {
return gulp.src([
'bower_components/tinymce-i18n/langs/en_GB.js',
'bower_components/tinymce-i18n/langs/cs.js',
'bower_components/tinymce-i18n/langs/de.js',
'bower_components/tinymce-i18n/langs/es.js',
@ -90,7 +91,9 @@ gulp.task('tinymce-i18n', function () {
'bower_components/tinymce-i18n/langs/pt_PT.js',
])
.pipe(rename(function (path) {
if (path.basename === 'fr_FR') {
if (path.basename === 'en_GB') {
path.basename = 'en';
} else if (path.basename === 'fr_FR') {
path.basename = 'fr';
} else if (path.basename === 'pt_PT') {
path.basename = 'pt';

4
openslides/core/static/js/core/site.js
View File

@ -429,7 +429,9 @@ angular.module('OpenSlidesApp.core.site', [
.directive('routeLoadingIndicator', [
'$rootScope',
'$state',
function($rootScope, $state) {
'gettext',
function($rootScope, $state, gettext) {
gettext('Loading ...');
return {
restrict: 'E',
template: "<div class='header spacer-bottom' ng-if='isRouteLoading'><div class='title'><h1><translate>Loading ...</translate> <i class='fa fa-spinner fa-pulse'></i></h1></div></div>",

2
openslides/core/static/templates/index.html
View File

@ -128,7 +128,7 @@
<button class="navbar-toggle" ng-click="isMenuOpen = !isMenuOpen">
<i class="fa fa-bars"></i>
</button>
<div class="navbar navbar-collapse" ng-class="{collapse: !isMenuOpen}" >
<div class="navbar navbar-collapse" ng-class="{collapse: !isMenuOpen}">
<!-- Main menu -->
<ul>
<li ng-repeat="element in elements" ui-sref-active="active" ng-click="closeMenu()">

16
openslides/locale/angular-gettext/template-en.pot
View File

@ -140,7 +140,7 @@ msgid ""
" other fields are optional and may be empty."
msgstr ""
#: core/static/js/core/site.js:609
#: core/static/js/core/site.js:611
#: motions/static/js/motions/site.js:281
msgid "Attachment"
msgstr ""
@ -717,7 +717,7 @@ msgstr ""
msgid "Identifier, reason, submitter and category are optional and may be empty."
msgstr ""
#: core/static/js/core/site.js:620
#: core/static/js/core/site.js:622
msgid "If deactivated it appears as internal item on agenda."
msgstr ""
@ -852,6 +852,10 @@ msgstr ""
msgid "Live view"
msgstr ""
#: core/static/js/core/site.js:434
msgid "Loading ..."
msgstr ""
#: core/static/templates/core/login-form.html:20
#: index.html:101
msgid "Login"
@ -1369,7 +1373,7 @@ msgstr ""
msgid "Select or search a workflow ..."
msgstr ""
#: core/static/js/core/site.js:612
#: core/static/js/core/site.js:614
#: motions/static/js/motions/site.js:284
msgid "Select or search an attachment ..."
msgstr ""
@ -1395,7 +1399,7 @@ msgstr ""
#: agenda/static/templates/agenda/item-list.html:216
#: assignments/static/js/assignments/site.js:164
#: core/static/js/core/site.js:619
#: core/static/js/core/site.js:621
#: motions/static/js/motions/site.js:264
msgid "Show as agenda item"
msgstr ""
@ -1510,7 +1514,7 @@ msgid "Tags"
msgstr ""
#: agenda/static/templates/agenda/item-import.html:83
#: core/static/js/core/site.js:599
#: core/static/js/core/site.js:601
#: motions/static/js/motions/site.js:234
#: motions/static/templates/motions/motion-detail.html:227
#: motions/static/templates/motions/motion-import.html:56
@ -1530,7 +1534,7 @@ msgstr ""
#: assignments/static/js/assignments/site.js:133
#: assignments/static/templates/assignments/assignment-list.html:172
#: assignments/static/templates/assignments/assignment-list.html:97
#: core/static/js/core/site.js:591
#: core/static/js/core/site.js:593
#: mediafiles/static/templates/mediafiles/mediafile-form.html:20
#: mediafiles/static/templates/mediafiles/mediafile-list.html:140
#: motions/static/js/motions/site.js:226