ui bootstrap upgrade

ajenti · Mar 8, 2016 · 34ea1e6 · 34ea1e6
1 parent aec304f
commit 34ea1e6
Show file tree

Hide file tree

Showing 22 changed files with 129 additions and 117 deletions.
diff --git a/package.json b/package.json
@@ -0,0 +1,12 @@
+{
+  "coffeelintConfig": {
+    "indentation" : {
+        "level" : "error",
+        "value" : 4
+    },
+    "max_line_length" : {
+        "level" : "error",
+        "value" : 999
+    }
+  }
+}
diff --git a/plugins/auth_users/plugin.yml b/plugins/auth_users/plugin.yml
@@ -2,7 +2,7 @@ name: auth_users
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.21'
+version: '0.22'
 title: 'Custom users authentication'
 icon: users
 dependencies:

diff --git a/plugins/auth_users/resources/partial/index.html b/plugins/auth_users/resources/partial/index.html
@@ -23,16 +23,16 @@ <h4 class="list-group-item-heading">
                 </p>
             </div>
         </div>
-    </div>  
+    </div>
 
     <div class="input-group">
         <input ng:model="newUsername" ng:enter="addUser(newUsername)" placeholder="{{'New user name'|translate}}" class="form-control" />
         <div class="input-group-btn">
             <a ng:click="addUser(newUsername)" ng:disabled="!newUsername" class="btn btn-primary" translate>Create</a>
         </div>
-    </div>    
+    </div>
 
-    <br/>        
+    <br/>
 
     <div class="alert alert-danger" ng:show="isDangerousSetup()">
         <i class="fa fa-warning"></i> <span translate>You have no users mapped to <b>root</b> system account. Saving this configuration will prevent any administrative access.</span>
@@ -41,7 +41,7 @@ <h4 class="list-group-item-heading">
     <div class="alert alert-info" ng:show="config.data.auth.users.root.password == defaultRootPassword">
         <i class="fa fa-info-circle"></i> <span translate>Default root password is <code>admin</code></span>.
     </div>
-    
+
     <div class="floating-toolbar-padder"></div>
 
     <floating-toolbar>
@@ -67,29 +67,29 @@ <h4>{{configuringUsername}}</h4>
                     <div class="input-group-btn">
                         <a ng:click="setPassword(configuringUsername, newPassword)" ng:disabled="!newPassword" class="btn btn-primary" translate>Update password</a>
                     </div>
-                </div>            
+                </div>
             </div>
-            <tabset>
-                <tab heading="{{'Sidebar entries'|translate}}">
+            <uib-tabset>
+                <uib-tab heading="{{'Sidebar entries'|translate}}">
                     <br/>
                     <div class="alert alert-warning">
                         <i class="fa fa-warning"></i> <span translate>This only affects appearance of the sidebar. Disable actual permissions under the <b>Permissions</b> tab.</span>
                     </div>
-                    
+
                     <div ng:repeat="permission in permissions|orderBy:'name'" ng:if="permission.id.indexOf('sidebar:view:') == 0">
                         <span checkbox ng:model="userPermissions[configuringUsername][permission.id]" text="{{permission.name|translate}}"></span>
                     </div>
-                </tab>
-                <tab heading="{{'Permissions'|translate}}">
+                </uib-tab>
+                <uib-tab heading="{{'Permissions'|translate}}">
                     <br/>
                     <div ng:repeat="permission in permissions|orderBy:'id'" ng:if="permission.id.indexOf('sidebar:view:') == -1">
                         <span checkbox ng:model="userPermissions[configuringUsername][permission.id]" text="{{permission.name|translate}}"></span>
                     </div>
-                </tab>
-            </tabset>
+                </uib-tab>
+            </uib-tabset>
         </div>
         <div class="modal-footer">
             <a ng:click="$parent.configuringUsername = null" class="btn btn-default btn-flat" translate>OK</a>
         </div>
     </dialog>
