Skip to content

Commit

Permalink
+
Browse files Browse the repository at this point in the history
  • Loading branch information
@gerbil
gerbil committed Dec 2, 2014
1 parent 07e8707 commit 90019ad
Show file tree
Hide file tree
Showing 10 changed files with 398 additions and 121 deletions.
1 change: 1 addition & 0 deletions .idea/vcs.xml
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

82 changes: 36 additions & 46 deletions app/index.html
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<!doctype html>
<html class="no-js">
<head>
<head>
<meta charset="utf-8">
<title></title>
<meta name="description" content="">
Expand All @@ -14,56 +14,46 @@
<!-- build:css(.tmp) styles/main.css -->
<link rel="stylesheet" href="styles/main.css">
<!-- endbuild -->
</head>
<body ng-app="dashboardApp">
<!--[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]-->
</head>
<body ng-app="dashboardApp">
<!--[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]-->

<!-- Add your site or application content here -->
<div class="container-fluid">
<div class="header">
<ul class="nav nav-pills pull-right">
<li class="active"><a ng-href="#/alarms">Alarms</a></li>
<li><a ng-href="#/about">About</a></li>
<li><a ng-href="#">Contact</a></li>
</ul>
<h3 class="text-muted">Provident monitor</h3>
</div>
<!-- Add your site or application content here -->
<div id="page-wrapper" class="gray-bg">

<div ng-view=""></div>
<div ng-view=""></div>

<div class="footer">
<p><span class="glyphicon glyphicon-heart"></span> from the Yeoman team</p>
</div>
</div>
</div>

<!-- build:js(.) scripts/oldieshim.js -->
<!--[if lt IE 9]>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.js"></script>
<![endif]-->
<!-- endbuild -->
<!-- build:js(.) scripts/oldieshim.js -->
<!--[if lt IE 9]>
<script src="bower_components/es5-shim/es5-shim.js"></script>
<script src="bower_components/json3/lib/json3.js"></script>
<![endif]-->
<!-- endbuild -->

<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-touch/angular-touch.js"></script>
<!-- endbower -->
<!-- endbuild -->
<!-- build:js(.) scripts/vendor.js -->
<!-- bower:js -->
<script src="bower_components/jquery/dist/jquery.js"></script>
<script src="bower_components/angular/angular.js"></script>
<script src="bower_components/bootstrap/dist/js/bootstrap.js"></script>
<script src="bower_components/angular-animate/angular-animate.js"></script>
<script src="bower_components/angular-cookies/angular-cookies.js"></script>
<script src="bower_components/angular-resource/angular-resource.js"></script>
<script src="bower_components/angular-route/angular-route.js"></script>
<script src="bower_components/angular-sanitize/angular-sanitize.js"></script>
<script src="bower_components/angular-touch/angular-touch.js"></script>
<script src="bower_components/angular-bootstrap/ui-bootstrap-tpls.js"></script>
<!-- endbower -->
<!-- endbuild -->

