RubyGems - acts_as_dashboard - Versions diffs - 0.1.0 → 0.3.0 - Mend

acts_as_dashboard 0.1.0 → 0.3.0

Files changed (30) hide show

data/lib/acts_as_dashboard/app/views/dashboards/show.html.erb CHANGED Viewed

@@ -8,11 +8,13 @@
     </style>
     <%= javascript_include_tag 'http://code.jquery.com/jquery-1.4.2.min.js' %>
+    <%= javascript_include_tag 'jquery-ui/js/jquery-ui-1.8.2.custom.min.js' %>
     <%= javascript_include_tag 'http://plugins.jquery.com/files/jquery.timers-1.2.js.txt' %>
     <%= javascript_include_tag 'js.class-2.1.4/min/core.js' %>
     <%= javascript_include_tag 'jqplot-0.9.7/jquery.jqplot.min.js' %>
     <%= javascript_include_tag 'dashboard' %>
+    <%= stylesheet_link_tag 'jquery-ui/css/ui-darkness/jquery-ui-1.8.2.custom.css' %>
     <%= stylesheet_link_tag 'dashboard' %>
     <%= stylesheet_link_tag 'jquery.jqplot.min.css' %>
@@ -33,20 +35,20 @@
   <body>
     <div id='dashboard'>
       <div class='dashboard-numbers'>
-        <div class='widget-template' style='display: none;'>
-          <div class="widget-title"></div>
-          <div class="widget-data"></div>
+        <div class='ui-widget widget-template' style='display: none;'>
+          <div class="ui-widget-header ui-corner-tl ui-corner-tr widget-title"></div>
+          <div class="ui-widget-content ui-corner-bl ui-corner-br widget-data"></div>
         </div>
       </div>
       <div class='dashboard-clear'></div>
       <div class='dashboard-short-messages'>
-        <div class='widget-template' style='display: none;'>
-          <div class="widget-title"></div>
+        <div class='ui-widget widget-template' style='display: none;'>
+          <div class="ui-widget-header ui-corner-all widget-title"></div>
           <div class="widget-data">
             <ul>
-              <li class='widget-data-template' style='display: none;'></li>
+              <li class='ui-widget-content ui-corner-all widget-data widget-data-template' style='display: none;'></li>
             </ul>
           </div>
         </div>
@@ -55,8 +57,9 @@
       <div class='dashboard-clear'></div>
       <div class='dashboard-line-graphs'>
-        <div class='widget-template' style='display: none;'>
-          <div class='widget-data'></div>
+        <div class='ui-widget widget-template' style='display: none;'>
+          <div class='ui-widget-header ui-corner-tl ui-corner-tr widget-title'></div>
+          <div class='ui-widget-content ui-corner-bl ui-corner-br widget-data'></div>
         </div>
       </div>

data/lib/acts_as_dashboard/class_methods.rb CHANGED Viewed

@@ -9,23 +9,29 @@ module ActsAsDashboard
       controller_name = self.to_s.underscore.sub('_controller', '').singularize
-      # Create the route for the "show" action. This will be something like:
-      #   /dashboard
-      ActionController::Routing::Routes.add_named_route(
-        'dashboard',
-        controller_name,
-        :controller => controller_name.pluralize.to_sym,
-        :action     => :show
-      )
-      # Create the route for the "widget_data" action. This will be something like:
-      #   /dashboard/widgets/*
-      ActionController::Routing::Routes.add_named_route(
-        "#{controller_name}_widgets",
-        "#{controller_name}/widgets/*path",
-        :controller => controller_name.pluralize.to_sym,
-        :action     => :widget_data
-      )
+#     # This is commented out because having it here doesn't actually work. I believe this
+#     # is because calls to #acts_as_dashboard within controllers aren't invoked until one
+#     # of the controller's actions is called. However, it's impossible to call one of the
+#     # actions of an acts_as_dashboard-enabled controller because there aren't any routes
+#     # yet! It's a catch-22. Argh.
+#
+#     # Create the route for the "show" action. This will be something like:
+#     #   /dashboard
+#     ActionController::Routing::Routes.add_named_route(
+#       'dashboard',
+#       controller_name,
+#       :controller => controller_name.pluralize.to_sym,
+#       :action     => :show
+#     )
+#
+#     # Create the route for the "widget_data" action. This will be something like:
+#     #   /dashboard/widgets/*
+#     ActionController::Routing::Routes.add_named_route(
+#       "#{controller_name}_widgets",
+#       "#{controller_name}/widgets/*path",
+#       :controller => controller_name.pluralize.to_sym,
+#       :action     => :widget_data
+#     )
     end
     def dashboard_number(&block)

data/lib/acts_as_dashboard/public/javascripts/dashboard.js CHANGED Viewed

@@ -293,7 +293,6 @@ var LineGraphWidget = new JS.Class(DashboardWidget, {
     }
     this.graph = jQuery.jqplot(this.dataDiv.attr('id'), [ [] ], {
-      title:        this.title,
       seriesColors: this.seriesColours,
       axes:         {
                       xaxis: x_axis_format

data/lib/acts_as_dashboard/public/stylesheets/dashboard.css CHANGED Viewed

@@ -17,16 +17,22 @@ body {
   }
     #dashboard .dashboard-numbers .number-widget {
       float:      left;
-      padding:    0.5em;
       margin:     1em;
       text-align: center;
     }
       #dashboard .dashboard-numbers .number-widget .widget-title {
-        font-weight:  bold;
-        font-size:    1em;
+        padding:        0.25em;
+        border-top:     1px solid #666666;
+        border-bottom:  none;
+        border-left:    1px solid #666666;
+        border-right:   1px solid #666666;
       }
       #dashboard .dashboard-numbers .number-widget .widget-data {
-        font-size:    4em;
+        font-size:      4em;
+        border-top:     none;
+        border-bottom:  1px solid #666666;
+        border-left:    1px solid #666666;
+        border-right:   1px solid #666666;
       }
   /* dashboard-short-message is not complete */
@@ -37,7 +43,6 @@ body {
       margin: 1em;
     }
       #dashboard .dashboard-short-messages .short-messages-widget .widget-title {
-        border:       2px solid white;
         padding:      0.5em;
         text-align:   center;
         font-weight:  bold;
@@ -51,9 +56,8 @@ body {
           padding:  0;
         }
           #dashboard .dashboard-short-messages .short-messages-widget .widget-data li {
-            border:           1px solid white;
             margin-top:       4px;
-            padding:          0.5em;
+            padding:          0.25em;
             list-style-type:  none;
             font-size:        0.8em;
           }
@@ -64,3 +68,19 @@ body {
       float:  left;
       margin: 1em;
     }
+      #dashboard .dashboard-line-graphs .line-graph-widget .widget-title {
+        text-align: center;
+        border-top:     1px solid #666666;
+        border-bottom:  none;
+        border-left:    1px solid #666666;
+        border-right:   1px solid #666666;
+      }
+      #dashboard .dashboard-line-graphs .line-graph-widget .widget-data {
+        xborder:         none;
+        border-top:     none;
+        border-bottom:  1px solid #666666;
+        border-left:    1px solid #666666;
+        border-right:   1px solid #666666;
+        padding-right:  1.5em;
+      }

metadata CHANGED Viewed

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments:
   - 0
-  - 1
+  - 3
   - 0
-  version: 0.1.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Nick Hoffman
@@ -45,7 +45,7 @@ dependencies:
         version: 1.3.2
   type: :development
   version_requirements: *id002
-description: ActsAsDashboard makes it easy to create dashboards in Rails apps. Very little configuration is required. Read the docs to get started.
+description: acts_as_dashboard makes it easy to create dashboards in Rails apps. Very little configuration is required. Read the docs to get started.
 email: nick@deadorange.com
 executables: []
@@ -55,7 +55,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files:
-- .document
 - .gitignore
 - LICENSE
 - README.rdoc
@@ -101,6 +100,24 @@ files:
 - generators/dashboard/templates/jqplot-0.9.7/plugins/jqplot.pointLabels.min.js
 - generators/dashboard/templates/jqplot-0.9.7/plugins/jqplot.trendline.js
 - generators/dashboard/templates/jqplot-0.9.7/plugins/jqplot.trendline.min.js
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-anim_basic_16x16.gif
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_flat_30_cccccc_40x100.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_flat_50_5c5c5c_40x100.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_glass_20_555555_1x400.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_glass_40_0078a3_1x400.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_glass_40_ffc73d_1x400.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_gloss-wave_25_333333_500x100.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_highlight-soft_80_eeeeee_1x100.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_inset-soft_25_000000_1x100.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-bg_inset-soft_30_f58400_1x100.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-icons_222222_256x240.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-icons_4b8e0b_256x240.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-icons_a83300_256x240.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-icons_cccccc_256x240.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/images/ui-icons_ffffff_256x240.png
+- generators/dashboard/templates/jquery-ui/css/ui-darkness/jquery-ui-1.8.2.custom.css
+- generators/dashboard/templates/jquery-ui/js/jquery-1.4.2.min.js
+- generators/dashboard/templates/jquery-ui/js/jquery-ui-1.8.2.custom.min.js
 - generators/dashboard/templates/jquery.jqplot.min.css
 - generators/dashboard/templates/js.class-2.1.4/CHANGELOG
 - generators/dashboard/templates/js.class-2.1.4/MIT-LICENSE

data/.document DELETED Viewed

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE