From 6f097d8293eb69106c2c35f42ad18b8fdcf95d14 Mon Sep 17 00:00:00 2001
From: mr-deamon <christian.lehmann@swisstxt.ch>
Date: Wed, 12 Mar 2014 08:42:05 +0100
Subject: Making meter-widget adjustable

---
 templates/project/dashboards/sample.erb    | 4 ++--
 templates/project/widgets/meter/meter.html | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

(limited to 'templates')

diff --git a/templates/project/dashboards/sample.erb b/templates/project/dashboards/sample.erb
index d41d538..8269b7e 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"></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..d2b8c22 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" data-bind-data-min="min" data-bind-data-max="max">
 
 <p class="more-info" data-bind="moreinfo"></p>
 
-- 
cgit v1.2.3


From 76a645b75b0f8173a5e5c7c1e16ea9633ca11e40 Mon Sep 17 00:00:00 2001
From: mr-deamon <christian.lehmann@swisstxt.ch>
Date: Wed, 12 Mar 2014 10:13:15 +0100
Subject: Adding Suffix and Prefix to Meter-Widget

---
 templates/project/dashboards/sample.erb    | 2 +-
 templates/project/widgets/meter/meter.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'templates')

diff --git a/templates/project/dashboards/sample.erb b/templates/project/dashboards/sample.erb
index 8269b7e..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-height="200" data-width="200" 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">
diff --git a/templates/project/widgets/meter/meter.html b/templates/project/widgets/meter/meter.html
index d2b8c22..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-bind-data-height="height | default 200" data-bind-data-width="width | default 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>
 
-- 
cgit v1.2.3