diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/project/Gemfile | 2 | ||||
| -rw-r--r-- | templates/project/assets/stylesheets/application.scss | 1 | ||||
| -rw-r--r-- | templates/project/dashboards/sample.erb | 4 | ||||
| -rw-r--r-- | templates/project/jobs/twitter.rb | 4 | ||||
| -rw-r--r-- | templates/project/widgets/graph/graph.coffee | 1 | ||||
| -rw-r--r-- | templates/project/widgets/graph/graph.html | 2 | ||||
| -rw-r--r-- | templates/project/widgets/meter/meter.html | 2 |
7 files changed, 9 insertions, 7 deletions
diff --git a/templates/project/Gemfile b/templates/project/Gemfile index 3c7e7a9..1235b37 100644 --- a/templates/project/Gemfile +++ b/templates/project/Gemfile @@ -3,4 +3,4 @@ source 'https://rubygems.org' gem 'dashing' ## Remove this if you don't need a twitter widget. -gem 'twitter', '>= 5.0.0'
\ No newline at end of file +gem 'twitter', '>= 5.9.0'
\ No newline at end of file diff --git a/templates/project/assets/stylesheets/application.scss b/templates/project/assets/stylesheets/application.scss index fb1ba5d..451f03e 100644 --- a/templates/project/assets/stylesheets/application.scss +++ b/templates/project/assets/stylesheets/application.scss @@ -117,6 +117,7 @@ h3 { } .icon-background { + pointer-events: none; width: 100%!important; height: 100%; position: absolute; 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/jobs/twitter.rb b/templates/project/jobs/twitter.rb index 26228bc..7b2bd6f 100644 --- a/templates/project/jobs/twitter.rb +++ b/templates/project/jobs/twitter.rb @@ -6,8 +6,8 @@ require 'twitter' twitter = Twitter::REST::Client.new do |config| config.consumer_key = 'YOUR_CONSUMER_KEY' config.consumer_secret = 'YOUR_CONSUMER_SECRET' - config.oauth_token = 'YOUR_OAUTH_TOKEN' - config.oauth_token_secret = 'YOUR_OAUTH_SECRET' + config.access_token = 'YOUR_OAUTH_TOKEN' + config.access_token_secret = 'YOUR_OAUTH_SECRET' end search_term = URI::encode('#todayilearned') diff --git a/templates/project/widgets/graph/graph.coffee b/templates/project/widgets/graph/graph.coffee index 28ce88e..5d6b9ab 100644 --- a/templates/project/widgets/graph/graph.coffee +++ b/templates/project/widgets/graph/graph.coffee @@ -22,6 +22,7 @@ class Dashing.Graph extends Dashing.Widget data: [{x:0, y:0}] } ] + padding: {top: 0.02, left: 0.02, right: 0.02, bottom: 0.02} ) @graph.series[0].data = @get('points') if @get('points') diff --git a/templates/project/widgets/graph/graph.html b/templates/project/widgets/graph/graph.html index 456dd0f..786bbb7 100644 --- a/templates/project/widgets/graph/graph.html +++ b/templates/project/widgets/graph/graph.html @@ -1,5 +1,5 @@ <h1 class="title" data-bind="title"></h1> -<h2 class="value" data-bind="current | prettyNumber | prepend prefix"></h2> +<h2 class="value" data-bind="current | prettyNumber | prepend prefix | append suffix"></h2> <p class="more-info" data-bind="moreinfo"></p> 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> |