From 852b175f3ea6d43e2629db786a0696c904521514 Mon Sep 17 00:00:00 2001
From: Emanuel Schuetze <emanuel@intevation.de>
Date: Sun, 18 Sep 2016 00:45:00 +0200
Subject: [PATCH] Upgraded a lot of javascript libs.

Some template fixes required for upgrading ui-bootstrap.
---
 README.rst                                    |  4 +-
 bower.json                                    | 39 ++++++++++---------
 .../static/templates/agenda/item-list.html    |  6 ++-
 .../assignments/assignment-list.html          |  6 +--
 openslides/core/static/css/app.css            |  3 +-
 openslides/core/static/templates/index.html   | 12 +++---
 .../static/templates/projector-container.html |  2 +-
 .../templates/motions/motion-detail.html      |  4 +-
 .../static/templates/motions/motion-list.html |  5 +--
 .../static/templates/users/user-import.html   |  6 +--
 .../static/templates/users/user-list.html     |  5 ++-
 11 files changed, 48 insertions(+), 44 deletions(-)

diff --git a/README.rst b/README.rst
index 85bff1311..21aeb246d 100644
--- a/README.rst
+++ b/README.rst
@@ -196,9 +196,9 @@ OpenSlides uses the following projects or parts of them:
   * `angular-bootstrap <http://angular-ui.github.io/bootstrap>`_, License: MIT
   * `angular-bootstrap-colorpicker <https://github.com/buberdds/angular-bootstrap-colorpicker>`_, License: MIT
   * `angular-chosen-localytics <http://github.com/leocaseiro/angular-chosen>`_, License: MIT
-  * `angular-csv-import-tmp <https://github.com/cybadave/angular-csv-import>`_, License: MIT
+  * `angular-csv-import <https://github.com/bahaaldine/angular-csv-import>`_, License: MIT
   * `angular-formly <http://formly-js.github.io/angular-formly/>`_, License: MIT
-  * `angular-formly-templates-bootstrap <http://formly-js.github.io/angular-formly-templates-bootstrap/>`_, License: MIT
+  * `angular-formly-templates-bootstrap <https://github.com/formly-js/angular-formly-templates-bootstrap>`_, License: MIT
   * `angular-gettext <http://angular-gettext.rocketeer.be/>`_, License: MIT
   * `angular-loading-bar <https://chieffancypants.github.io/angular-loading-bar>`_, License: MIT
   * `angular-messages <http://angularjs.org>`_, License: MIT
diff --git a/bower.json b/bower.json
index ef047af13..343e384bb 100644
--- a/bower.json
+++ b/bower.json
@@ -2,32 +2,32 @@
   "name": "OpenSlides",
   "private": true,
   "dependencies": {
-    "jquery": "~2.2.3",
-    "angular": "~1.4.10",
-    "angular-animate": "~1.4.10",
-    "angular-bootstrap": "~0.14.3",
-    "angular-bootstrap-colorpicker": "~3.0.24",
-    "angular-chosen-localytics": "~1.4.0",
-    "angular-csv-import": "~0.0.29",
-    "angular-formly": "~7.3.9",
+    "jquery": "~3.1.0",
+    "angular": "~1.5.8",
+    "angular-animate": "~1.5.8",
+    "angular-bootstrap": "~2.1.3",
+    "angular-bootstrap-colorpicker": "~3.0.25",
+    "angular-chosen-localytics": "~1.5.0",
+    "angular-csv-import": "~0.0.36",
+    "angular-formly": "~8.4.0",
     "angular-formly-templates-bootstrap": "~6.2.0",
-    "angular-gettext": "~2.3.4",
-    "angular-loading-bar": "~0.8.0",
-    "angular-messages": "~1.4.10",
+    "angular-gettext": "~2.3.7",
+    "angular-loading-bar": "~0.9.0",
+    "angular-messages": "~1.5.8",
     "angular-pdf": "~1.3.0",
-    "angular-sanitize": "~1.4.10",
-    "angular-scroll-glue": "~2.0.6",
-    "angular-ui-router": "~0.2.17",
+    "angular-sanitize": "~1.5.8",
+    "angular-scroll-glue": "~2.0.7",
+    "angular-ui-router": "~0.3.1",
     "angular-ui-tinymce": "~0.0.17",
-    "angular-ui-tree": "~2.17.0",
+    "angular-ui-tree": "~2.22.0",
     "bootstrap-css-only": "~3.3.6",
     "font-awesome-bower": "~4.5.0",
     "jquery.cookie": "~1.4.1",
-    "js-data": "~2.8.2",
-    "js-data-angular": "~3.1.0",
+    "js-data": "~2.9.0",
+    "js-data-angular": "~3.2.1",
     "jsen": "~0.6.1",
     "lodash": "~3.10.0",
-    "ng-dialog": "~0.5.6",
+    "ng-dialog": "~0.6.4",
     "ng-file-upload": "~11.2.3",
     "ngBootbox": "~0.1.3",
     "pdfmake-dist": "~0.1.27",
@@ -52,6 +52,7 @@
     }
   },
   "resolutions": {
-    "angular": ">=1.4.10 <1.5"
+    "angular": ">=1.5 <1.6",
+    "jquery": ">=3.1 <3.2"
   }
 }
