Skip to content

Commit cc2e22a

Browse files
committed
Tooltip and loading bar issue fixed
1 parent 346129a commit cc2e22a

File tree

5 files changed

+18
-20
lines changed

5 files changed

+18
-20
lines changed

app/scripts/app.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ angular
1212
'oc.lazyLoad',
1313
'ui.router',
1414
'ui.bootstrap',
15+
'angular-loading-bar',
1516
])
1617
.config(['$stateProvider','$urlRouterProvider','$ocLazyLoadProvider',function ($stateProvider,$urlRouterProvider,$ocLazyLoadProvider) {
1718

@@ -70,11 +71,6 @@ angular
7071
name:'ngTouch',
7172
files:['bower_components/angular-touch/angular-touch.js']
7273
})
73-
$ocLazyLoad.load(
74-
{
75-
name:'angular-loading-bar',
76-
files:['bower_components/angular-loading-bar/src/loading-bar.js']
77-
})
7874
}
7975
}
8076
})

app/scripts/controllers/main.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,5 @@
77
* Controller of the sbAdminApp
88
*/
99
angular.module('sbAdminApp')
10-
.controller('MainCtrl', function($scope) {
10+
.controller('MainCtrl', function($scope,$position) {
1111
});

app/scripts/directives/sidebar/sidebar.html

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
<li ng-class="{active: currentUrl()=='/dashboard/forms'}">
1717
<a ui-sref="dashboard.form"><i class="fa fa-edit fa-fw"></i> Forms</a>
1818
</li>
19-
<li ng-init="drop = !drop" ng-class="{active: collapseVar==1}">{{dropDown}}
19+
<li ng-class="{active: collapseVar==1}">{{dropDown}}
2020
<a ng-click="check(1)"><i class="fa fa-wrench fa-fw"></i> UI Elements<span class="fa arrow"></span></a>
2121
<ul class="nav nav-second-level" collapse ="collapseVar!=1">
2222
<li ng-class="{active: currentUrl()=='/dashboard/panels-wells'}">
@@ -40,7 +40,7 @@
4040
</ul>
4141
<!-- /.nav-second-level -->
4242
</li>
43-
<li ng-init="multi = !multi" ng-class="{active: collapseVar==2}">
43+
<li ng-class="{active: collapseVar==2}">
4444
<a ng-click="check(2)"><i class="fa fa-sitemap fa-fw"></i> Multi-Level Dropdown<span class="fa arrow"></span></a>
4545
<ul class="nav nav-second-level" collapse = "collapseVar!=2">
4646
<li>
@@ -64,13 +64,14 @@
6464
<li>
6565
<a href="">Third Level Item</a>
6666
</li>
67+
6768
</ul>
6869
<!-- /.nav-third-level -->
6970
</li>
7071
</ul>
7172
<!-- /.nav-second-level -->
7273
</li>
73-
<li ng-init="pages=!pages" ng-class="{active:collapseVar==4}">
74+
<li ng-class="{active:collapseVar==4}">
7475
<a ng-click="check(4)"><i class="fa fa-files-o fa-fw"></i> Sample Pages<span class="fa arrow"></span></a>
7576
<ul class="nav nav-second-level"collapse="collapseVar!=4">
7677
<li ng-class="{active: selectedMenu=='blank'}">
@@ -81,7 +82,7 @@
8182
</li>
8283
</ul>
8384
<!-- /.nav-second-level -->
84-
</li>
85+
</li>
8586
</ul>
8687
</div>
8788
<!-- /.sidebar-collapse -->

app/styles/main.css

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
/* Space out content a bit */
22
body {
3-
padding-top: 20px;
4-
padding-bottom: 20px;
3+
padding-bottom: 20px;
54
}
65

76
/* Everything but the jumbotron gets side spacing for mobile first views */

app/views/ui-elements/notifications.html

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -110,24 +110,26 @@ <h4 class="modal-title" id="myModalLabel">Modal title</h4>
110110
<div class="panel-body">
111111
<h4>Tooltip Demo</h4>
112112
<div class="tooltip-demo">
113-
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="Tooltip on left">Tooltip on left</button>
114-
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="top" title="Tooltip on top">Tooltip on top</button>
115-
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="bottom" title="Tooltip on bottom">Tooltip on bottom</button>
116-
<button type="button" class="btn btn-default" data-toggle="tooltip" data-placement="right" title="Tooltip on right">Tooltip on right</button>
113+
<button type="button" tooltip="Tooltip on left" tooltip-placement="left" class="btn btn-default" title="Tooltip on left">Tooltip on left</button>
114+
<button type="button" tooltip="Tooltip on top" tooltip-placement="top" class="btn btn-default" title="Tooltip on top">Tooltip on top</button>
115+
<button type="button" tooltip="Tooltip on bottom" tooltip-placement="bottom" class="btn btn-default" title="Tooltip on bottom">Tooltip on bottom</button>
116+
<button type="button" tooltip="Tooltip on right" tooltip-placement="right" class="btn btn-default" title="Tooltip on right">Tooltip on right</button>
117+
117118
</div>
118119
<br>
120+
<br>
119121
<h4>Clickable Popover Demo</h4>
120122
<div class="tooltip-demo">
121-
<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="left" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
123+
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="left" popover-trigger="click">
122124
Popover on left
123125
</button>
124-
<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="top" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
126+
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="top" popover-trigger="click">
125127
Popover on top
126128
</button>
127-
<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="bottom" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
129+
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="bottom" popover-trigger="click">
128130
Popover on bottom
129131
</button>
130-
<button type="button" class="btn btn-default" data-container="body" data-toggle="popover" data-placement="right" data-content="Vivamus sagittis lacus vel augue laoreet rutrum faucibus.">
132+
<button type="button" class="btn btn-default" popover="Vivamus sagittis lacus vel augue laoreet rutrum faucibus." popover-placement="right" popover-trigger="click">
131133
Popover on right
132134
</button>
133135
</div>

0 commit comments

Comments
 (0)