From cdd8ff258582f5eba7e3941a5a18007e7aabbbfa Mon Sep 17 00:00:00 2001 From: Daniel Beauchamp Date: Thu, 2 Aug 2012 13:38:19 -0400 Subject: Better generators, sample widgets, and more! --- templates/project/widgets/number/number.coffee | 29 +++++++++++++++++++++ templates/project/widgets/number/number.html | 9 +++++++ templates/project/widgets/number/number.scss | 35 ++++++++++++++++++++++++++ 3 files changed, 73 insertions(+) create mode 100644 templates/project/widgets/number/number.coffee create mode 100644 templates/project/widgets/number/number.html create mode 100644 templates/project/widgets/number/number.scss (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee new file mode 100644 index 0000000..aa7cf8b --- /dev/null +++ b/templates/project/widgets/number/number.coffee @@ -0,0 +1,29 @@ +class AllTheThings.Number extends AllTheThings.Widget + source: 'number' + + @accessor 'current', Batman.Property.EasingSetter + + ready: -> + + @accessor 'difference', -> + if @get('last') + last = parseInt(@get('last')) + current = parseInt(@get('current')) + if last != 0 + diff = Math.abs(Math.round((current - last) / last * 100)) + "#{diff}%" + + @accessor 'arrow', -> + if @get('last') + if parseInt(@get('current')) > parseInt(@get('last')) then 'icon-arrow-up' else 'icon-arrow-down' + + @accessor 'statusStyle', -> + "status-#{@get('status')}" + + @accessor 'needsAttention', -> + @get('status') == 'warning' || @get('status') == 'danger' + + onData: (data) -> + super + if data.status + $(@get('node')).addClass("status-#{data.status}") \ No newline at end of file diff --git a/templates/project/widgets/number/number.html b/templates/project/widgets/number/number.html new file mode 100644 index 0000000..6e9a03e --- /dev/null +++ b/templates/project/widgets/number/number.html @@ -0,0 +1,9 @@ +

+ +

+ +

+ 50% +

+ +

2012-07-26 10:59AM

\ No newline at end of file diff --git a/templates/project/widgets/number/number.scss b/templates/project/widgets/number/number.scss new file mode 100644 index 0000000..6ae7f95 --- /dev/null +++ b/templates/project/widgets/number/number.scss @@ -0,0 +1,35 @@ +// ---------------------------------------------------------------------------- +// Sass declarations +// ---------------------------------------------------------------------------- +$widget-number_background-color: #00b1a4; +$widget-number_value-color: #fff; + +$widget-number_title-color: lighten($widget-number_background-color, 45%); +$widget-number_moreinfo-color: lighten($widget-number_background-color, 45%); + +// ---------------------------------------------------------------------------- +// Widget-number styles +// ---------------------------------------------------------------------------- +.widget-number { + + background-color: $widget-number_background-color; + + .title { + color: $widget-number_title-color; + } + + .value { + color: $widget-number_value-color; + } + + .change-rate { + font-weight: 300; + font-size: 30px; + color: $widget-number_value-color; + } + + .text-moreinfo { + color: $widget-number_moreinfo-color; + } + +} \ No newline at end of file -- cgit v1.2.3 From 780fe49f715c2fced88e958b02541bf8e7dca934 Mon Sep 17 00:00:00 2001 From: Daniel Beauchamp Date: Wed, 8 Aug 2012 18:02:56 -0400 Subject: Rename project to 'Dashing', and do some other cleanups --- templates/project/widgets/number/number.coffee | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index aa7cf8b..cb8376e 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -1,9 +1,5 @@ -class AllTheThings.Number extends AllTheThings.Widget - source: 'number' - - @accessor 'current', Batman.Property.EasingSetter - - ready: -> +class Dashing.Number extends Dashing.Widget + @accessor 'current', Dashing.AnimatedValue @accessor 'difference', -> if @get('last') -- cgit v1.2.3 From 54c6a04b722663b518bf99b4d98a1c2e86ee5103 Mon Sep 17 00:00:00 2001 From: Daniel Beauchamp Date: Tue, 14 Aug 2012 05:23:57 -0400 Subject: Updated the sample project. --- templates/project/widgets/number/number.scss | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.scss b/templates/project/widgets/number/number.scss index 6ae7f95..d134561 100644 --- a/templates/project/widgets/number/number.scss +++ b/templates/project/widgets/number/number.scss @@ -1,35 +1,35 @@ // ---------------------------------------------------------------------------- // Sass declarations // ---------------------------------------------------------------------------- -$widget-number_background-color: #00b1a4; -$widget-number_value-color: #fff; +$background-color: #00b1a4; +$value-color: #fff; -$widget-number_title-color: lighten($widget-number_background-color, 45%); -$widget-number_moreinfo-color: lighten($widget-number_background-color, 45%); +$title-color: lighten($background-color, 75%); +$moreinfo-color: lighten($background-color, 45%); // ---------------------------------------------------------------------------- // Widget-number styles // ---------------------------------------------------------------------------- .widget-number { - background-color: $widget-number_background-color; + background-color: $background-color; .title { - color: $widget-number_title-color; + color: $title-color; } .value { - color: $widget-number_value-color; + color: $value-color; } .change-rate { font-weight: 300; font-size: 30px; - color: $widget-number_value-color; + color: $value-color; } .text-moreinfo { - color: $widget-number_moreinfo-color; + color: $moreinfo-color; } } \ No newline at end of file -- cgit v1.2.3 From b585121df5976a514c06981de73c611b8a3157d3 Mon Sep 17 00:00:00 2001 From: Daniel Beauchamp Date: Fri, 24 Aug 2012 17:58:16 -0400 Subject: Remove some lingering calls to 'super' from widgets. --- templates/project/widgets/number/number.coffee | 1 - 1 file changed, 1 deletion(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index cb8376e..78e7523 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -20,6 +20,5 @@ class Dashing.Number extends Dashing.Widget @get('status') == 'warning' || @get('status') == 'danger' onData: (data) -> - super if data.status $(@get('node')).addClass("status-#{data.status}") \ No newline at end of file -- cgit v1.2.3 From a4a4564f760bb1bcd541366186cd46488d5a569b Mon Sep 17 00:00:00 2001 From: Daniel Beauchamp Date: Tue, 30 Oct 2012 05:16:35 -0400 Subject: Added new widgets, and made them more flexible. Ready for 0.1.3! --- templates/project/widgets/number/number.coffee | 8 ++------ templates/project/widgets/number/number.html | 10 ++++++---- templates/project/widgets/number/number.scss | 14 +++++++++----- 3 files changed, 17 insertions(+), 15 deletions(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index 78e7523..46cd6c2 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -8,17 +8,13 @@ class Dashing.Number extends Dashing.Widget if last != 0 diff = Math.abs(Math.round((current - last) / last * 100)) "#{diff}%" + else + "" @accessor 'arrow', -> if @get('last') if parseInt(@get('current')) > parseInt(@get('last')) then 'icon-arrow-up' else 'icon-arrow-down' - @accessor 'statusStyle', -> - "status-#{@get('status')}" - - @accessor 'needsAttention', -> - @get('status') == 'warning' || @get('status') == 'danger' - onData: (data) -> if data.status $(@get('node')).addClass("status-#{data.status}") \ No newline at end of file diff --git a/templates/project/widgets/number/number.html b/templates/project/widgets/number/number.html index 6e9a03e..d7eeab9 100644 --- a/templates/project/widgets/number/number.html +++ b/templates/project/widgets/number/number.html @@ -1,9 +1,11 @@ -

+

-

+

- 50% +

-

2012-07-26 10:59AM

\ No newline at end of file +

+ +

diff --git a/templates/project/widgets/number/number.scss b/templates/project/widgets/number/number.scss index d134561..608624b 100644 --- a/templates/project/widgets/number/number.scss +++ b/templates/project/widgets/number/number.scss @@ -1,11 +1,11 @@ // ---------------------------------------------------------------------------- // Sass declarations // ---------------------------------------------------------------------------- -$background-color: #00b1a4; +$background-color: #47bbb3; $value-color: #fff; -$title-color: lighten($background-color, 75%); -$moreinfo-color: lighten($background-color, 45%); +$title-color: rgba(255, 255, 255, 0.7);; +$moreinfo-color: rgba(255, 255, 255, 0.7);; // ---------------------------------------------------------------------------- // Widget-number styles @@ -23,13 +23,17 @@ $moreinfo-color: lighten($background-color, 45%); } .change-rate { - font-weight: 300; + font-weight: 500; font-size: 30px; color: $value-color; } - .text-moreinfo { + .more-info { color: $moreinfo-color; } + + .updated-at { + color: rgba(0, 0, 0, 0.3); + } } \ No newline at end of file -- cgit v1.2.3 From 5934a2729d93d24e67016dc4dd101c689378ae33 Mon Sep 17 00:00:00 2001 From: Ayrton De Craene Date: Fri, 16 Nov 2012 11:18:06 +0100 Subject: Removes whitespace :scissors: --- templates/project/widgets/number/number.coffee | 2 +- templates/project/widgets/number/number.html | 2 +- templates/project/widgets/number/number.scss | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index 46cd6c2..c288dd7 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -17,4 +17,4 @@ class Dashing.Number extends Dashing.Widget onData: (data) -> if data.status - $(@get('node')).addClass("status-#{data.status}") \ No newline at end of file + $(@get('node')).addClass("status-#{data.status}") diff --git a/templates/project/widgets/number/number.html b/templates/project/widgets/number/number.html index d7eeab9..45e601b 100644 --- a/templates/project/widgets/number/number.html +++ b/templates/project/widgets/number/number.html @@ -2,7 +2,7 @@

-

+

diff --git a/templates/project/widgets/number/number.scss b/templates/project/widgets/number/number.scss index 608624b..292f8cc 100644 --- a/templates/project/widgets/number/number.scss +++ b/templates/project/widgets/number/number.scss @@ -10,11 +10,11 @@ $moreinfo-color: rgba(255, 255, 255, 0.7);; // ---------------------------------------------------------------------------- // Widget-number styles // ---------------------------------------------------------------------------- -.widget-number { +.widget-number { background-color: $background-color; - - .title { + + .title { color: $title-color; } @@ -35,5 +35,5 @@ $moreinfo-color: rgba(255, 255, 255, 0.7);; .updated-at { color: rgba(0, 0, 0, 0.3); } - -} \ No newline at end of file + +} -- cgit v1.2.3 From baccda3dfc9d16493becea6261eb65459d860e68 Mon Sep 17 00:00:00 2001 From: David Underwood Date: Wed, 12 Dec 2012 10:04:26 -0500 Subject: Correctly removes old status classes on the number widget when updating the status --- templates/project/widgets/number/number.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index c288dd7..3ada5a6 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -17,4 +17,4 @@ class Dashing.Number extends Dashing.Widget onData: (data) -> if data.status - $(@get('node')).addClass("status-#{data.status}") + $(@get('node')).removeClass("status-danger status-warning").addClass("status-#{data.status}") -- cgit v1.2.3 From 264ce7e1b3ccdb5a900842c66831bd999b03090d Mon Sep 17 00:00:00 2001 From: David Underwood Date: Sat, 29 Dec 2012 20:06:17 +0000 Subject: Makes the status class removal more flexible as suggested by @crcastle --- templates/project/widgets/number/number.coffee | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index 3ada5a6..645ee7f 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -17,4 +17,8 @@ class Dashing.Number extends Dashing.Widget onData: (data) -> if data.status - $(@get('node')).removeClass("status-danger status-warning").addClass("status-#{data.status}") + # clear existing "status-*" classes + $(@get('node')).attr 'class', (i,c) -> + c.replace /\bstatus-\S+/g, '' + # add new class + $(@get('node')).addClass "status-#{data.status}" -- cgit v1.2.3 From 4937c2a2ea6768d6b1df80288c0963a3c1bb66b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Per=20Sandstr=C3=B6m?= Date: Thu, 28 Mar 2013 16:44:56 +0100 Subject: Remove unnecessary semicolons --- templates/project/widgets/number/number.scss | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.scss b/templates/project/widgets/number/number.scss index 292f8cc..8875794 100644 --- a/templates/project/widgets/number/number.scss +++ b/templates/project/widgets/number/number.scss @@ -4,8 +4,8 @@ $background-color: #47bbb3; $value-color: #fff; -$title-color: rgba(255, 255, 255, 0.7);; -$moreinfo-color: rgba(255, 255, 255, 0.7);; +$title-color: rgba(255, 255, 255, 0.7); +$moreinfo-color: rgba(255, 255, 255, 0.7); // ---------------------------------------------------------------------------- // Widget-number styles -- cgit v1.2.3 From a1b14ec184f48285d5fa2bef4d2bb426b2bd2c58 Mon Sep 17 00:00:00 2001 From: Joel Friedlaender Date: Mon, 29 Apr 2013 15:24:42 +1000 Subject: Added suffix option for number widget Added an option to append a suffix to the number in the number widget. Done in the same was as prepend. Useful for things like percentage (eg. 10%). --- templates/project/widgets/number/number.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.html b/templates/project/widgets/number/number.html index 45e601b..795a469 100644 --- a/templates/project/widgets/number/number.html +++ b/templates/project/widgets/number/number.html @@ -1,6 +1,6 @@

-

+

-- cgit v1.2.3 From 9f93895bd40aad02e88f7ed7bfd954c930aa27db Mon Sep 17 00:00:00 2001 From: pushmatrix Date: Tue, 20 Aug 2013 15:35:10 +0200 Subject: Strip html by default in widgets. Users can disable this with the 'raw' filter. Closes #176 --- templates/project/widgets/number/number.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.html b/templates/project/widgets/number/number.html index 795a469..c82e5f4 100644 --- a/templates/project/widgets/number/number.html +++ b/templates/project/widgets/number/number.html @@ -6,6 +6,6 @@

-

+

-- cgit v1.2.3 From 1b1e390974f08a6dfd1bdae39a29175a2c480e08 Mon Sep 17 00:00:00 2001 From: Jonathan Batchelor Date: Mon, 22 Feb 2016 17:04:19 +0000 Subject: Updated to use FontAwesome 4.5.0 --- templates/project/widgets/number/number.coffee | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'templates/project/widgets/number') diff --git a/templates/project/widgets/number/number.coffee b/templates/project/widgets/number/number.coffee index 645ee7f..0e5950c 100644 --- a/templates/project/widgets/number/number.coffee +++ b/templates/project/widgets/number/number.coffee @@ -13,7 +13,7 @@ class Dashing.Number extends Dashing.Widget @accessor 'arrow', -> if @get('last') - if parseInt(@get('current')) > parseInt(@get('last')) then 'icon-arrow-up' else 'icon-arrow-down' + if parseInt(@get('current')) > parseInt(@get('last')) then 'fa fa-arrow-up' else 'fa fa-arrow-down' onData: (data) -> if data.status -- cgit v1.2.3