diff --git a/openslides/agenda/static/templates/agenda/item-list.html b/openslides/agenda/static/templates/agenda/item-list.html
index 156eb3e4a..87796ff5e 100644
--- a/openslides/agenda/static/templates/agenda/item-list.html
+++ b/openslides/agenda/static/templates/agenda/item-list.html
@@ -40,6 +40,7 @@
           <!-- project agenda button -->
           <div os-perms="core.can_manage_projector" class="btn-group" uib-dropdown>
             <button
+                id="project-agenda-button"
                 type="button"
                 class="btn btn-default"
                 title="{{ 'Project agenda' | translate }}"
@@ -54,7 +55,7 @@
                 uib-dropdown-toggle>
               <span class="caret"></span>
             </button>
-            <ul class="uib-dropdown-menu" role="menu" aria-labelledby="split-button">
+            <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="project-agenda-button">
               <li role="menuitem"><a href="" ng-click="projectAgenda(tree=true)" translate>All agenda items (Default)</a>
               <li role="menuitem"><a href="" ng-click="projectAgenda(tree=false)" translate>Only main agenda items</a>
             </ul>
@@ -144,6 +145,7 @@
         <td ng-show="!isDeleteMode" os-perms="core.can_manage_projector">
           <div class="btn-group" style="width:54px;" uib-dropdown>
             <button os-perms="core.can_manage_projector"
+                id="project-item"
                 type="button"
                 class="btn btn-default btn-sm"
                 title="{{ 'Project item' | translate }}"
@@ -157,7 +159,7 @@
                 uib-dropdown-toggle>
               <span class="caret"></span>
             </button>
-            <ul class="uib-dropdown-menu" role="menu" aria-labelledby="split-button">
+            <ul class="dropdown-menu" uib-dropdown-menu role="menu" aria-labelledby="project-item">
               <li role="menuitem"><a href="" ng-click="item.project()" translate>Project item (Default)</a>
               <li role="menuitem"><a href="" ng-click="projectAgenda(tree=true, id=item.id)" translate>Project all sub items</a>
             </ul>
diff --git a/openslides/assignments/static/templates/assignments/assignment-list.html b/openslides/assignments/static/templates/assignments/assignment-list.html
index f28912717..084437f72 100644
--- a/openslides/assignments/static/templates/assignments/assignment-list.html
+++ b/openslides/assignments/static/templates/assignments/assignment-list.html
@@ -54,7 +54,7 @@
       <!-- phase filter -->
       <select ng-model="phaseFilter" class="form-control" id="phaseFilter">
         <option value="" translate>--- Select phase ---</option>
-        <option ng-repeat="phase in phases" value="{{ phase.value }}">{{ phase.display_name }}</option>
+        <option ng-repeat="phase in phases" value="{{ phase.value }}">{{ phase.display_name | translate }}</option>
       </select>
     </div>
   </div>
@@ -161,7 +161,7 @@
           <span class="label" ng-class="{'label-primary': assignment.phase == 0,
                                          'label-warning': assignment.phase == 1,
                                          'label-success': assignment.phase == 2 }">
-            {{ phases[assignment.phase].display_name }}
+            {{ phases[assignment.phase].display_name | translate }}
           </span>
 
         <!-- quickEdit columns -->
@@ -183,7 +183,7 @@
             <div class="row">
               <div class="col-xs-6">
                 <label for="selectPhase" translate>Phase</label>
-                <select ng-options="phase.value as phase.display_name for phase in phases"
+                <select ng-options="phase.value as phase.display_name | translate for phase in phases"
                     ng-model="assignment.phase" class="form-control" id="selectPhase">
                 </select>
               </div>
diff --git a/openslides/core/static/css/app.css b/openslides/core/static/css/app.css
index 1b99bec56..d523c067d 100644
--- a/openslides/core/static/css/app.css
+++ b/openslides/core/static/css/app.css
@@ -681,7 +681,7 @@ img {
 }
 
 #motion-table .data-row > div {
-    padding: 5px;
+    padding: 12px 0;
 }
 
 #motion-table .header-row {
@@ -759,6 +759,7 @@ img {
 }
 
 #motion-table .title {
+    font-size: 110%;
     margin-right: 10px;
     padding: 0;
     background-color: transparent;
diff --git a/openslides/core/static/templates/index.html b/openslides/core/static/templates/index.html
index 91fb14cba..3115a5b0b 100644
--- a/openslides/core/static/templates/index.html
+++ b/openslides/core/static/templates/index.html
@@ -5,7 +5,7 @@
 <base href="/">
 <title>OpenSlides</title>
 <meta name="description" content="">
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 <link rel="stylesheet" href="static/css/openslides-libs.css">
 <link rel="stylesheet" href="static/css/app.css">
 <link rel="icon" href="/static/img/favicon.png">
@@ -70,11 +70,11 @@
 
           <!-- user settings / logout button -->
           <span uib-dropdown>
-            <a href class="headerlink" uib-dropdown-toggle>
+            <a href class="headerlink" uib-dropdown-toggle id="user-settings-dropdown">
               <i class="fa fa-user"></i>
               <span class="hide-sm">{{ operator.user.get_short_name() }}</span>
             </a>
-            <ul class="uib-dropdown-menu pull-right" role="menu" aria-labelledby="simple-dropdown">
+            <ul class="dropdown-menu pull-right" uib-dropdown-menu aria-labelledby="user-settings-dropdown">
               <li>
                 <a ui-sref="users.user.detail.profile({ id: operator.user.id })">
                   <i class="fa fa-cog"></i>
@@ -104,12 +104,12 @@
       </div>
 
       <!-- language switcher -->
-      <span uib-dropdown>
-        | <a href class="headerlink" uib-dropdown-toggle>
+      <span uib-dropdown> |
+        <a href="" class="headerlink" uib-dropdown-toggle id="language-dropdown">
           <i class="fa fa-flag"></i>
           <span class="hide-sm">{{ selectedLanguage[0].name | translate }}</span>
         </a>
-        <ul class="uib-dropdown-menu pull-right" role="menu" aria-labelledby="simple-dropdown">
+        <ul class="dropdown-menu pull-right" uib-dropdown-menu aria-labelledby="language-dropdown">
           <li ng-repeat="language in languages">
             <a href="" ng-click="switchLanguage(language.code)">
               <i ng-if="language.selected" class="fa fa-check"></i>
diff --git a/openslides/core/static/templates/projector-container.html b/openslides/core/static/templates/projector-container.html
index 24a958f72..175901169 100644
--- a/openslides/core/static/templates/projector-container.html
+++ b/openslides/core/static/templates/projector-container.html
@@ -4,7 +4,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <base href="/">
 <title>OpenSlides &ndash; Projector</title>
-<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0;">
+<meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0">
 <link rel="stylesheet" href="static/css/openslides-libs.css">
 <link rel="stylesheet" href="static/css/projector.css">
 <link rel="icon" href="/static/img/favicon.png">
diff --git a/openslides/motions/static/templates/motions/motion-detail.html b/openslides/motions/static/templates/motions/motion-detail.html
index 72a4a7e53..d6064fcca 100644
--- a/openslides/motions/static/templates/motions/motion-detail.html
+++ b/openslides/motions/static/templates/motions/motion-detail.html
@@ -115,7 +115,7 @@
                 <translate>State</translate>
                 <i class="fa fa-cog"></i>
               </a>
-              <ul uib-dropdown-menu aria-labelledby="state-dropdown">
+              <ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="state-dropdown">
                 <li ng-repeat="state in motion.state.getNextStates()">
                   <a href ng-click="updateState(state.id)">{{ state.action_word | translate }}</a>
                 <li class="divider" ng-if="motion.state.getNextStates().length && motion.isAllowed('reset_state')">
@@ -140,7 +140,7 @@
                   <translate>Recommendation</translate>
                   <i class="fa fa-cog"></i>
                 </a>
-                <ul uib-dropdown-menu aria-labelledby="recommendation-dropdown">
+                <ul uib-dropdown-menu class="dropdown-menu" aria-labelledby="recommendation-dropdown">
                   <li ng-repeat="recommendation in motion.state.getRecommendations()">
                     <a href ng-click="updateRecommendation(recommendation.id)">
                       {{ recommendation.recommendation_label | translate }}
diff --git a/openslides/motions/static/templates/motions/motion-list.html b/openslides/motions/static/templates/motions/motion-list.html
index 20735c70c..595789ff1 100644
--- a/openslides/motions/static/templates/motions/motion-list.html
+++ b/openslides/motions/static/templates/motions/motion-list.html
@@ -353,13 +353,12 @@
           </div>
           <!-- Submitters -->
           <div>
-            <span>
+            <small>
               <span class="optional" translate>by</span> 
               <span class="optional" ng-repeat="submitter in motion.submitters | limitTo:3">
                 {{ submitter.get_full_name() }}<span ng-if="!$last">,</span></span><span ng-if="motion.submitters.length > 3">, ...</span>
               <!-- sorry for merging them together, but otherwise there would be a whitespace because of the new line -->
-
-            </span>
+            </small>
           </div>
 
         </div>
diff --git a/openslides/users/static/templates/users/user-import.html b/openslides/users/static/templates/users/user-import.html
index e54a9ff15..04b42b258 100644
--- a/openslides/users/static/templates/users/user-import.html
+++ b/openslides/users/static/templates/users/user-import.html
@@ -97,8 +97,8 @@
           <th translate>Is committee</th>
           <th ng-if="duplicates > 0" translate>
             <i class="fa fa-exclamation-triangle text-danger"></i>
-            <strong class="text-danger" ng-if="duplicates == 1">1 Duplicate</strong>
-            <strong class="text-danger" ng-if="duplicates > 1">{{ duplicates }} Duplicates</strong>
+            <strong class="text-danger" ng-if="duplicates == 1">1 <translate>duplicate</translate></strong>
+            <strong class="text-danger" ng-if="duplicates > 1">{{ duplicates }} <translate>duplicates</translate></strong>
 
               <div uib-dropdown>
                 <button type="button" class="btn btn-default btn-danger btn-sm" uib-dropdown-toggle>
@@ -107,7 +107,7 @@
                 </button>
                 <ul class="dropdown-menu dropdown-entries">
                     <li role="menuitem" ng-repeat="action in duplicateActions" class="pointer"
-                      ng-click="setGlobalAction(action)">
+                        ng-click="setGlobalAction(action)">
                       <translate>{{ action }}</translate>
                   </li>
                 </ul>
diff --git a/openslides/users/static/templates/users/user-list.html b/openslides/users/static/templates/users/user-list.html
index 9817e0c56..f1ac4af20 100644
--- a/openslides/users/static/templates/users/user-list.html
+++ b/openslides/users/static/templates/users/user-list.html
@@ -14,12 +14,13 @@
         <translate>Import</translate>
       </a>
       <div class="btn-group" uib-dropdown>
-        <button os-perms="users.can_manage" class="btn btn-default btn-sm" uib-dropdown-toggle>
+        <button os-perms="users.can_manage" class="btn btn-default btn-sm" uib-dropdown-toggle
+            id="user-pdf-dropdown">
           <i class="fa fa-file-pdf-o fa-lg"></i>
           <translate>PDF</translate>
           <span class="caret"></span>
         </button>
-        <ul class="uib-dropdown-menu uib-dropdown-menu-right">
+        <ul class="dropdown-menu" uib-dropdown-menu aria-labelledby="user-pdf-dropdown">
           <li><a ui-sref="user_listpdf" target="_blank">
                 <i class="fa fa-list fa-fw"></i>
                 <translate>List of participants</translate>