app/controllers/setup_controller.rb
app/views/assets/_row.html.erb
app/views/assets/create.rjs
app/views/assets/destroy.rjs
app/views/common/_button_function.html.erb
app/views/common/_button_link.html.erb
app/views/common/_button_submit.html.erb
app/views/kinds/_row.html.erb
app/views/kinds/create.rjs
app/views/kinds/destroy.rjs
app/views/locations/_row.html.erb
app/views/locations/create.rjs
app/views/locations/destroy.rjs
app/views/manufacturers/_row.html.erb
app/views/manufacturers/create.rjs
app/views/manufacturers/destroy.rjs
app/views/models/_row.html.erb
app/views/models/create.rjs
app/views/models/destroy.rjs
app/views/setup/needed.html.erb
app/views/users/_row.html.erb
app/views/users/create.rjs
app/views/users/destroy.rjs
public/images/button_grey.png
public/images/content_bottom.png
public/images/content_middle.png
public/images/content_top.png
public/images/icons/arrow_up.png
public/images/icons/bin.png
public/images/icons/bin_closed.png
public/images/icons/bin_empty.png
public/images/icons/book_add.png
public/images/icons/book_delete.png
public/images/icons/book_edit.png
public/images/icons/book_go.png
public/images/icons/disk.png
public/images/icons/folder_add.png
public/images/icons/page_add.png
public/images/icons/page_attach.png
public/images/icons/page_delete.png
public/images/icons/page_white_delete.png
public/images/icons/page_white_picture.png
public/images/icons/picture_add.png
public/images/nothing.png
@@ -1,10 +1,21 @@
class AssetsController < ApplicationController
+ before_filter :setup_check, :only => [:index]
+
+ def setup_check
+ # TODO Horrible bad way to do this for performance reasons... :()
+ if (User.count == 0 || Manufacturer.count == 0 || Model.count == 0 || Location.count == 0 || Kind.count == 0)
+ redirect_to :controller => :setup, :action => :needed
+ end
+ end
+
+
# GET /assets
# GET /assets.xml
def index
@assets = Asset.find(:all, :include => [:user, {:model => [:manufacturer, :kind]}])
-
+ @asset = Asset.new
+
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @assets }
@@ -49,13 +60,16 @@ class AssetsController < ApplicationController
Notifications.deliver_assigned(@asset)
format.html { redirect_to(assets_path) }
format.xml { render :xml => @asset, :status => :created, :location => @asset }
+ format.js
else
- format.html { render :action => "new" }
+ format.html { render :action => :index }
format.xml { render :xml => @asset.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
+
# PUT /assets/1
# PUT /assets/1.xml
def update
@@ -67,9 +81,11 @@ class AssetsController < ApplicationController
Notifications.deliver_assigned(@asset)
format.html { redirect_to(assets_path) }
format.xml { head :ok }
+ format.js
else
format.html { render :action => "edit" }
format.xml { render :xml => @asset.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -77,13 +93,15 @@ class AssetsController < ApplicationController
# DELETE /assets/1
# DELETE /assets/1.xml
def destroy
- @asset = Asset.find(params[:id])
+ @id = params[:id]
+ @asset = Asset.find(@id)
@asset.destroy
- Notifications.deliver_unassigned(@asset)
+ # Notifications.deliver_unassigned(@asset)
respond_to do |format|
format.html { redirect_to(assets_url) }
format.xml { head :ok }
+ format.js
end
end
app/controllers/assets_controller.rb
@@ -2,8 +2,8 @@ class KindsController < ApplicationController
# GET /kinds
# GET /kinds.xml
def index
- @kinds = Kind.find(:all)
-
+ @kinds = Kind.find(:all, :include => [:models => :assets])
+ @kind = Kind.new
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @kinds }
@@ -47,9 +47,11 @@ class KindsController < ApplicationController
flash[:notice] = 'Kind was successfully created.'
format.html { redirect_to(kinds_path) }
format.xml { render :xml => @kind, :status => :created, :location => @kind }
+ format.js
else
format.html { render :action => "new" }
format.xml { render :xml => @kind.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -64,9 +66,11 @@ class KindsController < ApplicationController
flash[:notice] = 'Kind was successfully updated.'
format.html { redirect_to(kinds_path) }
format.xml { head :ok }
+ format.js
else
format.html { render :action => "edit" }
format.xml { render :xml => @kind.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -80,6 +84,7 @@ class KindsController < ApplicationController
respond_to do |format|
format.html { redirect_to(kinds_url) }
format.xml { head :ok }
+ format.js
end
end
end
app/controllers/kinds_controller.rb
@@ -3,7 +3,7 @@ class LocationsController < ApplicationController
# GET /locations.xml
def index
@locations = Location.find(:all)
-
+ @location = Location.new
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @locations }
@@ -47,9 +47,11 @@ class LocationsController < ApplicationController
flash[:notice] = 'Location was successfully created.'
format.html { redirect_to(locations_path) }
format.xml { render :xml => @location, :status => :created, :location => @location }
+ format.js
else
format.html { render :action => "new" }
format.xml { render :xml => @location.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -64,9 +66,11 @@ class LocationsController < ApplicationController
flash[:notice] = 'Location was successfully updated.'
format.html { redirect_to(locations_path) }
format.xml { head :ok }
+ format.js
else
format.html { render :action => "edit" }
format.xml { render :xml => @location.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -80,6 +84,7 @@ class LocationsController < ApplicationController
respond_to do |format|
format.html { redirect_to(locations_url) }
format.xml { head :ok }
+ format.js
end
end
end
app/controllers/locations_controller.rb
@@ -3,7 +3,7 @@ class ManufacturersController < ApplicationController
# GET /manufacturers.xml
def index
@manufacturers = Manufacturer.find(:all)
-
+ @manufacturer = Manufacturer.new
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @manufacturers }
@@ -47,9 +47,11 @@ class ManufacturersController < ApplicationController
flash[:notice] = 'Manufacturer was successfully created.'
format.html { redirect_to(manufacturers_path) }
format.xml { render :xml => @manufacturer, :status => :created, :location => @manufacturer }
+ format.js
else
format.html { render :action => "new" }
format.xml { render :xml => @manufacturer.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -64,9 +66,11 @@ class ManufacturersController < ApplicationController
flash[:notice] = 'Manufacturer was successfully updated.'
format.html { redirect_to(manufacturers_path) }
format.xml { head :ok }
+ format.js
else
format.html { render :action => "edit" }
format.xml { render :xml => @manufacturer.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -80,6 +84,7 @@ class ManufacturersController < ApplicationController
respond_to do |format|
format.html { redirect_to(manufacturers_url) }
format.xml { head :ok }
+ format.js
end
end
end
app/controllers/manufacturers_controller.rb
@@ -1,9 +1,21 @@
class ModelsController < ApplicationController
+
+
+ before_filter :setup_check, :only => [:index]
+
+ def setup_check
+ # TODO Horrible bad way to do this for performance reasons... :(
+ if (Manufacturer.count == 0)
+ redirect_to :controller => :setup, :action => :needed
+ end
+ end
+
+
# GET /models
# GET /models.xml
def index
@models = Model.find(:all)
-
+ @model = Model.new
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @models }
@@ -47,9 +59,11 @@ class ModelsController < ApplicationController
flash[:notice] = 'Model was successfully created.'
format.html { redirect_to(models_path) }
format.xml { render :xml => @model, :status => :created, :location => @model }
+ format.js
else
format.html { render :action => "new" }
format.xml { render :xml => @model.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -64,9 +78,11 @@ class ModelsController < ApplicationController
flash[:notice] = 'Model was successfully updated.'
format.html { redirect_to(models_path) }
format.xml { head :ok }
+ format.js
else
format.html { render :action => "edit" }
format.xml { render :xml => @model.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -80,6 +96,7 @@ class ModelsController < ApplicationController
respond_to do |format|
format.html { redirect_to(models_url) }
format.xml { head :ok }
+ format.js
end
end
end
app/controllers/models_controller.rb
@@ -3,7 +3,7 @@ class UsersController < ApplicationController
# GET /users.xml
def index
@users = User.find(:all)
-
+ @user = User.new
respond_to do |format|
format.html # index.html.erb
format.xml { render :xml => @users }
@@ -47,9 +47,11 @@ class UsersController < ApplicationController
flash[:notice] = 'User was successfully created.'
format.html { redirect_to(users_path) }
format.xml { render :xml => @user, :status => :created, :location => @user }
+ format.js
else
format.html { render :action => "new" }
format.xml { render :xml => @user.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -64,9 +66,11 @@ class UsersController < ApplicationController
flash[:notice] = 'User was successfully updated.'
format.html { redirect_to(users_path) }
format.xml { head :ok }
+ format.js
else
format.html { render :action => "edit" }
format.xml { render :xml => @user.errors, :status => :unprocessable_entity }
+ format.js
end
end
end
@@ -80,6 +84,7 @@ class UsersController < ApplicationController
respond_to do |format|
format.html { redirect_to(users_url) }
format.xml { head :ok }
+ format.js
end
end
end
app/controllers/users_controller.rb
@@ -1,3 +1,27 @@
-# Methods added to this helper will be available to all templates in the application.
module ApplicationHelper
+
+ def button_link_to(path, options = {})
+ options = {:text => 'New', :image => 'icons/add.png', :css => ""}.merge(options)
+ render :partial => 'common/button_link', :locals => {:path => path, :image => options[:image], :text => options[:text], :css => options[:class]}
+ end
+
+
+ def button_function(options = {})
+ options = {:container => 'button_function_container', :id => 'button_function_link', :text_hidden => 'Show', :text_shown => 'Hide', :image => 'icons/add.png', :css => ""}.merge(options)
+ render :partial => 'common/button_function', :locals => {
+ :image => options[:image],
+ :id => options[:id],
+ :container => options[:container],
+ :text_shown => options[:text_hidden],
+ :text_hidden => options[:text_shown],
+ :css => options[:class]}
+ end
+
+
+ def button_submit(options = {})
+ options = {:text => 'Save', :image => 'icons/disk.png', :css => ""}.merge(options)
+ render :partial => 'common/button_submit', :locals => {:image => options[:image], :text => options[:text], :css => options[:class]}
+ end
+
+
end
app/helpers/application_helper.rb
app/views/.DS_Store
@@ -1,6 +1,6 @@
<div>
- <label>User</label>
+ <label>Person</label>
<%= select :asset, :user_id, User.find(:all).collect {|n| [ "#{h(n.login)} <#{h(n.email)}>", n.id ] }.sort %>
<%= link_to image_tag('/images/icons/add.png'), new_user_path %>
<%= error_message_on :asset, :user_id %>
app/views/assets/_fields.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing asset</h1>
+<h1><%= @title = 'Edit asset.' %></h1>
<% form_for(@asset) do |f| %>
<%= f.error_messages %>
@@ -6,6 +6,9 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Update" %>
+ <%= button_submit %>
</p>
<% end %>
+
+
+<%= link_to '[all assets]', assets_path %>
\ No newline at end of file
app/views/assets/edit.html.erb
@@ -1,40 +1,45 @@
+<%= button_function :container => 'new_asset_container', :text_shown => 'Add', :text_hidden => "Add", :class => 'new_button' %>
+
+
<div class="explanation">
- An "asset" is a single piece of property put into someones care, such as a MacBook (model) assigned to Suzie (user) in Phoenix (location). If you know the serial numbers of each instance, you should track them as well.
+ <h1><%= @title = 'Assets.'%></h1>
+ <p>An "asset" is a single piece of property put into someone's care, such as a MacBook (model) assigned to Suzie (person) at Headquarters (location). If you know the serial numbers of each instance, you should track them as well to avoid confusion.</p>
+</div>
+
+
+<div id="new_asset_container" style="display:none">
+ <div>
+ <% remote_form_for @asset do |f| %>
+ <%= render :partial => 'assets/fields', :locals => {:f => f}%>
+ <%= button_submit %>
+ <% end %>
+ </div>
</div>
-<h1><%= @title = 'Assets'%></h1>
-<%= link_to image_tag('/images/icons/add.png'), new_asset_path %>
+
+<h2>Everything being tracked.</h2>
<table>
<thead>
- <tr>
- <td>User</td>
- <td>Manufacturer</td>
- <td>Model</td>
- <td>Kind</td>
- <td>Location</td>
- <td>Serial</td>
- <td>Notes</td>
- <td>Actions</td>
- </tr>
+ <tr>
+ <td>Person</td>
+ <td>Manufacturer</td>
+ <td>Model</td>
+ <td>Type</td>
+ <td>Location</td>
+ <td>Serial</td>
+ <td>Notes</td>
+ <td>Actions</td>
+ </tr>
</thead>
- <tbody>
-
+ <tbody id="assets">
<% for asset in @assets %>
- <tr>
- <td><%= link_to h(asset.user.login), asset.user %></td>
- <td><%= link_to h(asset.model.manufacturer.name), asset.model.manufacturer %></td>
- <td><%= link_to h(asset.model.name), asset.model %></td>
- <td><%= link_to h(asset.model.kind.name), asset.model.kind %></td>
- <td><%= link_to h(asset.location.name), asset.location %></td>
- <td><%= link_to h(asset.serial), asset %></td>
- <td><%= h(asset.notes) %></td>
- <td><%= link_to image_tag('/images/icons/pencil.png'), edit_asset_path(asset) %>
- <%= link_to image_tag('/images/icons/delete.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
+ <%= render :partial => 'assets/row', :locals => {:asset => asset} %>
<% end %>
</tbody>
</table>
+
+<p class="count">You have <%= pluralize @assets.size, 'asset' %>.</p>
app/views/assets/index.html.erb
@@ -1,4 +1,4 @@
-<h1>New asset</h1>
+<h1><%= @title = 'Add Asset' %></h1>
<% form_for(@asset) do |f| %>
<%= f.error_messages %>
@@ -6,6 +6,6 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Create" %>
+ <%= button_submit %>
</p>
<% end %>
app/views/assets/new.html.erb
@@ -1,7 +1,7 @@
<h1><%= @title = "#{h(@asset.user.login)}'s #{h(@asset.model.manufacturer.name)} #{h(@asset.model.name)}" %></h1>
<%= link_to image_tag('/images/icons/pencil.png'), edit_asset_path(@asset) %>
-<%= link_to image_tag('/images/icons/delete.png'), @asset, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), @asset, :confirm => 'Are you sure?', :method => :delete %>
<table>
<tbody>
app/views/assets/show.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing kind</h1>
+<h1><%= @title = 'Edit ' + h(@kind.name) %></h1>
<% form_for(@kind) do |f| %>
<%= f.error_messages %>
@@ -6,8 +6,30 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<div>
- <%= f.submit "Update" %>
+ <%= button_submit %>
</div>
<% end %>
-<%= link_to '[show]', @kind %>
\ No newline at end of file
+
+<h2>All <%= h(@kind.name) %> models.</h2>
+
+<table>
+ <thead>
+ <tr>
+ <td>Manufacturer</td>
+ <td>Model</td>
+ <td>Assets</td>
+ </tr>
+ </thead>
+ <tbody>
+<% for model in @kind.models %>
+ <tr class="<%= cycle 'odd', 'even' %>">
+ <td><%= link_to h(model.manufacturer.name), model.manufacturer %></td>
+ <td><%= link_to h(model.name), model %></td>
+ <td><%= model.assets.count %></td>
+ </tr>
+ </tbody>
+<% end %>
+</table>
+
+<%= link_to '[all models]', models_path %>
\ No newline at end of file
app/views/kinds/edit.html.erb
@@ -1,32 +1,38 @@
+<%= button_function :container => 'new_kind_container', :text_shown => 'Add', :text_hidden => "Add", :class => 'new_button' %>
+
+
<div class="explanation">
- A "kind" is a type of asset such as "Laptop", "Monitor" or "Desk". When new product models are tracked, they must be of one of these types.
+ <h1><%= @title = 'Asset types.'%></h1>
+ <p> As Asset type is generally something like "Laptop", "Monitor" or "Desk", but can also represent intangibles like "License Key" or "Confidential Document".</p>
</div>
-<h1><%= @title = 'Kinds'%></h1>
-<%= link_to image_tag('/images/icons/add.png'), new_kind_path %>
+<div id="new_kind_container" style="display:none">
+ <div>
+ <% remote_form_for @kind do |f| %>
+ <%= render :partial => 'kinds/fields', :locals => {:f => f}%>
+ <%= button_submit %>
+ <% end %>
+ </div>
+</div>
+
+<h2>What types of assets do you have?</h2>
<table>
<thead>
<tr>
<td>Name</td>
<td>Models</td>
+ <td>Assets</td>
<td>Actions</td>
</tr>
</thead>
-<tbody>
+<tbody id="kinds">
<% for kind in @kinds %>
- <tr>
- <td><%= link_to h(kind.name), kind %></td>
- <td><%= kind.models.count %></td>
- <td>
-<%= link_to '[new model]', new_model_path %>
-<%= link_to image_tag('/images/icons/pencil.png'), edit_kind_path(kind) %>
- <%= link_to image_tag('/images/icons/delete.png'), kind, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
+ <%= render :partial => 'kinds/row', :locals => {:kind => kind} %>
<% end %>
</tbody>
</table>
-<br />
+<p class="count">You have <%= pluralize @kinds.size, 'asset type' %>.</p>
app/views/kinds/index.html.erb
@@ -1,4 +1,4 @@
-<h1>New kind</h1>
+<h1><%= @title = 'Add equipment type.' %></h1>
<% form_for(@kind) do |f| %>
<%= f.error_messages %>
@@ -6,7 +6,7 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Create" %>
+ <%= button_submit %>
</p>
<% end %>
app/views/kinds/new.html.erb
@@ -1,7 +1,7 @@
<h1><%= h(@kind.name) %> Models</h1>
<%= link_to image_tag('/images/icons/pencil.png'), edit_kind_path(@kind) %>
-<%= link_to image_tag('/images/icons/delete.png'), @kind, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), @kind, :confirm => 'Are you sure?', :method => :delete %>
<table>
<tr>
app/views/kinds/show.html.erb
@@ -5,33 +5,43 @@
<head>
<meta http-equiv="content-type" content="text/html;charset=UTF-8" />
<title>Asset Tracker <%= " :: #{h(@title)}" if @title %></title>
- <%= stylesheet_link_tag 'reset' %>
- <%= stylesheet_link_tag 'default' %>
+ <%= stylesheet_link_tag 'reset', 'default' %>
+ <%= javascript_include_tag :defaults %>
</head>
<body>
<div id="everything">
- <ul id="navigation">
- <li><%= link_to "Users", users_path %></li>
- <li><%= link_to "Locations", locations_path %></li>
- <li><%= link_to "Manufacturers", manufacturers_path %></li>
- <li><%= link_to "Kinds", kinds_path %></li>
- <li><%= link_to "Models", models_path %></li>
- <li><%= link_to "Assets", assets_path %></li>
- </ul>
-
- <p id="notice"><%= flash[:notice] %></p>
- <p id="error"><%= flash[:error] %></p>
+ <div id="title"><%= link_to 'Asset Tracker', '/' %></div>
+
+ <div id="content_top"> </div>
+
+ <div id="content_middle">
+
+ <ul id="navigation">
+ <li><%= link_to "Assets", assets_path %></li>
+ <li><%= link_to "People", users_path %></li>
+ <li><%= link_to "Models", models_path %></li>
+ <li><%= link_to "Locations", locations_path %></li>
+ <li><%= link_to "Manufacturers", manufacturers_path %></li>
+ <li><%= link_to "Asset Types", kinds_path %></li>
+ </ul>
+
- <div id="content">
- <%= yield %>
+
+ <div id="page">
+ <div id="notice"><%= flash[:notice] %></div>
+ <div id="error"><%= flash[:error] %></div>
+ <%= yield %>
+ </div>
+
+ <div id="footer">
+ <p>Asset Tracker © <%= Time.now.year %> <a href="http://www.openrain.com">OpenRain</a>. All rights reserved.</p>
+ <p>Record asset metadata with this application for insurance purposes and operational sanity.</p>
+ </div>
</div>
+ <div id="content_bottom"> </div>
- <div id="footer">
- <p>Asset Tracker © <%= Time.now.year %> <a href="http://www.openrain.com">OpenRain</a>. All rights reserved.</p>
- <p>Record asset metadata with this application for insurance purposes and operational sanity.</p>
- </div>
</div>
</body>
app/views/layouts/default.html.erb
@@ -1,6 +1,4 @@
-<h1>Editing location</h1>
-
-<%= link_to '[show]', @location %>
+<h1><%= @title = 'Edit ' + h(@location.name) %></h1>
<% form_for(@location) do |f| %>
<%= f.error_messages %>
@@ -8,6 +6,9 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Update" %>
+ <%= button_submit %>
</p>
<% end %>
+
+
+<%= link_to '[all locations]', locations_path %>
\ No newline at end of file
app/views/locations/edit.html.erb
@@ -1,12 +1,23 @@
+<%= button_function :container => 'new_location_container', :text_shown => 'Add', :text_hidden => "Add", :class => 'new_button' %>
+
+
<div class="explanation">
- A "location" represents a physical place, such as "Headquarters", "Server Room" or "Home". Assets get tied to a single location.
+ <h1><%= @title = 'Locations.'%></h1>
+ <p>A "location" represents a physical place, such as "Headquarters", "Server Room" or "Home". Individual assets get tied to a single location and person.</p>
</div>
-<h1><%= @title = 'Locations'%></h1>
+<div id="new_location_container" style="display:none">
+ <div>
+ <% remote_form_for @location do |f| %>
+ <%= render :partial => 'locations/fields', :locals => {:f => f}%>
+ <%= button_submit %>
+ <% end %>
+ </div>
+</div>
-<%= link_to image_tag('/images/icons/add.png'), new_location_path %>
+<h2>Everywhere assets could be.</h2>
<table>
<thead>
@@ -16,18 +27,11 @@
<td>Actions</td>
</tr>
</thead>
-<tbody>
+<tbody id="locations">
<% for location in @locations %>
- <tr>
- <td><%= link_to h(location.name), location %></td>
- <td><%= location.assets.count %></td>
- <td>
- <%= link_to '[new asset]', new_asset_path() %>
- <%= link_to image_tag('/images/icons/pencil.png'), edit_location_path(location) %>
-<%= link_to image_tag('/images/icons/delete.png'), location, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
+ <%= render :partial => 'locations/row', :locals => {:location => location} %>
<% end %>
</tbody>
</table>
-<br />
+<p class="count">You have <%= pluralize @locations.size, 'location' %>.</p>
app/views/locations/index.html.erb
@@ -1,9 +1,9 @@
-<h1>New location</h1>
+<h1><%= @title = 'Add Location' %></h1>
<% form_for(@location) do |f| %>
<%= f.error_messages %>
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Create" %>
+ <%= button_submit %>
</p>
<% end %>
app/views/locations/new.html.erb
@@ -1,7 +1,7 @@
<h1><%= h(@location.name) %></h1>
<%= link_to image_tag('/images/icons/pencil.png'), edit_location_path(@location) %>
-<%= link_to image_tag('/images/icons/delete.png'), @location, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), @location, :confirm => 'Are you sure?', :method => :delete %>
<h2>Assets</h2>
@@ -25,7 +25,7 @@
<td><%= link_to h(asset.serial), asset %></td>
<td><%= link_to h(asset.notes), asset %></td>
<td><%= link_to image_tag('/images/icons/pencil.png'), edit_asset_path(asset) %>
-<%= link_to image_tag('/images/icons/delete.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
+<%= link_to image_tag('/images/icons/bin_closed.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
</table>
\ No newline at end of file
app/views/locations/show.html.erb
@@ -1,6 +1,4 @@
-<h1>Editing manufacturer</h1>
-
-<%= link_to '[show]', @manufacturer %>
+<h1><%= @title = 'Edit ' + h(@manufacturer.name) %></h1>
<% form_for(@manufacturer) do |f| %>
<%= f.error_messages %>
@@ -9,6 +7,10 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Update" %>
+ <%= button_submit %>
</p>
<% end %>
+
+
+
+<%= link_to '[all manufacturers]', manufacturers_path %>
\ No newline at end of file
app/views/manufacturers/edit.html.erb
@@ -1,10 +1,22 @@
+<%= button_function :container => 'new_manufacturer_container', :text_shown => 'Add', :text_hidden => "Add", :class => 'new_button' %>
+
+
<div class="explanation">
- A "manufacturer" is a company which produces the assets, such as "Apple" or "Cisco".
+ <h1><%= @title = 'Manufacturers.'%></h1>
+ <p>A "manufacturer" is a company that produces equipment, such as "Apple" or "Cisco".</p>
</div>
-<h1><%= @title = 'Manufacturers'%></h1>
-<%= link_to image_tag('/images/icons/add.png'), new_manufacturer_path %>
+<div id="new_manufacturer_container" style="display:none">
+ <div>
+ <% remote_form_for @manufacturer do |f| %>
+ <%= render :partial => 'manufacturers/fields', :locals => {:f => f}%>
+ <%= button_submit %>
+ <% end %>
+ </div>
+</div>
+
+<h2>All equipment manufacturers.</h2>
<table>
<thead>
@@ -14,16 +26,11 @@
<td>Actions</td>
</tr>
</thead>
-<tbody>
+<tbody id="manufacturers">
<% for manufacturer in @manufacturers %>
- <tr>
- <td><%= link_to h(manufacturer.name), manufacturer %></td>
- <td><%= manufacturer.models.count %></td>
- <td>
-<%= link_to '[new model]', new_model_path %>
-<%= link_to image_tag('/images/icons/pencil.png'), edit_manufacturer_path(manufacturer) %>
-<%= link_to image_tag('/images/icons/delete.png'), manufacturer, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
+ <%= render :partial => 'manufacturers/row', :locals => {:manufacturer => manufacturer} %>
<% end %>
</tbody>
</table>
+
+<p class="count">You have <%= pluralize @manufacturers.size, 'manufacturer' %>.</p>
app/views/manufacturers/index.html.erb
@@ -1,4 +1,4 @@
-<h1>New manufacturer</h1>
+<h1><%= @title = 'Add Manufacturer' %></h1>
<% form_for(@manufacturer) do |f| %>
<%= f.error_messages %>
@@ -6,7 +6,7 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Create" %>
+ <%= button_submit %>
</p>
<% end %>
app/views/manufacturers/new.html.erb
@@ -1,7 +1,7 @@
<h1><%= @title = h(@manufacturer.name) %></h1>
<%= link_to image_tag('/images/icons/pencil.png'), edit_manufacturer_path(@manufacturer) %>
-<%= link_to image_tag('/images/icons/delete.png'), @manufacturer, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), @manufacturer, :confirm => 'Are you sure?', :method => :delete %>
<table>
<tbody>
@@ -38,7 +38,7 @@
<td><%= link_to h(model.name), model %></td>
<td><%= link_to h(model.kind.name), model.kind %></td>
<td><%= link_to image_tag('/images/icons/pencil.png'), edit_model_path(model) %>
-<%= link_to image_tag('/images/icons/delete.png'), model, :confirm => 'Are you sure?', :method => :delete %></td>
+<%= link_to image_tag('/images/icons/bin_closed.png'), model, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
</tbody>
app/views/manufacturers/show.html.erb
@@ -1,4 +1,8 @@
-
+<div>
+ <label>Name</label>
+ <%= f.text_field :name %>
+ <%= error_message_on :model, :name %>
+</div>
<div>
<label>Manufacturer</label>
@@ -8,14 +12,8 @@
</div>
<div>
- <label>Kind</label>
+ <label>Type</label>
<%= select :model, :kind_id, Kind.find(:all).collect {|n| [ n.name, n.id ] }.sort %>
<%= link_to image_tag('/images/icons/add.png'), new_kind_path %>
<%= error_message_on :model, :kind %>
</div>
-
-<div>
- <label>Name</label>
- <%= f.text_field :name %>
- <%= error_message_on :model, :name %>
-</div>
\ No newline at end of file
app/views/models/_fields.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing model</h1>
+<h1><%= @title = 'Edit ' + h(@model.name) %></h1>
<% form_for(@model) do |f| %>
<%= f.error_messages %>
@@ -7,9 +7,34 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Update" %>
+ <%= button_submit %>
</p>
<% end %>
-<%= link_to 'Show', @model %> |
-<%= link_to 'Back', models_path %>
+
+<h2>All known models.</h2>
+
+<table>
+ <thead>
+ <tr>
+ <td>Login</td>
+ <td>Serial</td>
+ <td>Notes</td>
+ <td>Actions</td>
+ </tr>
+ </thead>
+<tbody>
+<% for asset in @model.assets %>
+ <tr>
+ <td><%= link_to h(asset.user.login), asset.user %></td>
+ <td><%= link_to h(asset.serial), asset %></td>
+ <td><%= link_to h(asset.notes), asset %></td>
+ <td><%= link_to image_tag('/images/icons/pencil.png'), edit_asset_path(asset) %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
+ </tr>
+<% end %>
+</tbody>
+</table>
+
+
+<%= link_to '[all models]', models_path %>
\ No newline at end of file
app/views/models/edit.html.erb
@@ -1,37 +1,38 @@
+<%= button_function :container => 'new_model_container', :text_shown => 'Add', :text_hidden => "Add", :class => 'new_button' %>
+
+
<div class="explanation">
- An "model" is a specific part number for a given manufacturer. A new Dell XPS laptop, for example, would have "Dell" as the manufacturer and "XPS123" as the model name.
+ <h1><%= @title = 'Models.'%></h1>
+ <p>An "model" is a specific part number for a given manufacturer. A new Dell XPS123 laptop, for example, would have "Dell" as the manufacturer and "XPS123" as the model name.</p>
</div>
-<h1><%= @title = 'Models'%></h1>
-
-<%= link_to image_tag('/images/icons/add.png'), new_model_path %>
+<div id="new_model_container" style="display:none">
+ <div>
+ <% remote_form_for @model do |f| %>
+ <%= render :partial => 'models/fields', :locals => {:f => f}%>
+ <%= button_submit %>
+ <% end %>
+ </div>
+</div>
+<h2>All equipment models.</h2>
<table>
<thead>
<tr>
<td>Manufacturer</td>
<td>Model</td>
- <td>Kind</td>
+ <td>Type</td>
<td>Assets</td>
<td>Actions</td>
</tr>
</thead>
-<tbody>
+<tbody id="models">
<% for model in @models.sort {|a,b| a.manufacturer == b.manufacturer ? a.name <=> b.name : a.manufacturer.name <=> b.manufacturer.name} %>
- <tr>
- <td><%= link_to h(model.manufacturer.name), model.manufacturer %></td>
- <td><%= link_to h(model.name), model %></td>
- <td><%= link_to h(model.kind.name), model.kind %></td>
- <td><%= model.assets.count %></td>
- <td>
-<%= link_to '[new asset]', new_asset_path %>
-<%= link_to image_tag('/images/icons/pencil.png'), edit_model_path(model) %>
- <%= link_to image_tag('/images/icons/delete.png'), model, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
+ <%= render :partial => 'models/row', :locals => {:model => model} %>
<% end %>
</tbody>
</table>
-<br />
+<p class="count">You have <%= pluralize @models.size, 'model' %>.</p>
app/views/models/index.html.erb
@@ -1,4 +1,4 @@
-<h1>New model</h1>
+<h1><%= @title = 'Add Model' %></h1>
<% form_for(@model) do |f| %>
<%= f.error_messages %>
@@ -6,6 +6,6 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Create" %>
+ <%= button_submit %>
</p>
<% end %>
app/views/models/new.html.erb
@@ -1,7 +1,7 @@
<h1><%= @title = h(@model.name) %></h1>
<%= link_to image_tag('/images/icons/pencil.png'), edit_model_path(@model) %>
-<%= link_to image_tag('/images/icons/delete.png'), @model, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), @model, :confirm => 'Are you sure?', :method => :delete %>
<table>
<tbody>
@@ -38,7 +38,7 @@
<td><%= link_to h(asset.serial), asset %></td>
<td><%= link_to h(asset.notes), asset %></td>
<td><%= link_to image_tag('/images/icons/pencil.png'), edit_asset_path(asset) %>
-<%= link_to image_tag('/images/icons/delete.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
+<%= link_to image_tag('/images/icons/bin_closed.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
</tr>
<% end %>
</tbody>
app/views/models/show.html.erb
@@ -1,5 +1,5 @@
<div>
- <label>Login</label>
+ <label>Name</label>
<%= f.text_field :login %>
<%= error_message_on :user, :login %>
</div>
app/views/users/_fields.html.erb
@@ -1,4 +1,4 @@
-<h1>Editing user</h1>
+<h1><%= @title = h(@user.login) %></h1>
<% form_for(@user) do |f| %>
<%= f.error_messages %>
@@ -6,9 +6,26 @@
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Update" %>
+ <%= button_submit %>
</p>
<% end %>
-<%= link_to '[show]', @user %> |
-<%= link_to '[all]', users_path %>
+<h2>Assets in <%= h(@user.login) %>'s possession.</h2>
+
+<table>
+ <thead>
+ <tr>
+ <td>Manufacturer</td>
+ <td>Model</td>
+ <td>Type</td>
+ <td>Serial</td>
+ <td>Notes</td>
+ <td>Actions</td>
+ </tr>
+ </thead>
+ <tbody>
+<% for asset in @user.assets %>
+ <%= render :partial => 'assets/asset', :locals => {:asset => asset} %>
+<% end %>
+ </tbody>
+</table>
\ No newline at end of file
app/views/users/edit.html.erb
@@ -1,32 +1,40 @@
+<%= button_function :container => 'new_user_container', :text_shown => 'Add', :text_hidden => "Add", :class => 'new_button' %>
+
+
<div class="explanation">
- Users generally represent specific people to which assets are assigned, such as "Alice" or "Bob"; however, any email address and unique login will work.
+ <h1><%= @title = 'People.'%></h1>
+ <p>People are responsible for taking care of assets assigned to them. Please use a valid email address and unique name as they will be emailed when assets are assigned and unassigned to them.</p>
+</div>
+
+
+<div id="new_user_container" style="display:none">
+ <div>
+ <% remote_form_for @user do |f| %>
+ <%= render :partial => 'users/fields', :locals => {:f => f}%>
+ <%= button_submit %>
+ <% end %>
+ </div>
</div>
-<h1><%= @title = 'Users'%></h1>
-<%= link_to image_tag('/images/icons/add.png'), new_user_path %>
+<h2>Here's everyone.</h2>
<table>
<thead>
<tr>
- <td>Login</td>
+ <td>Name</td>
<td>Email</td>
<td>Assets</td>
<td>Actions</td>
</tr>
</thead>
-<tbody>
+<tbody id="users">
<% for user in @users %>
- <tr>
- <td><%= link_to h(user.login), user %></td>
- <td><%= mail_to user.email %></td>
- <td><%= user.assets.count %></td>
- <td>
- <%= link_to '[new asset]', new_asset_path() %>
- <%= link_to image_tag('/images/icons/pencil.png'), edit_user_path(user) %>
-<%= link_to image_tag('/images/icons/delete.png'), user, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
+ <%= render :partial => 'users/row', :locals => {:user => user} %>
<% end %>
</tbody>
</table>
+
+<p class="count">You have <%= pluralize @users.size, 'person' %>.</p>
+
app/views/users/index.html.erb
@@ -1,9 +1,9 @@
-<h1>New user</h1>
+<h1><%= @title = 'Add Person' %></h1>
<% form_for(@user) do |f| %>
<%= f.error_messages %>
<%= render :partial => 'fields', :locals => {:f => f} %>
<p>
- <%= f.submit "Create" %>
+ <%= button_submit %>
</p>
<% end %>
app/views/users/new.html.erb
@@ -1,35 +1,7 @@
<h1><%= h(@user.login) %></h1>
<%= link_to image_tag('/images/icons/pencil.png'), edit_user_path(@user) %>
-<%= link_to image_tag('/images/icons/delete.png'), @user, :confirm => 'Are you sure?', :method => :delete %>
+<%= link_to image_tag('/images/icons/bin_closed.png'), @user, :confirm => 'Are you sure?', :method => :delete %>
<%= h(@user.email) %>
-
-
-<h2>Assets</h2>
-
-<%= link_to image_tag('/images/icons/add.png'), new_asset_path %>
-
-<table>
- <tr>
- <td>Manufacturer</td>
- <td>Model</td>
- <td>Kind</td>
- <td>Serial</td>
- <td>Notes</td>
- <td>Actions</td>
- </tr>
-
-<% for asset in @user.assets %>
- <tr>
- <td><%= link_to h(asset.model.manufacturer.name), asset.model.manufacturer %></td>
- <td><%= link_to h(asset.model.name), asset.model %></td>
- <td><%= link_to h(asset.model.kind.name), asset.model.kind %></td>
- <td><%= link_to h(asset.serial), asset %></td>
- <td><%= link_to h(asset.notes), asset %></td>
- <td><%= link_to image_tag('/images/icons/pencil.png'), edit_asset_path(asset) %>
-<%= link_to image_tag('/images/icons/delete.png'), asset, :confirm => 'Are you sure?', :method => :delete %></td>
- </tr>
-<% end %>
-</table>
\ No newline at end of file
app/views/users/show.html.erb
@@ -1,7 +1,6 @@
ActionController::Routing::Routes.draw do |map|
- map.resources :locations
-
+ map.resources :locations
map.resources :examples
map.resources :users
map.resources :kinds
config/routes.rb
@@ -9,64 +9,6 @@
#
# It's strongly recommended to check this file into your version control system.
-ActiveRecord::Schema.define(:version => 20090113040535) do
-
- create_table "assets", :force => true do |t|
- t.integer "model_id", :null => false
- t.integer "user_id", :null => false
- t.string "serial"
- t.text "notes"
- t.datetime "created_at"
- t.datetime "updated_at"
- t.integer "location_id"
- end
-
- create_table "examples", :force => true do |t|
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "kinds", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "locations", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "manufacturers", :force => true do |t|
- t.string "name", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "models", :force => true do |t|
- t.string "name", :null => false
- t.integer "kind_id", :null => false
- t.integer "manufacturer_id", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- create_table "sessions", :force => true do |t|
- t.string "session_id", :null => false
- t.text "data"
- t.datetime "created_at"
- t.datetime "updated_at"
- end
-
- add_index "sessions", ["session_id"], :name => "index_sessions_on_session_id"
- add_index "sessions", ["updated_at"], :name => "index_sessions_on_updated_at"
-
- create_table "users", :force => true do |t|
- t.string "login", :null => false
- t.string "email", :null => false
- t.datetime "created_at"
- t.datetime "updated_at"
- end
+ActiveRecord::Schema.define(:version => 0) do
end
db/schema.rb
@@ -1,38 +1,88 @@
-body {
- font-family: Trebuchet, arial, helvetica, sans-serif;
- font-size: 13px;
- background-color: #102040;
-}
+body { font-family: Verdana, Trebuchet, arial, helvetica, sans-serif; font-size: 13px; background-color: #E8E8C8; }
+
+#title { color:#bb9;font-size:10px;font-weight:bold;margin:2px auto 0;text-align:center;}
div#everything {
- width: 1000px;
- margin: 20pt auto 0 auto;
- background-color: #ffffff;
+ width: 800px;
+ margin: 0 auto 0 auto;
+/* background-color: #ffffff;*/
}
-#notice {color: green; padding: 10px;}
-#error {color: red; padding: 10px;}
+#content_top { background: url(/images/content_top.png) no-repeat 0 0; height: 40px; margin-top: -22px;}
+#content_middle { background: url(/images/content_middle.png) repeat-y 0 0; padding:0 50px;}
+#content_bottom { background: url(/images/content_bottom.png) no-repeat 0 0; height: 35px;}
+
+#notice {color: green; }
+#error {color: red; }
+/*.explanation {border-left:1px solid #DDDDDD;color:#777777;font-style: italic;font-size: 8pt;}*/
+.explanation p {color:#777777;font-style: italic;font-size: 8pt;}
+.explanation {margin: 10px 0 20px 0;}
+
+#notice,
+#error {padding: 4px; font-size: 16pt;}
+/*.explanation {float:right;margin:0 0 0 0;padding: 0 10px;width:300px;clear:right;}*/
-.explanation {float: right; width: 300px; margin: 20px; padding: 20px; background-color: #f8ffdd; color: #aaa;}
-div#content {padding: 40px 10px;}
-div#footer {color: #808080;border-top: 1px solid #ccc; font-size: 8pt;padding: 4px;background-color: #e0e0e0;}
+.setup_check {font-size: 12pt; }
+.setup_check ol {list-style-type: decimal; margin: 20px;font-size: 12pt;}
+.setup_check li {line-height: 1.5em;}
+.setup_check strong {font-size: 26pt; font-weight: bold;}
+.setup_check em {text-decoration:underline;}
-ul#navigation {background-color: #102040;}
-ul#navigation li {display: inline; background-color: #fff; padding: 10px; font-size: 14pt;}
+.count {clear: both; color: #aaa;}
-table {margin: 20px 0;}
-table thead { font-weight: bold; margin: 4px 0; }
-table td {padding: 2px 6px;}
+div#page {margin: 10px 0;}
+div#footer {color: #bbb;border-top: 1px solid #ccc; font-size: 8pt;padding: 4px; }
+ul#navigation {border-bottom:1px solid #EEEEEE;padding-bottom:2px;}
+ul#navigation li {display: inline; padding: 10px; font-size: 12pt; font-weight: bold;}
-h1 {font-size: 18pt; margin: 16px 0 0 0;}
-h2 {font-size: 15pt; margin: 16px 0;}
+table {margin: 4px 0 20px 0; width: 100%; clear: both;}
+table thead { font-weight: bold; margin: 4px 0; color: #cca;}
+table thead tr {background-color: #222;}
+table td {padding: 6px 6px;}
+table tbody tr.odd {background-color: #eec;}
+table tbody tr.even {}
-a { color: #000; }
+
+h1 {font-size: 18pt; }
+h2 {font-size: 15pt; }
+
+a { color: #000; text-decoration: none; }
a:visited { color: #666; }
a:hover { color: #fff; background-color:#000; }
+
+/* Common button styles */
+/*a.button { float: right; }*/
+a.button > div, div.button > div
+ { background: transparent url(/images/button_grey.png) no-repeat 0 0; height:42px; width:106px; font-size: 12pt; color: #888;}
+a.button > div img, div.button > div img
+ {margin: 10px 0 0 12px; }
+a.button > div p
+ {display: inline;}
+div.button > div p
+ {display: inline; padding: 8px 0 0 0;}
+a.button > div input, div.button > div input
+ { background: transparent url(/images/nothing.png) repeat 0 0; border: none; position: inherit; padding: 0px; margin: 0px; color: #888; font-size:12pt; }
+
+.new_button {float: right; margin-right: 10px;}
+
+form {width: 450px; margin: 20px 0 20px 100px;}
+form > div { margin: 4px; }
+form label { float: left; width: 100px; text-align: right; margin: 2px 4px; clear: left; color: #555;}
+/*form input,*/
+form textarea { height: 50px; }
+form textarea,
+form input[type="text"],
+form select { font-size: 10pt; border: 1px solid #ddd; width: 300px;}
+form .button {margin-left:310px;}
+
+/*.new_asset {display: none;}*/
+
+
+
+
.fieldWithErrors {
padding: 2px;
background-color: red;
public/stylesheets/default.css
0c0b6410ad365918ef5d072abeddc440e7ff14ae
Preston Lee
preston.lee@openrain.com
http://github.com/preston/asset_tracker/commit/4f827471c15d4abf1d611dcc7cd0f0b099fe3147
4f827471c15d4abf1d611dcc7cd0f0b099fe3147
2009-09-01T01:38:22-07:00
2009-09-01T01:38:22-07:00
Major GUI overhaul.
a3454433d0668c7b9f1d2ea6be04c2976b2a1a6a
Preston Lee
preston.lee@openrain.com