Permalink
Browse files

Update dashboard layout

  • Loading branch information...
1 parent 92c2a8e commit 6e54a96ff631ba653c3094f4c3a49c81f6746d57 @kshep committed May 4, 2011
View
@@ -1,4 +1,3 @@
class Graph < ActiveRecord::Base
belongs_to :user
- has_many :curves
end
@@ -1,12 +1,13 @@
+ <div id="control">
+ Control
+ </div>
<div id="tree">
<%= raw(list) %>
</div>
<div id="graph_wrapper">
<div id="graph"></div>
</div>
- <div id="control">
- Control
- </div>
+
<script type="text/javascript">
@@ -35,7 +36,6 @@
var options = {
xaxis: { mode: "time", timeformat: "%m/%d %h:%M" },
- selection: { mode: "x" }
};
var data = [
@@ -5,6 +5,11 @@
<%= csrf_meta_tag %>
<%= render 'layouts/stylesheets' %>
<%= javascript_include_tag :defaults %>
+ <%= javascript_include_tag 'jquery' %>
+ <%= javascript_include_tag 'jquery-ui.custom.js' %>
+ <%= javascript_include_tag 'jquery.flot.min.js' %>
+ <%= javascript_include_tag 'jquery.dynatree.js' %>
+ <%= javascript_include_tag 'jquery-ui-timepicker-addon.js' %>
</head>
<body>
<div class="container">
View
@@ -31,7 +31,7 @@ class Application < Rails::Application
# config.i18n.default_locale = :de
# JavaScript files you want as :defaults (application.js is always included).
- config.action_view.javascript_expansions[:defaults] = %w(jquery jquery-ui.custom.js jquery.flot.min.js jquery.flot.selection.js jquery.dynatree.js rails)
+ config.action_view.javascript_expansions[:defaults] = %w(rails)
# Configure the default encoding used in templates for Ruby 1.9.
config.encoding = "utf-8"
View
@@ -12,15 +12,6 @@
ActiveRecord::Schema.define(:version => 20110504015516) do
- create_table "curves", :force => true do |t|
- t.integer "graph_id"
- t.string "label"
- t.string "color"
- t.string "symbol"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
create_table "graphs", :force => true do |t|
t.integer "user_id"
t.string "caption"
Oops, something went wrong.

0 comments on commit 6e54a96

Please sign in to comment.