Formatting

angularjs-in-action · Mar 3, 2014 · ecab618 · ecab618
1 parent 6942d3d
commit ecab618
Show file tree

Hide file tree

Showing 7 changed files with 157 additions and 149 deletions.
diff --git a/app/css/angello.css b/app/css/angello.css
@@ -14,7 +14,7 @@ body {
 }
 
 .list {
-    background: #e3e3e3;
+    background: #E3E3E3;
     border-radius: 3px;
     list-style-type: none;
     -webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.1), 0 1px 0 rgba(0, 0, 0, 0.1);
@@ -106,13 +106,13 @@ input.ng-valid {
     height: 450px;
     padding: 20px 15px 15px 15px;
     margin: 15px auto 30px auto;
-    border: 1px solid #ddd;
-    background: #fff;
-    background: linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -o-linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -ms-linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -moz-linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -webkit-linear-gradient(#f6f6f6 0, #fff 50px);
+    border: 1px solid #DDD;
+    background: #FFF;
+    background: linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -o-linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -ms-linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -moz-linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -webkit-linear-gradient(#F6F6F6 0, #FFF 50px);
     box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15);
     -o-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.1);
     -ms-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.1);
@@ -133,13 +133,13 @@ input.ng-valid {
     height: 450px;
     padding: 20px 15px 15px 15px;
     margin: 15px auto 30px auto;
-    border: 1px solid #ddd;
-    background: #fff;
-    background: linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -o-linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -ms-linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -moz-linear-gradient(#f6f6f6 0, #fff 50px);
-    background: -webkit-linear-gradient(#f6f6f6 0, #fff 50px);
+    border: 1px solid #DDD;
+    background: #FFF;
+    background: linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -o-linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -ms-linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -moz-linear-gradient(#F6F6F6 0, #FFF 50px);
+    background: -webkit-linear-gradient(#F6F6F6 0, #FFF 50px);
     box-shadow: 0 3px 10px rgba(0, 0, 0, 0.15);
     -o-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.1);
     -ms-box-shadow: 0 3px 10px rgba(0, 0, 0, 0.1);

diff --git a/app/index.html b/app/index.html
@@ -1,41 +1,41 @@
 <!DOCTYPE HTML>
 <html ng-app="Angello">
-<head>
-    <meta charset="utf-8">
-    <meta name="viewport" content="width=device-width">
-    <title>Angello in Action</title>
-
-    <link rel="stylesheet" href="css/normalize.css">
-
-    <!-- Bootstrap -->
-    <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
-
-    <link rel="stylesheet" href="css/angello.css"/>
-    <link rel="stylesheet" href="css/animations.css"/>
-</head>
-<body>
-
-<div class="navbar navbar-fixed-top">
-    <div class="navbar-inner">
-        <a class="brand logo" href="#/"> <img src="img/angello.png"></a>
-        <a class="btn btn-danger pull-right" href="#/dashboard"><i class="icon-signal icon-white"></i></a>
-    </div>
-</div>
-
-<div ng-view=""></div>
-
-<script src="lib/jquery.js"></script>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-animate.min.js"></script>
-
-<script src="http://cdnjs.cloudflare.com/ajax/libs/gsap/1.10.3/TweenMax.min.js"></script>
-<script src="lib/custom.modernizr.js"></script>
-<script src="lib/jquery-ui-1.10.3.custom.min.js"></script>
-<script src="lib/flot/jquery.flot.js"></script>
-<script src="lib/flot/jquery.flot.categories.js"></script>
-<script src="lib/sugar-1.3.9.min.js"></script>
-
-<script src="js/app.js"></script>
-</body>
+    <head>
+        <meta charset="utf-8">
+        <meta name="viewport" content="width=device-width">
+        <title>Angello in Action</title>
+
+        <link rel="stylesheet" href="css/normalize.css">
+
+        <!-- Bootstrap -->
+        <link href="lib/bootstrap/css/bootstrap.min.css" rel="stylesheet" media="screen">
+
+        <link rel="stylesheet" href="css/angello.css"/>
+        <link rel="stylesheet" href="css/animations.css"/>
+    </head>
+    <body>
+
+        <div class="navbar navbar-fixed-top">
+            <div class="navbar-inner">
+                <a class="brand logo" href="#/"> <img src="img/angello.png"></a>
+                <a class="btn btn-danger pull-right" href="#/dashboard"><i class="icon-signal icon-white"></i></a>
+            </div>
+        </div>
+
+        <div ng-view=""></div>
+
+        <script src="lib/jquery.js"></script>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular.min.js"></script>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-route.min.js"></script>
+        <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/angularjs/1.2.1/angular-animate.min.js"></script>
+
+        <script src="http://cdnjs.cloudflare.com/ajax/libs/gsap/1.10.3/TweenMax.min.js"></script>
+        <script src="lib/custom.modernizr.js"></script>
+        <script src="lib/jquery-ui-1.10.3.custom.min.js"></script>
+        <script src="lib/flot/jquery.flot.js"></script>
+        <script src="lib/flot/jquery.flot.categories.js"></script>
+        <script src="lib/sugar-1.3.9.min.js"></script>
+
+        <script src="js/app.js"></script>
+    </body>
 </html>
diff --git a/app/partials/dashboard.html b/app/partials/dashboard.html
@@ -1,16 +1,18 @@
 <div id="content">
     <h3>User Stories by Status</h3>
+
     <div class="chart-container">
-   		<div chart class="chart-placeholder"
-                source-array="stories" source-prop="status"
-                reference-array="statuses" reference-prop="name">
-   		</div>
-   	</div>
+        <div chart class="chart-placeholder"
+             source-array="stories" source-prop="status"
+             reference-array="statuses" reference-prop="name">
+        </div>
+    </div>
     <h3>User Stories by Type</h3>
-	<div class="chart-container">
-		<div chart class="chart-placeholder"
+
+    <div class="chart-container">
+        <div chart class="chart-placeholder"
              source-array="stories" source-prop="type"
              reference-array="types" reference-prop="name">
-		</div>
-	</div>
+        </div>
+    </div>
 </div>
diff --git a/app/partials/main.html b/app/partials/main.html
@@ -32,11 +32,13 @@ <h3>{{story.title}}</h3>
 
     <div ng-if="detailsVisible" class="my-fade-animation">
         <h3>Card Details</h3>
+
         <form name="detailsForm" novalidate>
             <div class="control-group">
                 <div class="controls">
                     <label class="control-label" for="inputTitle">*Title</label>
                     <input type="text" id="inputTitle" name="inputTitle" placeholder="Title" ng-model="editedStory.title" ng-required="true" ng-minlength="3" ng-maxlength="10">
+
                     <div class="alert alert-error" ng-show="detailsForm.inputTitle.$dirty && detailsForm.inputTitle.$invalid">
                         <small ng-if="detailsForm.inputTitle.$error.required">Required!</small>
                         <small ng-if="detailsForm.inputTitle.$error.minlength">Too short!</small>
@@ -51,6 +53,7 @@ <h3>Card Details</h3>
                     <select id="inputStatus" name="inputStatus" ng-model="currentStatus" ng-options="l.name for l in statuses" ng-change="setCurrentStatus(currentStatus)" ng-required="true">
                         <option value="">Select Status</option>
                     </select>
+
                     <div class="alert alert-error" ng-show="detailsForm.inputStatus.$dirty && detailsForm.inputStatus.$invalid">
                         <small ng-if="detailsForm.inputStatus.$error.required">Required!</small>
                     </div>
@@ -63,6 +66,7 @@ <h3>Card Details</h3>
                     <select id="inputType" name="inputType" ng-model="currentType" ng-options="t.name for t in types" ng-change="setCurrentType(currentType)" ng-required="true">
                         <option value="">Select Type</option>
                     </select>
+
                     <div class="alert alert-error" ng-show="detailsForm.inputType.$dirty && detailsForm.inputType.$invalid">
                         <small ng-if="detailsForm.inputType.$error.required">Required!</small>
                     </div>
@@ -84,8 +88,10 @@ <h3>Card Details</h3>
             </div>
             <div class="control-group">
                 <label class="control-label" for="inputReporter">*Reporter</label>
+
                 <div class="controls">
-                    <input type="text" id="inputReporter" name="inputReporter" placeholder="Reporter" ng-model="editedStory.reporter" ng-required="true" ng-minlength="3" ng-pattern="/^[A-z ]+$/" >
+                    <input type="text" id="inputReporter" name="inputReporter" placeholder="Reporter" ng-model="editedStory.reporter" ng-required="true" ng-minlength="3" ng-pattern="/^[A-z ]+$/">
+
                     <div class="alert alert-error" ng-show="detailsForm.inputReporter.$dirty && detailsForm.inputReporter.$invalid">
                         <small ng-if="detailsForm.inputReporter.$error.required">Required!</small>
                         <small ng-if="detailsForm.inputReporter.$error.minlength">Too short!</small>
@@ -98,6 +104,7 @@ <h3>Card Details</h3>
 
                 <div class="controls">
                     <input type="text" id="inputAssignee" name="inputAssignee" placeholder="Assignee" ng-model="editedStory.assignee" ng-required="true" ng-minlength="3" ng-pattern="/^[A-z ]+$/">
+
                     <div class="alert alert-error" ng-show="detailsForm.inputAssignee.$dirty && detailsForm.inputAssignee.$invalid">
                         <small ng-if="detailsForm.inputAssignee.$error.required">Required!</small>
                         <small ng-if="detailsForm.inputAssignee.$error.minlength">Too short!</small>

diff --git a/tests/mocks/angelloModelMock.js b/tests/mocks/angelloModelMock.js
@@ -1,36 +1,35 @@
-
-var angelloModelMock = function() {
-    var getStatuses = function() {
+var angelloModelMock = function () {
+    var getStatuses = function () {
         var tempArray = [
-            {name:'Back Log'},
-            {name:'To Do'},
-            {name:'In Progress'},
-            {name:'Code Review'},
-            {name:'QA Review'},
-            {name:'Verified'},
-            {name:'Done'}
+            {name: 'Back Log'},
+            {name: 'To Do'},
+            {name: 'In Progress'},
+            {name: 'Code Review'},
+            {name: 'QA Review'},
+            {name: 'Verified'},
+            {name: 'Done'}
         ];
         return tempArray;
     };
 
-    var getTypes = function() {
+    var getTypes = function () {
         var tempArray = [
-            {name:'Feature'},
-            {name:'Enhancement'},
-            {name:'Bug'},
-            {name:'Spike'}
+            {name: 'Feature'},
+            {name: 'Enhancement'},
+            {name: 'Bug'},
+            {name: 'Spike'}
         ];
         return tempArray;
     };
 
-    var getStories = function() {
+    var getStories = function () {
         var tempArray = [
-            {title:'Story 00', description:'Description pending.', criteria:'Criteria pending.', status:'To Do', type:'Feature', reporter:'Lukas Ruebbelke', assignee:'Brian Ford'},
-            {title:'Story 01', description:'Description pending.', criteria:'Criteria pending.', status:'Back Log', type:'Feature', reporter:'Lukas Ruebbelke', assignee:'Brian Ford'},
-            {title:'Story 02', description:'Description pending.', criteria:'Criteria pending.', status:'Code Review', type:'Enhancement', reporter:'Lukas Ruebbelke', assignee:'Brian Ford'},
-            {title:'Story 03', description:'Description pending.', criteria:'Criteria pending.', status:'Done', type:'Enhancement', reporter:'Lukas Ruebbelke', assignee:'Brian Ford'},
-            {title:'Story 04', description:'Description pending.', criteria:'Criteria pending.', status:'Verified', type:'Bug', reporter:'Lukas Ruebbelke', assignee:'Brian Ford'},
-            {title:'Story 05', description:'Description pending.', criteria:'Criteria pending.', status:'To Do', type:'Spike', reporter:'Lukas Ruebbelke', assignee:'Brian Ford'}
+            {title: 'Story 00', description: 'Description pending.', criteria: 'Criteria pending.', status: 'To Do', type: 'Feature', reporter: 'Lukas Ruebbelke', assignee: 'Brian Ford'},
+            {title: 'Story 01', description: 'Description pending.', criteria: 'Criteria pending.', status: 'Back Log', type: 'Feature', reporter: 'Lukas Ruebbelke', assignee: 'Brian Ford'},
+            {title: 'Story 02', description: 'Description pending.', criteria: 'Criteria pending.', status: 'Code Review', type: 'Enhancement', reporter: 'Lukas Ruebbelke', assignee: 'Brian Ford'},
+            {title: 'Story 03', description: 'Description pending.', criteria: 'Criteria pending.', status: 'Done', type: 'Enhancement', reporter: 'Lukas Ruebbelke', assignee: 'Brian Ford'},
+            {title: 'Story 04', description: 'Description pending.', criteria: 'Criteria pending.', status: 'Verified', type: 'Bug', reporter: 'Lukas Ruebbelke', assignee: 'Brian Ford'},
+            {title: 'Story 05', description: 'Description pending.', criteria: 'Criteria pending.', status: 'To Do', type: 'Spike', reporter: 'Lukas Ruebbelke', assignee: 'Brian Ford'}
         ];
 
         return tempArray;

diff --git a/tests/specs/controllers/MainCtrlSpec.js b/tests/specs/controllers/MainCtrlSpec.js
@@ -2,30 +2,30 @@
 
 describe('Controller: MainCtrl', function () {
 
-  // load the controller's module
-  beforeEach(module('Angello'));
+    // load the controller's module
+    beforeEach(module('Angello'));
 
-  var MainCtrl,
-    scope;
+    var MainCtrl,
+        scope;
 
-  // Initialize the controller and a mock scope
-  beforeEach(inject(function ($controller) {
-    scope = {};
-    MainCtrl = $controller('MainCtrl', {
-      $scope: scope,
-      angelloModel: angelloModelMock()
-    });
-  }));
+    // Initialize the controller and a mock scope
+    beforeEach(inject(function ($controller) {
+        scope = {};
+        MainCtrl = $controller('MainCtrl', {
+            $scope: scope,
+            angelloModel: angelloModelMock()
+        });
+    }));
 
-  it('should attach a list of story types to the scope', function () {
-    expect(scope.types).toBeDefined();
-  });
+    it('should attach a list of story types to the scope', function () {
+        expect(scope.types).toBeDefined();
+    });
 
-  it('should attach a list of story statuses to the scope', function () {
-    expect(scope.statuses).toBeDefined();
-  });
+    it('should attach a list of story statuses to the scope', function () {
+        expect(scope.statuses).toBeDefined();
+    });
 
-  it('should attach a list of stories to the scope', function () {
-    expect(scope.stories).toBeDefined();
-  });
+    it('should attach a list of stories to the scope', function () {
+        expect(scope.stories).toBeDefined();
+    });
 });