From c1ebb9c87c5150bb4a060d32d16fa4358e63945f Mon Sep 17 00:00:00 2001 From: Ghislaine Guerin Date: Sat, 5 Apr 2014 13:58:27 -0400 Subject: [PATCH 1/2] add content for dashboard --- app/views/pages/welcome.html.erb | 92 +++++++++++++++++++++++++++++++- 1 file changed, 90 insertions(+), 2 deletions(-) diff --git a/app/views/pages/welcome.html.erb b/app/views/pages/welcome.html.erb index 117c698b4..a69d23b11 100755 --- a/app/views/pages/welcome.html.erb +++ b/app/views/pages/welcome.html.erb @@ -1,2 +1,90 @@ -

Hello, world!

-

The time is now <%= Time.now %>

\ No newline at end of file + + +
+
+

Farmbot

+ + +
+
+ Genesis Tracks +
+
    +
  • Model: Genesis Tracks
    • +
  • Lenght
    • +
  • Width
    • +
  • Height
    • +
  • Installation Date
    • +
+
+
+
+ Genesis Gantry +
+ +
+
+
+ Richmond Cross-Slide +
+ +
+
+
+ Custom Tool Mount +
+ +
+
+
+ + +

Tools

+

Sensors

+
+
+

Resource Usage

+
+
+ +
+ +
+

System Information

+

Manual Control

+
+ +
+

Finances

+
+ +
+ From 40700a3406deba496e578bb82e88c5d814f4e3fe Mon Sep 17 00:00:00 2001 From: rick carlino Date: Sun, 6 Apr 2014 11:38:05 -0700 Subject: [PATCH 2/2] Merged in Ghislaines work --- .gitignore | 2 +- log/development.log | 121 ++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 122 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 560d1a6a3..fc56d6d4b 100755 --- a/.gitignore +++ b/.gitignore @@ -11,7 +11,7 @@ spec/reports test/tmp test/version_tmp tmp - +log/ # YARD artifacts .yardoc _yardoc diff --git a/log/development.log b/log/development.log index 3cef91b24..0ef538755 100755 --- a/log/development.log +++ b/log/development.log @@ -89,3 +89,124 @@ Started GET "/assets/turbolinks.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-03-31 06:28:36 -0700 + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:10 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (3.6ms) +Completed 200 OK in 572ms (Views: 549.7ms) + + +Started GET "/assets/application.css?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation_and_overrides.css?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/vendor/modernizr.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/jquery.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/jquery_ujs.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.abide.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.accordion.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.clearing.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.interchange.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.dropdown.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.alert.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.joyride.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.orbit.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.magellan.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.offcanvas.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.tab.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.reveal.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.tooltip.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.topbar.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation/foundation.equalizer.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/foundation.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/turbolinks.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/assets/application.js?body=1" for 127.0.0.1 at 2014-04-06 11:34:11 -0700 + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:17 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (0.4ms) +Completed 200 OK in 10ms (Views: 9.2ms) + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:18 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (0.0ms) +Completed 200 OK in 9ms (Views: 8.4ms) + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:21 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (0.1ms) +Completed 200 OK in 11ms (Views: 10.0ms) + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:35 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (0.0ms) +Completed 200 OK in 9ms (Views: 8.7ms) + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:34:41 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (0.1ms) +Completed 200 OK in 14ms (Views: 13.0ms) + + +Started GET "/" for 127.0.0.1 at 2014-04-06 11:35:04 -0700 +Processing by HighVoltage::PagesController#show as HTML + Parameters: {"id"=>"welcome"} + Rendered pages/welcome.html.erb within layouts/application (0.0ms) +Completed 200 OK in 9ms (Views: 8.5ms)