-</div>
+</div>
diff --git a/plugins/core/bower.json b/plugins/core/bower.json
@@ -14,16 +14,15 @@
     "fontawesome": "~4.4.0",
     "angular-socket-io": "~0.6.1",
     "angular-loading-bar": "~0.6.0",
-    "angular-bootstrap": "~0.11.2",
+    "angular-bootstrap": "~1.2.4",
     "angular-persona": "~1.1.0",
     "ngstorage": "~0.3.0",
     "fastclick": "~1.0.3",
     "angular-sortable-view": "0.0.13",
     "AngularJS-Toaster": "~0.4.9",
     "angular-base64": "~2.0.4",
     "mobile-detect": "~1.2.1",
-    "angular-gettext": "~2.1.0",
-    "angular-bootstrap": "~1.2.1"
+    "angular-gettext": "~2.1.0"
   },
   "resolutions": {
     "angular": "~1.4.0"

diff --git a/plugins/core/content/pages/index.html b/plugins/core/content/pages/index.html
@@ -52,15 +52,15 @@
                 </a>
 
                 <div ng:show="identity.user" class="pull-right">
-                    <div class="dropdown">
-                        <a class="btn btn-default profile-button" ng:class="{superuser: identity.isSuperuser}" dropdown-toggle>
+                    <div uib-dropdown>
+                        <a class="btn btn-default profile-button" ng:class="{superuser: identity.isSuperuser}" uib-dropdown-toggle>
                             {{identity.user[0].toUpperCase()}}
 
                             <span class="rank" ng:show="identity.isSuperuser">
                                 <i class="fa fa-angle-double-up"></i>
                             </span>
                         </a>
-                        <ul class="dropdown-menu dropdown-menu-right" style="width: 200px">
+                        <ul uib-dropdown-menu class="dropdown-menu-right" style="width: 200px">
                             <li>
                                 <div>
                                     <span class="subtle pull-right">UID {{ identity.effective }}</span>

diff --git a/plugins/core/plugin.yml b/plugins/core/plugin.yml
@@ -2,7 +2,7 @@ name: core
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.66'
+version: '0.67'
 title: Core
 icon: link
 dependencies: []

diff --git a/plugins/core/resources/js/core/directives/smartProgress.coffee b/plugins/core/resources/js/core/directives/smartProgress.coffee
@@ -10,8 +10,8 @@ angular.module('core').directive 'smartProgress', () ->
         }
         template: """
         <div>
-            <progressbar type="warning" max="100" value="100 * value / max" animate="animate" ng:class="{indeterminate: !max}">
-            </progressbar>
+            <uib-progressbar type="warning" max="100" value="100 * value / max" animate="animate" ng:class="{indeterminate: !max}">
+            </uib-progressbar>
         </div>
         <div class="values">
             <span class="pull-left no-wrap">{{text}}</span>
@@ -21,4 +21,3 @@ angular.module('core').directive 'smartProgress', () ->
         link: ($scope, element, attr) ->
             $scope.animate ?= true
     }
-
diff --git a/plugins/dashboard/plugin.yml b/plugins/dashboard/plugin.yml
@@ -2,7 +2,7 @@ name: dashboard
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.30'
+version: '0.31'
 title: 'Dashboard'
 icon: bar-chart
 dependencies:

diff --git a/plugins/dashboard/resources/partial/index.html b/plugins/dashboard/resources/partial/index.html
@@ -3,11 +3,11 @@
 <progress-spinner ng:show="!ready"></progress-spinner>
 
 <div ng:show="ready">
-    <div class="dropdown pull-right" ng:show="customization.plugins.dashboard.allowAdd">
-        <a class="btn btn-default subtle" dropdown-toggle>
+    <div uib-dropdown class="pull-right" ng:show="customization.plugins.dashboard.allowAdd">
+        <a class="btn btn-default subtle" uib-dropdown-toggle>
             <i class="fa fa-plus"></i> <span translate>Add widget</span>
         </a>
-        <ul class="dropdown-menu">
+        <ul uib-dropdown-menu>
             <li ng:repeat="widget in availableWidgets|orderBy:'name|translate'">
                 <a ng:click="addWidget(widget)">
                     {{widget.name|translate}}

diff --git a/plugins/datetime/plugin.yml b/plugins/datetime/plugin.yml
@@ -2,7 +2,7 @@ name: datetime
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.16'
+version: '0.17'
 title: 'Date & time'
 icon: clock-o
 dependencies:

diff --git a/plugins/datetime/resources/partial/index.html b/plugins/datetime/resources/partial/index.html
@@ -11,13 +11,13 @@
 <div class="form-group">
     <label translate>Date & time</label>
     <div class="row">
-        <div class="col-sm-7">
-            <input type="text" class="form-control" datepicker-popup="dd-MMMM-yyyy" ng:model="_.time" is-open="dpOpened" ng:click="dpOpened=true" />
+        <div class="col-sm-6">
+            <input type="text" class="form-control" uib-datepicker-popup="dd-MMMM-yyyy" ng:model="_.time" is-open="dpOpened" ng:click="dpOpened=true" />
         </div>
         <div class="col-sm-3">
-            <timepicker class="timepicker" ng:model="_.time" />
+            <uib-timepicker class="timepicker" ng:model="_.time"></uib-timepicker>
         </div>
-        <div class="col-sm-2">
+        <div class="col-sm-3">
             <a ng:click="setTime()" class="btn btn-primary btn-block" translate>Set time</a>
         </div>
     </div>
@@ -27,4 +27,3 @@
         </a>
     </div>
 </div>
-
diff --git a/plugins/network/plugin.yml b/plugins/network/plugin.yml
@@ -2,7 +2,7 @@ name: network
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.12'
+version: '0.13'
 title: 'Network'
 icon: plug
 dependencies:

diff --git a/plugins/network/resources/partial/index.html b/plugins/network/resources/partial/index.html
@@ -1,7 +1,7 @@
 <br/>
 
-<tabset>
-    <tab heading="{{'Network'|translate}}">            
+<uib-tabset>
+    <uib-tab heading="{{'Network'|translate}}">            
         <br/>
 
         <div class="form-group">
@@ -144,7 +144,7 @@ <h4>{{configuringInterface.name}}</h4>
                     <label>MTU</label>
                     <input ng:model="configuringInterface.mtu" type="number" class="form-control" />
                 </div>
-                
+
                 <hr />
 
                 <div ng:if="configuringInterface.up_script !== undefined">
@@ -184,11 +184,11 @@ <h4>{{configuringInterface.name}}</h4>
                 <a ng:click="$parent.configuringInterface = null; reload()" class="btn btn-default btn-flat" translate>Close</a>
             </div>
         </dialog>
-        
+
         <br/>
-    </tab>
+    </uib-tab>
 
-    <tab heading="{{'DNS'|translate}}" ng:controller="NetworkDNSController">
+    <uib-tab heading="{{'DNS'|translate}}" ng:controller="NetworkDNSController">
         <br/>
         <div class="list-group">
             <div ng:repeat="path in config.match('nameserver')" class="list-group-item list-group-item-small">
@@ -216,11 +216,11 @@ <h4>{{configuringInterface.name}}</h4>
 
         <floating-toolbar>
             <a ng:click="save()" class="btn btn-default btn-flat" translate>Save</a>
-        </floating-toolbar>    
+        </floating-toolbar>
         <br/>
-    </tab>
+    </uib-tab>
 
-    <tab heading="{{'Hosts'|translate}}" ng:controller="NetworkHostsController">
+    <uib-tab heading="{{'Hosts'|translate}}" ng:controller="NetworkHostsController">
         <br/>
         <div class="list-group">
             <div ng:repeat="path in config.match('\\d+')" class="list-group-item list-group-item-large">
@@ -230,9 +230,9 @@ <h4>{{configuringInterface.name}}</h4>
                 <a class="list-group-btn" ng:click="$parent.configuringHostPath = path" title="{{'Configure'|translate}}">
                     <i class="fa fa-cog"></i>
                 </a>
-                <div class="list-group-main"> 
+                <div class="list-group-main">
                     <div class="list-group-icon">
-                        <i class="fa fa-fw fa-globe"></i> 
+                        <i class="fa fa-fw fa-globe"></i>
                     </div>
                     <h4 class="list-group-item-heading">
                         {{ config.get(path + '/canonical') }}
@@ -272,18 +272,18 @@ <h4>{{config.get(configuringHostPath + '/canonical')}}</h4>
             <div class="modal-body scrollable">
                 <div class="form-group">
                     <label translate>Canonical hostname</label>
-                    <input 
-                        ng:model="config.model(configuringHostPath + '/canonical')" 
+                    <input
+                        ng:model="config.model(configuringHostPath + '/canonical')"
                         ng:model-options="{getterSetter: true}"
-                        type="text" 
+                        type="text"
                         class="form-control" />
                 </div>
                 <div class="form-group">
                     <label translate>IP address</label>
-                    <input 
-                        ng:model="config.model(configuringHostPath + '/ipaddr')" 
+                    <input
+                        ng:model="config.model(configuringHostPath + '/ipaddr')"
                         ng:model-options="{getterSetter: true}"
-                        type="text" 
+                        type="text"
                         class="form-control" />
                 </div>
                 <div class="form-group">
@@ -318,5 +318,5 @@ <h4>{{config.get(configuringHostPath + '/canonical')}}</h4>
         </dialog>
 
         <br/>
-    </tab>
-</tabset>
+    </uib-tab>
+</uib-tabset>
diff --git a/plugins/notepad/plugin.yml b/plugins/notepad/plugin.yml
@@ -2,7 +2,7 @@ name: notepad
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.21'
+version: '0.22'
 title: 'Notepad'
 icon: pencil
 dependencies:

diff --git a/plugins/notepad/resources/partial/index.html b/plugins/notepad/resources/partial/index.html
@@ -27,26 +27,26 @@
         <i class="fa fa-plus"></i> <span translate>Tab</span>
     </a>
 
-    <div class="btn-group dropdown dropup pull-right">
+    <div uib-dropdown class="btn-group dropup pull-right">
         <a class="btn btn-default btn-flat" ng:click="toggleBookmark()" ng:class="{active: bookmarks.indexOf(path) >= 0}" title="{{'Bookmark this'|translate}}" ng:show="path">
             <i class="fa fa-bookmark-o"></i>
         </a>
 
-        <a class="btn btn-default btn-flat" dropdown-toggle ng:show="bookmarks.length > 0">
+        <a class="btn btn-default btn-flat" uib-dropdown-toggle ng:show="bookmarks.length > 0">
             <span translate>Bookmarks</span> <span class="caret"></span>
         </a>
 
-        <ul class="dropdown-menu" ng:show="bookmarks.length > 0">
+        <ul uib-dropdown-menu ng:show="bookmarks.length > 0">
             <li ng:repeat="path in bookmarks|orderBy:'toString()'">
                 <a ng:href="{{urlPrefix}}/view/notepad/{{path}}">
                     <i class="fa fa-file"></i> {{path}}
                 </a>
             </li>
         </ul>
-    </div>    
+    </div>
 
     <a ng:click="newFile()" class="btn btn-default btn-flat" test-bind="newButton" translate>New</a>
     <a ng:click="showOpenDialog()" class="btn btn-default btn-flat" test-bind="openButton" translate>Open</a>
     <a ng:click="save()" ng:show="path" class="btn btn-default btn-flat" test-bind="saveButton" translate>Save</a>
     <a ng:click="showSaveDialog()" class="btn btn-default btn-flat" test-bind="saveAsButton" translate>Save As...</a>
-</floating-toolbar>
+</floating-toolbar>
diff --git a/plugins/plugins/plugin.yml b/plugins/plugins/plugin.yml
@@ -2,7 +2,7 @@ name: plugins
 author: Ajenti project
 email: e@ajenti.org
 url: http://ajenti.org
-version: '0.37'
+version: '0.38'
 title: 'Plugins'
 icon: th-large
 dependencies: