summaryrefslogtreecommitdiff
path: root/templates
diff options
context:
space:
mode:
authorDaniel Beauchamp <daniel.beauchamp@gmail.com>2015-06-08 10:58:22 -0400
committerDaniel Beauchamp <daniel.beauchamp@gmail.com>2015-06-08 10:58:22 -0400
commit56162f61948fe86f5933dd4ebca0f8865e905b30 (patch)
tree980824ac9f3040eb88dd6fc353216b8c5baa0018 /templates
parent1582eb981d529580c2cc632dfe2dbb9a57f67e3a (diff)
parent76a645b75b0f8173a5e5c7c1e16ea9633ca11e40 (diff)
Merge pull request #333 from mr-deamon/meter-suffix-prefix
Meter suffix prefix
Diffstat (limited to 'templates')
-rw-r--r--templates/project/dashboards/sample.erb4
-rw-r--r--templates/project/widgets/meter/meter.html2
2 files changed, 3 insertions, 3 deletions
diff --git a/templates/project/dashboards/sample.erb b/templates/project/dashboards/sample.erb
index d41d538..08c3b51 100644
--- a/templates/project/dashboards/sample.erb
+++ b/templates/project/dashboards/sample.erb
@@ -6,7 +6,7 @@
</li>
<li data-row="1" data-col="1" data-sizex="1" data-sizey="1">
- <div data-id="synergy" data-view="Meter" data-title="Synergy" data-min="0" data-max="100"></div>
+ <div data-id="synergy" data-view="Meter" data-title="Synergy" data-height="200" data-width="200" data-min="0" data-max="100" data-suffix="%"></div>
</li>
<li data-row="1" data-col="1" data-sizex="1" data-sizey="2">
@@ -22,4 +22,4 @@
</li>
</ul>
<center><div style="font-size: 12px">Try this: curl -d '{ "auth_token": "YOUR_AUTH_TOKEN", "text": "Hey, Look what I can do!" }' \http://<%=request.host%>:<%=request.port%>/widgets/welcome</div></center>
-</div> \ No newline at end of file
+</div>
diff --git a/templates/project/widgets/meter/meter.html b/templates/project/widgets/meter/meter.html
index 16f1f06..72592fb 100644
--- a/templates/project/widgets/meter/meter.html
+++ b/templates/project/widgets/meter/meter.html
@@ -1,6 +1,6 @@
<h1 class="title" data-bind="title"></h1>
-<input class="meter" data-angleOffset=-125 data-angleArc=250 data-width=200 data-readOnly=true data-bind-value="value | shortenedNumber" data-bind-data-min="min" data-bind-data-max="max">
+<input class="meter" data-angleOffset=-125 data-angleArc=250 data-bind-data-height="height | default 200" data-bind-data-width="width | default 200" data-readOnly=true data-bind-value="value | shortenedNumber | prepend prefix | append suffix" data-bind-data-min="min" data-bind-data-max="max">
<p class="more-info" data-bind="moreinfo"></p>