Skip to content

Commit

Permalink
Added close button to auxiliary panels
Browse files Browse the repository at this point in the history
  • Loading branch information
j0hnds@gmail.com committed Sep 11, 2010
1 parent 6e1a312 commit 0bff1d4
Show file tree
Hide file tree
Showing 20 changed files with 48 additions and 19 deletions.
2 changes: 1 addition & 1 deletion app/views/buyers/edit.html.erb
@@ -1,5 +1,5 @@
<!-- Do a form for modifying buyers -->
<% form_for @buyer, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @buyer, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do |f| %>
<% @buyer_form = f %>
<h2>Modify Buyer</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/buyers/new.html.erb
@@ -1,5 +1,5 @@
<!-- Do a form for creating buyers -->
<% form_for @buyer, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @buyer, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do |f| %>
<% @buyer_form = f %>
<h2>Add Buyer</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/buyers/show.html.erb
@@ -1,4 +1,4 @@
<% form_for @buyer, :html => { :method => :delete, :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @buyer, :html => { :method => :delete, :class => 'auxiliary ajaxed' } do |f| %>
<p><strong>Delete buyer: <%= format_name(@buyer) -%>?</strong></p>
<% field_set_tag nil, :class => 'button_wrapper' do %>
<%= f.submit 'Delete', :class => 'button' -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/coordinators/edit.html.erb
@@ -1,5 +1,5 @@
<!-- Do a form for modifying coordinators -->
<% form_for @coordinator, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @coordinator, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @coordinator_form = f %>
<h2>Modify Coordinator</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/coordinators/new.html.erb
@@ -1,5 +1,5 @@
<!-- Do a form for creating coordinators -->
<% form_for @coordinator, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @coordinator, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @coordinator_form = f %>
<h2>Add Coordinator</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/coordinators/show.html.erb
@@ -1,4 +1,4 @@
<% form_for @coordinator, :html => { :method => :delete, :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @coordinator, :html => { :method => :delete, :class => 'auxiliary ajaxed' } do |f| %>
<p><strong>Delete exhibitor: <%= format_name(@coordinator) -%>?</strong></p>
<% field_set_tag nil, :class => "button_wrapper" do %>
<%= f.submit 'Delete', :class => "button" -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/exhibitors/edit.html.erb
@@ -1,4 +1,4 @@
<% form_for @exhibitor, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @exhibitor, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @exhibitor_form = f %>
<h2>Modify Exhibitor</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/exhibitors/new.html.erb
@@ -1,4 +1,4 @@
<% form_for @exhibitor, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @exhibitor, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @exhibitor_form = f %>
<h2>Add Exhibitor</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/exhibitors/show.html.erb
@@ -1,4 +1,4 @@
<% form_for @exhibitor, :html => { :method => :delete, :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @exhibitor, :html => { :method => :delete, :class => 'auxiliary ajaxed' } do |f| %>
<p><strong>Delete exhibitor: <%= format_name(@exhibitor) -%>?</strong></p>
<% field_set_tag nil, :class => "button_wrapper" do %>
<%= f.submit 'Delete', :class => "button" -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shows/edit.html.erb
@@ -1,5 +1,5 @@
<!-- Do a form for creating shows -->
<% form_for @show, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @show, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @show_form = f %>
<h2>Modify Show</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shows/new.html.erb
@@ -1,5 +1,5 @@
<!-- Do a form for creating shows -->
<% form_for @show, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @show, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @show_form = f %>
<h2>Add Show</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/shows/show.html.erb
@@ -1,4 +1,4 @@
<% form_for @show, :html => { :method => :delete, :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @show, :html => { :method => :delete, :class => 'auxiliary ajaxed' } do |f| %>
<p><strong>Delete show <%= @show.description -%>?</strong></p>
<% field_set_tag nil, :class => "button_wrapper" do %>
<%= f.submit 'Delete', :class => "button" -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/stores/edit.html.erb
@@ -1,4 +1,4 @@
<% form_for @store, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @store, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @store_form = f %>
<h2>Modify Store</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/stores/new.html.erb
@@ -1,4 +1,4 @@
<% form_for @store, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @store, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @store_form = f %>
<h2>Add Store</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/stores/show.html.erb
@@ -1,4 +1,4 @@
<% form_for @store, :html => { :method => :delete, :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @store, :html => { :method => :delete, :class => 'auxiliary ajaxed' } do |f| %>
<p><strong>Delete store: <%= "#{@store.name}, #{@store.address_1}, #{@store.city}" -%>?</strong></p>
<% field_set_tag nil, :class => "button_wrapper" do %>
<%= f.submit 'Delete', :class => "button" -%>
Expand Down
2 changes: 1 addition & 1 deletion app/views/venues/edit.html.erb
@@ -1,4 +1,4 @@
<% form_for @venue, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @venue, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @venue_form = f %>
<h2>Modify Venue</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/venues/new.html.erb
@@ -1,4 +1,4 @@
<% form_for @venue, :html => { :id => 'add_record', :class => 'auxilliary ajaxed' } do | f | %>
<% form_for @venue, :html => { :id => 'add_record', :class => 'auxiliary ajaxed' } do | f | %>
<% @venue_form = f %>
<h2>Add Venue</h2>
<% field_set_tag do %>
Expand Down
2 changes: 1 addition & 1 deletion app/views/venues/show.html.erb
@@ -1,4 +1,4 @@
<% form_for @venue, :html => { :method => :delete, :class => 'auxilliary ajaxed' } do |f| %>
<% form_for @venue, :html => { :method => :delete, :class => 'auxiliary ajaxed' } do |f| %>
<p><strong>Delete venue <%= @venue.name -%>?</strong></p>
<% field_set_tag nil, :class => "button_wrapper" do %>
<%= f.submit 'Delete', :class => "button" -%>
Expand Down
Binary file added public/images/clear.gif
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
31 changes: 30 additions & 1 deletion public/javascripts/application.js
Expand Up @@ -42,7 +42,36 @@ $(function(){
$(this).removeClass('even').addClass('odd')
});

// Set up tooltips
// Add close button to auxiliary panels
$('.auxiliary').livequery(function(){
$('<img/>')
.attr({
src : '/images/clear.gif',
title : 'close',
alt : 'close',
id : 'close_panel'
})
.addClass('closeButton')
.css('display','none')
.appendTo(this)
.delay(1000)
.pulse()
.click(function(){
$(this).fadeOut('fast',function(){
$(this).parent().fadeOut('fast',function(){
$(this).parent().css('display','none').empty();
});
});
if($('.message').size()){
$('#module_messages')
.fadeOut('fast',function(){
$(this).empty();
});
}
});
});

// Set up tooltips
$('.tip').livequery(function(){
if($(this).size()){
// Load required resources
Expand Down

0 comments on commit 0bff1d4

Please sign in to comment.