uiref -- added custom glyph (smiley UI) and used it in nav-items, topo overlay, and custom view.
Change-Id: I98a1b4349472e7789fa71fb25b9dcc0b87c38f2b
diff --git a/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.css b/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.css
index e9f99b3..30591f2 100644
--- a/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.css
+++ b/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.css
@@ -37,6 +37,25 @@
background-color: #aaa;
}
+#ov-ui-ref-custom .data-panel {
+ display: inline-block;
+ background-color: #eee;
+ padding: 12px;
+ margin: 4px;
+ vertical-align: top;
+}
+
+#ov-ui-ref-custom .data-panel svg g.icon {
+ cursor: pointer;
+}
+
+#ov-ui-ref-custom .data-panel svg g.icon rect {
+ fill: lightsteelblue;
+}
+#ov-ui-ref-custom .data-panel svg g.icon use {
+ fill: darkslateblue;
+}
+
#ov-ui-ref-custom .number {
font-size: 140%;
text-align: right;
diff --git a/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.html b/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.html
index 30b32ff..d51398d 100644
--- a/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.html
+++ b/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.html
@@ -6,27 +6,34 @@
</div>
</div>
- <div class="data-panel">
- <table>
- <tr>
- <td> Number </td>
- <td class="number"> {{data.number}} </td>
- </tr>
- <tr>
- <td> Square </td>
- <td class="number"> {{data.square}} </td>
- </tr>
- <tr>
- <td> Cube </td>
- <td class="number"> {{data.cube}} </td>
- </tr>
- </table>
+ <div id="ov-ui-ref-wrapper">
+ <div class="data-panel">
+ <table>
+ <tr>
+ <td> Number </td>
+ <td class="number"> {{data.number}} </td>
+ </tr>
+ <tr>
+ <td> Square </td>
+ <td class="number"> {{data.square}} </td>
+ </tr>
+ <tr>
+ <td> Cube </td>
+ <td class="number"> {{data.cube}} </td>
+ </tr>
+ </table>
- <p>
- A message from our sponsors:
- </p>
- <p>
- <span class="quote"> {{data.message}} </span>
- </p>
+ <p>
+ A message from our sponsors:
+ </p>
+ <p>
+ <span class="quote"> {{data.message}} </span>
+ </p>
+ </div>
+ <div class="data-panel">
+ <div icon icon-id="nav_uiref" icon-size="180"
+ tooltip tt-msg="Don't Worry... Be Happy!"
+ ng-click="nav('topo')"></div>
+ </div>
</div>
</div>
diff --git a/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.js b/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.js
index 025efc3..a4d03c2 100644
--- a/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.js
+++ b/uiref/src/main/resources/app/view/uiRefCustom/uiRefCustom.js
@@ -33,9 +33,9 @@
angular.module('ovUiRefCustom', [])
.controller('OvUiRefCustomCtrl',
- ['$log', '$scope', 'WebSocketService', 'KeyService',
+ ['$log', '$scope', 'WebSocketService', 'KeyService', 'NavService',
- function (_$log_, _$scope_, _wss_, _ks_) {
+ function (_$log_, _$scope_, _wss_, _ks_, ns) {
$log = _$log_;
$scope = _$scope_;
wss = _wss_;
@@ -50,9 +50,13 @@
addKeyBindings();
- // custom click handler
+ // custom click handler for button
$scope.getData = getData;
+ // custom click handler for icon
+ // pass straight through to nav service navTo()
+ $scope.nav = ns.navTo;
+
// get data the first time...
getData();