alfred.tmproj app/controllers/utility_controller.rb app/helpers/utility_helper.rb app/views/utility/hostname.html.erb test/functional/utility_controller_test.rb @@ -6,7 +6,7 @@ class ApplicationController < ActionController::Base # See ActionController::RequestForgeryProtection for details # Uncomment the :secret if you're not using the cookie session store - protect_from_forgery # :secret => '6c6c680c98f511d759c8e616ed56f6d4' + # protect_from_forgery # :secret => '6c6c680c98f511d759c8e616ed56f6d4' before_filter :get_system app/controllers/application.rb @@ -1,8 +1,4 @@ class DashboardController < ApplicationController - - def index - - end def extended @projects = Project.find(:all) app/controllers/dashboard_controller.rb @@ -1,5 +1,11 @@ class SettingsController < ApplicationController def index + if request.post? + if @system.update_attributes(params[:system]) + redirect_to :controller => 'dashboard' + end + end end + end app/controllers/settings_controller.rb @@ -1,2 +1,6 @@ class System < ActiveRecord::Base + + validates_numericality_of :port, :poll_interval + validates_presence_of :local_hostname, :remote_hostname, :port, :poll_interval + end app/models/system.rb @@ -14,7 +14,7 @@ <tbody> <% @projects.each_with_index do |project,index| %> <tr class="<%= cssify project.state.name %>"> - <td class="name"><%= project.name %></td> + <td class="name"><h2><%= project.name %></h2></td> <td><a href="http://<%= @system.local_hostname %>:<%= project.port %>" target="_blank">http://<%= @system.local_hostname %>:<%= project.port %></a></td> <td><a href="http://<%= @system.remote_hostname %>:<%= project.port %>" target="_blank">http://<%= @system.remote_hostname %>:<%= project.port %></a></td> <td><%= project.rails_root %></td> @@ -23,50 +23,6 @@ <td class="button"><input type="button" value="Stop" /></td> </tr> <% end %> - -  </tbody> + </table> \ No newline at end of file app/views/dashboard/compact.html.erb @@ -4,9 +4,9 @@ <div class="row"> <% end %> - <div id="project_1" class="project <%= cssify(project.state.name) %>"> + <div id="project_<%= project.id %>" class="project <%= cssify(project.state.name) %>"> <h2><%= h project.name %> <span>(<a href="#" onclick="project_blocks.toggle_description(<%= project.id %>); return false;">more</a>)</span></h2> - <p id="project_1_description" style="display:none;"><%= h project.description %></p> + <p id="project_<%= project.id %>_description" style="display:none;"><%= h project.description %></p> <div class="stats"> <table cellspacing="0" class="stats"> <tr> app/views/dashboard/extended.html.erb @@ -1,6 +1,29 @@ +<h1>Settings</h1> + +<%= error_messages_for 'system' %> + <% form_for :system do |form| %> - <label for="system_local_hostname">Local Hostname</label> - <%= form.text_field :local_hostname %> - <label for="system_remote_hostname">Remote Hostname</label> - <%= form.text_field :remote_hostname %> + <div class="input"> + <label for="system_local_hostname">Local Hostname</label> + <%= form.text_field :local_hostname %> + <span>The local URL to access your apps (usually 'localhost' or '127.0.0.1'</span> + </div> + <div class="input"> + <label for="system_remote_hostname">Remote Hostname</label> + <%= form.text_field :remote_hostname %> + <span>The remote URL to access your apps. This is the URL others will need to see your apps (I can get <a href="#" onclick="settings_blocks.get_hostname('system_remote_hostname'); return false;">this server's hostname</a>, if you'd like)</span> + </div> + <div class="input"> + <label for="system_port">Alfred's Port</label> + <%= form.text_field :port %> + <span>The port that I'm running on (so I don't try and give it to any other apps)</span> + </div> + <div class="input"> + <label for="system_remote_hostname">Polling Interval</label> + <%= form.text_field :poll_interval %> + <span>How often I should ask apps about their status (in seconds)</span> + </div> + <div id="save"> + <%= submit_tag 'Save Settings' %> or <%= link_to 'Cancel', :controller => 'dashboard' %> + </div> <% end %> \ No newline at end of file app/views/settings/index.html.erb @@ -38,7 +38,7 @@ Rails::Initializer.run do |config| # no regular words or you'll be exposed to dictionary attacks. config.action_controller.session = { :session_key => '_alfred_session', - :secret => 'b5e2c43826e5755a61ba31002df5da3127eb95f2f112c8bd47763893c5b29638a4fce7e08a2be5c29482aec5b5934b96b3c3ffc089b07f600f241c0140e83ff6' + :secret => 'b5e2c43826e5755a61ba3123894723792ad986986d2c8bd47763893c5b29638a4fce7e08a2be5c29482aec5b5934b96b3c3ffc089b07f600f241c0140e83ff6' } # Use the database for sessions instead of the cookie-based default, config/environment.rb db/development.sqlite3 @@ -6,6 +6,7 @@ class CreateSystems < ActiveRecord::Migration t.string :local_hostname t.string :remote_hostname t.integer :port + t.integer :poll_interval t.timestamps end db/migrate/005_create_systems.rb @@ -1,6 +1,7 @@ trainer: id: 1 - name: Trainer Search/Checkout2 + name: Trainer Search/Checkout + description: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. rails_root: /var/www/trainer port: 3000 server_id: 2 @@ -10,6 +11,7 @@ trainer: myactive: id: 2 name: MyActive 2.0 + description: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. rails_root: /var/www/myactive port: 3001 server_id: 2 @@ -19,6 +21,7 @@ myactive: classifieds: id: 3 name: Active Classifieds + description: Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. rails_root: /var/www/active_classified port: 3002 server_id: 2 db/migrate/default_data/projects.yml @@ -2,4 +2,5 @@ default: id: 1 local_hostname: localhost remote_hostname: 172.16.19.225 - port: 3100 \ No newline at end of file + port: 3100 + poll_interval: 600 \ No newline at end of file db/migrate/default_data/systems.yml @@ -12,44 +12,45 @@ ActiveRecord::Schema.define(:version => 5) do create_table "environments", :force => true do |t| - t.string "name", :default => "NULL" - t.string "short_name", :default => "NULL" - t.string "description", :default => "NULL" - t.string "command", :default => "NULL" - t.string "log", :default => "NULL" + t.string "name" + t.string "short_name" + t.string "description" + t.string "command" + t.string "log" end create_table "projects", :force => true do |t| - t.string "name", :default => "NULL" - t.string "description", :default => "NULL" - t.string "local_url", :default => "NULL" - t.string "remote_url", :default => "NULL" - t.string "rails_root", :default => "NULL" - t.integer "port", :default => 0 - t.integer "server_id", :default => 0 - t.integer "state_id", :default => 0 - t.integer "environment_id", :default => 0 + t.string "name" + t.string "description" + t.string "local_url" + t.string "remote_url" + t.string "rails_root" + t.integer "port" + t.integer "server_id" + t.integer "state_id" + t.integer "environment_id" t.datetime "last_started_at" t.datetime "created_at" t.datetime "updated_at" end create_table "servers", :force => true do |t| - t.string "name", :default => "NULL" - t.string "command", :default => "NULL" + t.string "name" + t.string "command" end create_table "states", :force => true do |t| - t.string "name", :default => "NULL" - t.string "description", :default => "NULL" - t.string "color_1", :default => "NULL" - t.string "color_2", :default => "NULL" + t.string "name" + t.string "description" + t.string "color_1" + t.string "color_2" end create_table "systems", :force => true do |t| - t.string "local_hostname", :default => "NULL" - t.string "remote_hostname", :default => "NULL" - t.integer "port", :default => 0 + t.string "local_hostname" + t.string "remote_hostname" + t.integer "port" + t.integer "poll_interval" t.datetime "created_at" t.datetime "updated_at" end db/schema.rb @@ -21,4 +21,20 @@ var project_blocks = { return $('project_'+id); } +} + +var settings_blocks = { + + // get the server's hostname + get_hostname:function(obj) { + new Ajax.Request( '/utility/hostname', + { asynchronous:true, + onSuccess:function(response) { + $(obj).value = response.responseText + }, + onFailure:function(response) { + $(obj).value = 'unknown' + } + }); + } } \ No newline at end of file public/javascripts/alfred.js @@ -15,6 +15,7 @@ margin: 0 0 .5em; padding: 0; font-size: 120%; + font-weight: normal; } .project h2 span { @@ -25,6 +26,8 @@ .project p { font-size: 80%; + margin: 0 0 1em; + line-height: 1.2; } .project .stats { @@ -81,31 +84,22 @@ table#summary { table#summary th { text-align: left; + padding: 3px; + font-size: 90%; } table#summary td { border-bottom: 1px solid #ffffff; padding: 4px; + font-size: 85%; } - table#summary td.name { - font-weight: bold; - } - - table#summary tr.running td.name { - color: #009900; - } - - table#summary tr.stopped td.name { - color: #666666; + table#summary h2 { + font-size: 120%; } - table#summary tr.starting td.name { - color: #ffcc99; - } - - table#summary tr.error td.name { - color: #990000; + table#summary td.name { + font-weight: bold; } table#summary td.button { @@ -118,15 +112,31 @@ table#summary { .running { background-color: #e0ffb3; } + + .running h2 { + color: #009900; + } .starting { background-color: #ffffcc; } + + .starting h2 { + color: #ffcc99; + } .stopped { background-color: #eeeeee; } + + .stopped h2 { + color: #666666; + } .error { background-color: #ffdcda; + } + + .error h2 { + color: #990000; } \ No newline at end of file public/stylesheets/dashboard.css @@ -5,6 +5,10 @@ body { margin: 10px; } +h1, h2, h3, h4, h5, h6 { + font-family: Georgia, Times New Roman, serif; +} + a { color: #416ab5; } @@ -14,6 +18,10 @@ a:hover { text-decoration: none; } +th { + border-bottom: 3px double #cccccc; + } + #header { width: 970px; margin: 0 auto; @@ -74,4 +82,40 @@ ul#tabs { overflow: auto; background-color: #ffffff; clear: both; -} \ No newline at end of file +} + +#save { + border-top: 2px dotted #cccccc; + margin: 1em 0 0; + padding: 1em 0 0; + text-align: center; + font-size: 90%; + clear: both; +} + +#errorExplanation { + margin: 1em; + padding: 1em; + background-color: #990000; + color: #ffffff; + font-size: 90%; +} + + #errorExplanation h2 { + margin: 0 0 1em 0; + font-size: 120%; + text-align: center; + } + + #errorExplanation ul { + list-style-type: square; + padding: 1em 1em 0; + } + +/* +<div class="errorExplanation" id="errorExplanation"> + <h2>1 error prohibited this system from being saved</h2> + <p>There were problems with the following fields:</p> + <ul><li>Port is not a number</li></ul> +</div> +*/ \ No newline at end of file public/stylesheets/main.css @@ -0,0 +1,53 @@ +h1 { + margin: .5em; + padding: 0; + font-size: 200%; + font-weight: normal; + color: #336699; + text-align: center; +} + +form { + margin: 0 1em 0; + overflow: auto; +} + +form div.input { + overflow: hidden; + margin: .2em 0; + background-color: #eeeeee; + padding: 1em; +} + +label { + display: block; + float: left; + width: 10em; + text-align: right; + margin: .35em .2em 0; + font-weight: bold; +} + +input[type="text"] { + display: block; + float: left; + font-size: 110%; + width: 12em; + margin: 0 1em 0 .2em; +} + +span { + display: block; + padding: 0; + font-size: 80%; + color: #999999; + line-height: 1.2; +} + +input[type="submit"] { + +} + +#save { + margin: 10em 0 0; +} \ No newline at end of file public/stylesheets/settings.css app/views/dashboard/index.html.erb app/views/layouts/dashboard.html.erb f0e56e6cd38f321eaf4f181a7e0160f98738f7bb Rob Cameron cannikinn@gmail.com http://github.com/cannikin/alfred/commit/69f791768efc6886fc10ca3a0c69dccd5d924b47 69f791768efc6886fc10ca3a0c69dccd5d924b47

2008-03-19T22:49:21-07:00

Fleshed out Settings page, dynamically getting hostname 4d03d815d37ae182bdd47cf1adb8048ae1ed2f64 Rob Cameron cannikinn@gmail.com