opendev/storyboard-webclient
Code Issues Proposed changes

Updated library versions.

Browse Source 
Required some tweaks on the header menu to ensure that the
toggle menus still worked properly.

Change-Id: I7cdeca83625e2cc66bfd096aa02c95cc9cb8423e
This commit is contained in:
Michael Krotscheck 2015-02-13 11:32:05 -08:00
parent 87818b2a92
commit 48b35b276d
5 changed files with 29 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
bower.json
View File

@ -2,24 +2,24 @@
"name": "storyboard-webclient",
"version": "0.0.1",
"dependencies": {
"font-awesome": "4.2.0",
"angular": "1.2.25",
"angular-resource": "1.2.25",
"angular-sanitize": "1.2.25",
"bootstrap": "3.2.0",
"angular-ui-router": "0.2.11",
"angular-bootstrap": "0.11.2",
"angular-local-storage": "0.0.7",
"angular-elastic": "2.4.0",
"angular-moment": "0.8.2",
"angular-cache": "3.2.2"
"font-awesome": "4.3.0",
"angular": "1.3.10",
"angular-resource": "1.3.10",
"angular-sanitize": "1.3.10",
"bootstrap": "3.3.2",
"angular-ui-router": "0.2.13",
"angular-bootstrap": "0.12.0",
"angular-local-storage": "0.1.5",
"angular-elastic": "2.4.2",
"angular-moment": "0.9.0",
"angular-cache": "3.2.5"
},
"devDependencies": {
"angular-mocks": "1.2.25",
"angular-scenario": "1.2.25"
"angular-mocks": "1.3.10",
"angular-scenario": "1.3.10"
},
"resolutions": {
"angular": "1.2.25",
"font-awesome": "4.2.0"
"angular": "1.3.10",
"font-awesome": "4.3.0"
}
}

17
src/app/storyboard/template/header_menu.html
View File

@ -56,8 +56,8 @@
Login
</a>
</li>
<li class="dropdown" ng-show="isLoggedIn">
<a href="#" class="dropdown-toggle" data-toggle="dropdown">
<li class="dropdown" dropdown ng-show="isLoggedIn">
<a href="#" class="dropdown-toggle" dropdown-toggle>
<span ng-show="currentUser.$resolved">
{{currentUser.full_name}}
</span>
@ -91,7 +91,7 @@
typeahead-loading="headerCriteriaLoading"
typeahead-on-select="search($model)"
typeahead-template-url="app/search/template/typeahead_criteria_item.html"
/>
/>
<span class="form-control-feedback text-muted">
<i class="fa fa-search" ng-hide="headerCriteriaLoading"></i>
<i class="fa fa-spin fa-refresh"
@ -109,8 +109,7 @@
<div class="navbar-header">
<button type="button"
class="btn btn-sm btn-primary navbar-btn pull-right"
data-toggle="collapse"
data-target="#mobile-dropdown-menu"
ng-click="showMobileMenu = !showMobileMenu"
ng-show="isLoggedIn">
<i class="fa fa-gear"></i>
</button>
@ -127,10 +126,11 @@
<a class="navbar-brand" href="#!/">StoryBoard</a>
</div>
<div class="collapse navbar-collapse" id="mobile-dropdown-menu">
<div collapse="!showMobileMenu" id="mobile-dropdown-menu">
<ul class="nav navbar-nav">
<li active-path="^\/profile\/preferences*">
<a href="#!/profile/preferences">
<a href="#!/profile/preferences"
ng-click="showMobileMenu = false">
<i class="fa fa-user"></i>
<span ng-show="currentUser.$resolved">
{{currentUser.full_name}}
@ -142,7 +142,8 @@
</a>
</li>
<li class="divider"></li>
<li><a href="#!/auth/deauthorize">
<li><a href="#!/auth/deauthorize"
ng-click="showMobileMenu = false">
<i class="fa fa-sign-out"></i>
Logout
</a></li>

4
src/app/util/template/task_priority_dropdown.html
View File

@ -1,8 +1,8 @@
<span class="label label-{{style}}" ng-hide="editable">
{{priority | taskPriorityLabel}}
</span>
<div class="dropdown" ng-show="editable">
<a class="btn btn-{{style}} btn-xs dropdown-toggle">
<div class="dropdown" ng-show="editable" dropdown>
<a class="btn btn-{{style}} btn-xs dropdown-toggle" dropdown-toggle>
{{priority | taskPriorityLabel}}
<i class="fa fa-caret-down"></i>
</a>

4
src/app/util/template/task_status_dropdown.html
View File

@ -1,8 +1,8 @@
<span class="label label-{{style}}" ng-hide="editable">
{{statusName}}
</span>
<div class="dropdown" ng-show="editable">
<a class="btn btn-{{style}} btn-xs dropdown-toggle">
<div class="dropdown" ng-show="editable" dropdown>
<a class="btn btn-{{style}} btn-xs dropdown-toggle" dropdown-toggle>
{{ statusName }}
<i class="fa fa-caret-down"></i>
</a>

2
src/index.html
View File

@ -33,7 +33,7 @@
<script src="angular-bootstrap/ui-bootstrap-tpls.js"></script>
<script src="angular-ui-router/release/angular-ui-router.js"></script>
<script src="angular-resource/angular-resource.js"></script>
<script src="angular-local-storage/angular-local-storage.js"></script>
<script src="angular-local-storage/dist/angular-local-storage.js"></script>
<script src="angular-sanitize/angular-sanitize.js"></script>
<script src="angular-cache/dist/angular-cache.js"></script>
<script src="moment/moment.js"></script>