<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/about.js"></script>
<script src="scripts/controllers/alarms.js"></script>
<!-- endbuild -->
<!-- build:js({.tmp,app}) scripts/scripts.js -->
<script src="scripts/app.js"></script>
<script src="scripts/controllers/main.js"></script>
<script src="scripts/controllers/about.js"></script>
<script src="scripts/controllers/alarms.js"></script>
<!-- endbuild -->
</body>
</html>
5 changes: 3 additions & 2 deletions app/scripts/app.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ angular
'ngResource',
'ngRoute',
'ngSanitize',
'ngTouch'
'ngTouch',
'ui.bootstrap'
])
.config(function ($routeProvider) {
$routeProvider
Expand All @@ -32,7 +33,7 @@ angular
controller: 'AboutCtrl'
})
.when('/alarms', {
templateUrl: 'views/alarms.html',
templateUrl: '../views/alarms/index.html',
controller: 'AlarmsCtrl'
})
.otherwise({
Expand Down
69 changes: 63 additions & 6 deletions app/scripts/controllers/alarms.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,68 @@
* # AlarmsCtrl
* Controller of the dashboardApp
*/

angular.module('dashboardApp')
.controller('AlarmsCtrl', function ($scope) {
$scope.awesomeThings = [
'HTML5 Boilerplate',
'AngularJS',
'Karma'
];

.factory('Alarms', function ($resource) {
return $resource(
'http://localhost:3000/alarms/:server/:action/:id',
{server: '@server' },
{id: '@id' },
{
'add': {action: 'add'},
'delete': {action: 'delete'},
'save': {action: 'update'}
}
);
})

.controller('AlarmsCtrl', function ($scope, $resource, Alarms, $modal) {
$scope.testAlarms = Alarms.query({server: 'test'});
$scope.avk6b1Alarms = Alarms.query({server: 'avk6b1'});

$scope.openModal = function (server, id) {
$scope.showModal = true;
$scope.alarmInfo = Alarms.query({server: server, id: id});
};

$scope.openModal = function (size, server, id) {

$scope.alarmInfo = Alarms.query({server: server, id: id});
$scope.id = id;
$scope.server = server;

$modal.open({
templateUrl: '../views/alarms/modal.html',
controller: 'ModalInstanceCtrl',
size: size,
scope: $scope,
resolve: {
items: function () {
return $scope.alarmInfo;
}
}
});
};

})

// Please note that $modalInstance represents a modal window (instance) dependency.
// It is not the same as the $modal service used above.
.controller('ModalInstanceCtrl', function ($scope, $modalInstance, Alarms) {

$scope.saveAlarm = function () {
$scope.saveAlarmResponse = Alarms.save({server: $scope.server, id: $scope.id});
console.log($scope.server);
console.log($scope.id);
console.log($scope.saveAlarmResponse);
};

$scope.deleteAlarm = function () {
Alarms.delete({server: $scope.server, id: $scope.id});
};

$scope.cancel = function () {
$modalInstance.dismiss('cancel');
};
});
107 changes: 107 additions & 0 deletions app/styles/main.css
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,107 @@
/* BG */
body {
background-color: #f2f2f3;
}

/* ALARMS */
#alarms {
margin: 50px;
}

.ibox {
clear: both;
margin-bottom: 25px;
margin-top: 0;
padding: 0;
}

.ibox:after,
.ibox:before {
display: table;
}

.ibox-title {
-moz-border-bottom-colors: none;
-moz-border-left-colors: none;
-moz-border-right-colors: none;
-moz-border-top-colors: none;
background-color: #ffffff;
border-color: #e7eaec;
border-image: none;
border-style: solid solid none;
border-width: 4px 0px 0;
color: inherit;
margin-bottom: 0;
padding: 14px 15px 7px;
height: 48px;
}

.ibox-content {
background-color: #ffffff;
color: inherit;
padding: 15px 20px 20px 20px;
border-color: #e7eaec;
border-image: none;
border-style: solid solid none;
border-width: 1px 0px;
}

.green {
color: green;
}

.red {
color: red;
}

.big {
font-size: 20px;
}

.progress {
overflow: hidden;
height: 20px;
margin-bottom: 20px;
background-color: #f6f6f6;
background-image: -moz-linear-gradient(top, whitesmoke, #f9f9f9);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(whitesmoke), to(#f9f9f9));
background-image: -webkit-linear-gradient(top, whitesmoke, #f9f9f9);
background-image: -o-linear-gradient(top, whitesmoke, #f9f9f9);
background-image: linear-gradient(to bottom, #f5f5f5, #f9f9f9);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FFF5F5F5', endColorstr='#FFF9F9F9', GradientType=0);
-webkit-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-moz-box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
}

.progress .bar {
width: 0%;
height: 100%;
color: white;
float: left;
font-size: 12px;
text-align: center;
text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
background-color: #0e90d2;
background-image: -moz-linear-gradient(top, #149bdf, #0480be);
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#149bdf), to(#0480be));
background-image: -webkit-linear-gradient(top, #149bdf, #0480be);
background-image: -o-linear-gradient(top, #149bdf, #0480be);
background-image: linear-gradient(to bottom, #149bdf, #0480be);
background-repeat: repeat-x;
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#FF149BDF', endColorstr='#FF0480BE', GradientType=0);
-webkit-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-moz-box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
box-shadow: inset 0 -1px 0 rgba(0, 0, 0, 0.15);
-webkit-box-sizing: border-box;
-moz-box-sizing: border-box;
box-sizing: border-box;
-webkit-transition: width 0.6s ease;
-moz-transition: width 0.6s ease;
-o-transition: width 0.6s ease;
transition: width 0.6s ease;
}
64 changes: 0 additions & 64 deletions app/views/alarms.html
View file

This file was deleted.

Loading

0 comments on commit 90019ad

Please sign in to comment.