Skip to content

Commit

Permalink
fix(*): updating some things
Browse files Browse the repository at this point in the history
  • Loading branch information
benschw committed Dec 10, 2014
1 parent 9fab0fd commit 52e8ff6
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 23 deletions.
12 changes: 6 additions & 6 deletions app/index.html
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<!doctype html>
<html class="no-js">
<html class="no-js" ng-app="satisApp">
<head>
<meta charset="utf-8">
<title></title>
Expand All @@ -15,7 +15,7 @@
<link rel="stylesheet" href="styles/main.css">
<!-- endbuild -->
</head>
<body ng-app="satisApp">
<body>
<!--[if lt IE 7]>
<p class="browsehappy">You are using an <strong>outdated</strong> browser. Please <a href="http://browsehappy.com/">upgrade your browser</a> to improve your experience.</p>
<![endif]-->
Expand Down Expand Up @@ -47,9 +47,9 @@
<!-- endbower -->
<!-- endbuild -->

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/home/home.js"></script>
<!-- endbuild -->
<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/home/home.js"></script>
<!-- endbuild -->
</body>
</html>
8 changes: 5 additions & 3 deletions app/scripts/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
console.log('loaded');
/**
* @ngdoc overview
* @name satisAdminApp
* @name satisApp
* @description
* # satisAdminApp
* # satisApp
*
* Main module of the application.
*/
Expand All @@ -22,11 +22,11 @@ angular
])
.run(['$rootScope', '$state', '$stateParams',
function ($rootScope, $state, $stateParams) {
console.log('app');
$rootScope.$state = $state;
$rootScope.$stateParams = $stateParams;
}])
.config(['$stateProvider', '$urlRouterProvider', function ($stateProvider, $urlRouterProvider) {
console.log('app');
// If the url is ever invalid, e.g. '/asdf', then redirect to '/' aka the home state
$urlRouterProvider.otherwise('/');

Expand All @@ -47,3 +47,5 @@ angular
$stateProvider.state(app);

}]);


26 changes: 12 additions & 14 deletions app/views/home.html
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@

<my-alert ng-model="alert" ng-repeat="alert in alerts"></my-alert>

<div class="well well-lg">
Expand All @@ -7,17 +8,17 @@ <h3 class="panel-title">Manage Your Satis Repository</h3>
<div>
<!-- Add -->
<div class="row">
<div class="col-lg-2">
<div class="col-sm-2">
<div class="form-group">
<input type="text" class="form-control" ng-model="addType" placeholder="Type">
</div>
</div>
<div class="col-lg-7">
<div class="col-sm-7">
<div class="form-group">
<input type="text" class="form-control" ng-model="addUrl" placeholder="Url">
</div>
</div>
<div class="col-lg-2">
<div class="col-sm-3">
<div class="form-group">
<button type="submit" class="btn btn-success" ng-click="addRepo()">Add</button>
</div>
Expand All @@ -27,30 +28,27 @@ <h3 class="panel-title">Manage Your Satis Repository</h3>
<br />
<!-- Manage -->
<div class="row" ng-repeat="repo in repos">
<div class="col-lg-2">
<div class="col-sm-2">
<div class="form-group">
<input type="text" id="{{repo.id}}" class="form-control" placeholder="Type" ng-model="repo.type">
</div>
</div>
<div class="col-lg-7">
<div class="col-sm-7">
<div class="form-group">
<input type="text" id="{{repo.id}}" class="form-control" placeholder="Url" ng-model="repo.url">
</div>
</div>
<div class="col-lg-1">
<div class="form-group">
<button type="submit" class="btn btn-default" ng-click="saveRepo(repo.id, repo.type, repo.url)">Save</button>
</div>
</div>
<div class="col-lg-1">
<div class="col-sm-3">
<div class="form-group">
<button type="submit" class="btn btn-danger" ng-click="deleteRepo(repo.id)">Delete</button>
<div class="btn-group" role="group" aria-label="manage repo">

<button type="submit" class="btn btn-default" role="group" ng-click="saveRepo(repo.id, repo.type, repo.url)">Save</button>
<button type="submit" class="btn btn-danger" role="group" ng-click="deleteRepo(repo.id)">Delete</button>
</div>
</div>
</div>
</div>


</div>


</div>

0 comments on commit 52e8ff6

Please sign in to comment.