Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .yo-rc.json
Original file line number Diff line number Diff line change
Expand Up @@ -38,4 +38,4 @@
}
]
}
}
}
1 change: 1 addition & 0 deletions dashboard/dashboard.less
Original file line number Diff line number Diff line change
Expand Up @@ -2,5 +2,6 @@
@import "partial/header/header.less";
@import "partial/footer/footer.less";
@import "partial/dashboard/dashboard.less";
@import "partial/add-time-slice/add-time-slice.less";
/* Add Component LESS Above */

18 changes: 18 additions & 0 deletions dashboard/partial/add-time-slice/add-time-slice-spec.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
describe('AddTimeSliceCtrl', function() {

beforeEach(module('dashboard'));

var scope,ctrl;

beforeEach(inject(function($rootScope, $controller) {
scope = $rootScope.$new();
ctrl = $controller('AddTimeSliceCtrl', {$scope: scope});
}));

it('should ...', inject(function() {

expect(1).toEqual(1);

}));

});
17 changes: 17 additions & 0 deletions dashboard/partial/add-time-slice/add-time-slice.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<div ng-controller="AddTimeSliceCtrl">
<script type="text/ng-template" id="myModalContent.html">
<div class="modal-header">
<h3 class="modal-title">I'm a modal!</h3>
</div>
<div class="modal-body">
<ul>
testing
</ul>
Selected: <b>{{ selected.item }}</b>
</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()">OK</button>
<button class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div>
</script>
</div>
11 changes: 11 additions & 0 deletions dashboard/partial/add-time-slice/add-time-slice.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
angular.module('dashboard').controller('AddTimeSliceCtrl',function($scope, $modalInstance){

$scope.ok = function () {
$modalInstance.close();
};

$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};

});
Empty file.
1 change: 0 additions & 1 deletion dashboard/partial/dashboard/dashboard.html
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,3 @@
Welcome,
{{ currentUser }}
</div>

8 changes: 5 additions & 3 deletions dashboard/partial/footer/footer.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
<div class="col-md-12" ng-controller="FooterCtrl">
footer
<!-- FOOTER -->
<footer ng-controller="FooterCtrl">
<!--<p class="pull-right"><a href="#">Back to top</a></p>-->
<p>&copy; {{date | date:'yyyy'}} GATM &middot; <a href="#">Privacy</a> &middot; <a href="#">Terms</a></p>
</footer>

</div>
5 changes: 2 additions & 3 deletions dashboard/partial/footer/footer.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
angular.module('dashboard').controller('FooterCtrl',function($scope){


});
$scope.date = new Date();
});
64 changes: 61 additions & 3 deletions dashboard/partial/header/header.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,63 @@
<div class="col-md-12" ng-controller="HeaderCtrl">
<nav class="navbar navbar-default" ng-controller="HeaderCtrl">
<div class="container-fluid">
<!-- Brand and toggle get grouped for better mobile display -->
<div class="navbar-header">
<button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1">
<span class="sr-only">Toggle navigation</span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
<a class="navbar-brand" href="#">GATM</a>
</div>

header
</div>
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
<ul class="nav navbar-nav">
<li>
<button class="btn btn-default navbar-btn btn-success" ng-click="open()" type="button">Add Entry</button>
</li>
</ul>
<form class="navbar-form navbar-left" role="search">
<div class="form-group">
<input type="text" class="form-control" placeholder="Search">
</div>
<button type="submit" class="btn btn-default">Submit</button>
</form>
<ul class="nav navbar-nav navbar-right">
<li><a ui-sref="logout">Logout</a></li>
</ul>
</div><!-- /.navbar-collapse -->
</div><!-- /.container-fluid -->
</nav>

<div>
<script type="text/ng-template" id="myModalContent.html">
<div class="modal-header">
<h3 class="modal-title">Add time entry!</h3>
</div>
<div class="modal-body">
<div class="control-group">
<label class="control-label" for="hours">Hours</label>
<div class="controls">
<input id="hours" name="hours" type="text" placeholder="Hours" class="input-mini" required="">

</div>
</div>

<!-- Text input-->
<div class="control-group">
<label class="control-label" for="description">Description</label>
<div class="controls">
<input id="description" name="description" type="text" placeholder="description" class="input-xlarge" required="">

</div>
</div>

</div>
<div class="modal-footer">
<button class="btn btn-primary" ng-click="ok()">OK</button>
<button class="btn btn-warning" ng-click="cancel()">Cancel</button>
</div>
</script>
</div>
19 changes: 17 additions & 2 deletions dashboard/partial/header/header.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,19 @@
angular.module('dashboard').controller('HeaderCtrl',function($scope){
angular.module('dashboard').controller('HeaderCtrl', function($scope, $modal){

$scope.open = function () {
var modalInstance = $modal.open({
templateUrl: 'myModalContent.html',
controller: 'AddTimeSliceCtrl',
resolve: {
items: function () {
return $scope.items;
}
}
});

});
modalInstance.result.then(function () {
}, function () {
console.log('Modal dismissed at: ' + new Date());
});
};
});
9 changes: 2 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -45,20 +45,15 @@
<script src="directives/showErrors.js"></script>
<script src="security/service/AuthInterceptor.js"></script>
<script src="signup/service/Signup.js"></script>
<script src="dashboard/partial/add-time-slice/add-time-slice.js"></script>
<!-- Add New Component JS Above -->



<!--<div id="content" class="container" ui-view></div>-->

<div ui-view="header"></div>
<div>
<div id="content" class="container">
<div class="row">
<div ui-view="body" autoscroll="true"></div>
</div>
</div>
</div>
<div ui-view="body" autoscroll="true"></div>
<div ui-view="footer"></div>

</body>
Expand Down