From 6e07c238da63f386c22981b241473f2674ccfc44 Mon Sep 17 00:00:00 2001
From: Jeffrey Phillips Freeman <jeffrey.freeman@syncleus.com>
Date: Sat, 11 Jul 2015 20:11:00 -0400
Subject: [PATCH] Added nested view support and applied it to the analyzer.
---
dist/index.html | 1 +
dist/js/analyzerController.js | 2 +
dist/js/app.js | 19 +++++----
dist/views/analyzer.dataModel.html | 34 +++++++++++++++
.../{dataModelView.html => analyzer.html} | 41 ++-----------------
dist/views/{chartsView.html => charts.html} | 0
dist/views/{homeView.html => home.html} | 2 +-
dist/views/{loremView.html => lorem.html} | 0
.../{uppercaseView.html => uppercase.html} | 0
.../{userToggleView.html => userToggle.html} | 0
10 files changed, 53 insertions(+), 46 deletions(-)
create mode 100644 dist/js/analyzerController.js
create mode 100644 dist/views/analyzer.dataModel.html
rename dist/views/{dataModelView.html => analyzer.html} (54%)
rename dist/views/{chartsView.html => charts.html} (100%)
rename dist/views/{homeView.html => home.html} (80%)
rename dist/views/{loremView.html => lorem.html} (100%)
rename dist/views/{uppercaseView.html => uppercase.html} (100%)
rename dist/views/{userToggleView.html => userToggle.html} (100%)
diff --git a/dist/index.html b/dist/index.html
index 7f5fc6f..bdfa225 100644
--- a/dist/index.html
+++ b/dist/index.html
@@ -77,5 +77,6 @@
<script src="js/chartsController.js"></script>
<script src="js/userToggleController.js"></script>
<script src="js/dataModelController.js"></script>
+ <script src="js/analyzerController.js"></script>
</body>
</html>
diff --git a/dist/js/analyzerController.js b/dist/js/analyzerController.js
new file mode 100644
index 0000000..a38b949
--- /dev/null
+++ b/dist/js/analyzerController.js
@@ -0,0 +1,2 @@
+app.controller('analyzerController', ['$scope', function ($scope) {
+}]);
diff --git a/dist/js/app.js b/dist/js/app.js
index a4e30ac..2ce9fd1 100644
--- a/dist/js/app.js
+++ b/dist/js/app.js
@@ -5,31 +5,36 @@ app.config(function ($stateProvider, $urlRouterProvider) {
.state('home', {
url: '/',
controller: 'homeController',
- templateUrl: 'views/homeView.html'
+ templateUrl: 'views/home.html'
})
.state('charts', {
url: '/charts',
controller: 'chartsController',
- templateUrl: 'views/chartsView.html'
+ templateUrl: 'views/charts.html'
})
.state('userToggle', {
url: '/userToggle',
controller: 'userToggleController',
- templateUrl: 'views/userToggleView.html'
+ templateUrl: 'views/userToggle.html'
})
.state('lorem', {
url: '/lorem',
- templateUrl: 'views/loremView.html'
+ templateUrl: 'views/lorem.html'
})
- .state('dataModel', {
+ .state('analyzer', {
+ url: '/analyzer',
+ controller: 'analyzerController',
+ templateUrl: 'views/analyzer.html'
+ })
+ .state('analyzer.dataModel', {
url: '/dataModel',
controller: 'dataModelController',
- templateUrl: 'views/dataModelView.html'
+ templateUrl: 'views/analyzer.dataModel.html'
})
.state('details', {
url: '/uppercase/:name',
controller: 'uppercaseController',
- templateUrl: 'views/uppercaseView.html'
+ templateUrl: 'views/uppercase.html'
});
$urlRouterProvider.otherwise('/');
});
diff --git a/dist/views/analyzer.dataModel.html b/dist/views/analyzer.dataModel.html
new file mode 100644
index 0000000..b97d368
--- /dev/null
+++ b/dist/views/analyzer.dataModel.html
@@ -0,0 +1,34 @@
+<div class="expand-collapse-links"><a ng-click="selectAllDataModelKeys()">Expand all</a> <a ng-click="unselectAllDataModelKeys()">Collapse all</a></div>
+<table class="data-model-table">
+ <tbody>
+ <tr class="data-model-table-key-row" ng-class='{selected: datapoint.detailsVisible}' ng-click="selectDataModelKey($index)" ng-repeat-start="datapoint in datapoints">
+ <td><span class="data-model-table-expand-icon"></span></td>
+ <td>{{datapoint.key}}</td>
+ <td>{{datapoint.description}}</td>
+ </tr>
+ <tr class="data-model-table-details-row" ng-class='{selected: datapoint.detailsVisible}' ng-repeat-end>
+ <td colspan="3">
+ <table>
+ <tbody>
+ <tr class="data-model-details-text">
+ <td>Description:</td>
+ <td>{{datapoint.description}}</td>
+ </tr>
+ <tr class="data-model-details-text">
+ <td>Type:</td>
+ <td>{{datapoint.type}}</td>
+ </tr>
+ <tr class="data-model-details-text" ng-if="datapoint.states != null">
+ <td>States:</td>
+ <td>{{datapoint.states}}</td>
+ </tr>
+ <tr class="data-model-details-text" ng-if="datapoint.type == 'number'">
+ <td>Range:</td>
+ <td><span ng-if="datapoint.rangeMin != null">{{datapoint.rangeMin}}</span><span ng-if="datapoint.rangeMin == null">-∞</span> to <span ng-if="datapoint.rangeMax != null">{{datapoint.rangeMax}}</span><span ng-if="datapoint.rangeMax == null">∞</span></td>
+ </tr>
+ </tbody>
+ </table>
+ </td>
+ </tr>
+ </tbody>
+</table>
diff --git a/dist/views/dataModelView.html b/dist/views/analyzer.html
similarity index 54%
rename from dist/views/dataModelView.html
rename to dist/views/analyzer.html
index 0707eb8..48fd835 100644
--- a/dist/views/dataModelView.html
+++ b/dist/views/analyzer.html
@@ -1,8 +1,8 @@
<div class="analyzer-header">
<div class="analyzer-title">
<div class="analyzer-icon">
- <i class="analyzer-icon-bottom"></i>
- <i class="analyzer-icon-top"></i>
+ <i class="analyzer-icon-bottom"></i>
+ <i class="analyzer-icon-top"></i>
</div>
<div class="analyzer-title-text">
@@ -23,42 +23,7 @@
<hr/>
<div class="analyzer-container">
- <div class="analyzer-content">
- <div class="expand-collapse-links"><a ng-click="selectAllDataModelKeys()">Expand all</a> <a ng-click="unselectAllDataModelKeys()">Collapse all</a></div>
- <table class="data-model-table">
- <tbody>
- <tr class="data-model-table-key-row" ng-class='{selected: datapoint.detailsVisible}' ng-click="selectDataModelKey($index)" ng-repeat-start="datapoint in datapoints">
- <td><span class="data-model-table-expand-icon"></span></td>
- <td>{{datapoint.key}}</td>
- <td>{{datapoint.description}}</td>
- </tr>
- <tr class="data-model-table-details-row" ng-class='{selected: datapoint.detailsVisible}' ng-repeat-end>
- <td colspan="3">
- <table>
- <tbody>
- <tr class="data-model-details-text">
- <td>Description:</td>
- <td>{{datapoint.description}}</td>
- </tr>
- <tr class="data-model-details-text">
- <td>Type:</td>
- <td>{{datapoint.type}}</td>
- </tr>
- <tr class="data-model-details-text" ng-if="datapoint.states != null">
- <td>States:</td>
- <td>{{datapoint.states}}</td>
- </tr>
- <tr class="data-model-details-text" ng-if="datapoint.type == 'number'">
- <td>Range:</td>
- <td><span ng-if="datapoint.rangeMin != null">{{datapoint.rangeMin}}</span><span ng-if="datapoint.rangeMin == null">-∞</span> to <span ng-if="datapoint.rangeMax != null">{{datapoint.rangeMax}}</span><span ng-if="datapoint.rangeMax == null">∞</span></td>
- </tr>
- </tbody>
- </table>
- </td>
- </tr>
- </tbody>
- </table>
- </div>
+ <div class="analyzer-content" ui-view></div>
<div class="analyzer-nav">
<nav role="navigation">
<ul class="analyzer-nav-group">
diff --git a/dist/views/chartsView.html b/dist/views/charts.html
similarity index 100%
rename from dist/views/chartsView.html
rename to dist/views/charts.html
diff --git a/dist/views/homeView.html b/dist/views/home.html
similarity index 80%
rename from dist/views/homeView.html
rename to dist/views/home.html
index e8f02c7..e9997e3 100644
--- a/dist/views/homeView.html
+++ b/dist/views/home.html
@@ -4,4 +4,4 @@
<a ui-sref="charts">Demo nv d3</a><br/>
<a ui-sref="lorem">Just a bunch of text</a><br/>
<a ui-sref="userToggle">Toggle User States</a><br/>
-<a ui-sref="dataModel">View a dataset</a><br/>
+<a ui-sref="analyzer.dataModel">View an analyzer</a><br/>
diff --git a/dist/views/loremView.html b/dist/views/lorem.html
similarity index 100%
rename from dist/views/loremView.html
rename to dist/views/lorem.html
diff --git a/dist/views/uppercaseView.html b/dist/views/uppercase.html
similarity index 100%
rename from dist/views/uppercaseView.html
rename to dist/views/uppercase.html
diff --git a/dist/views/userToggleView.html b/dist/views/userToggle.html
similarity index 100%
rename from dist/views/userToggleView.html
rename to dist/views/userToggle.html
--
GitLab