Skip to content

Commit

Permalink
General cleanup of our icons, as we were having issues with them in c…
Browse files Browse the repository at this point in the history
…hrome
  • Loading branch information
baphled committed Aug 4, 2010
1 parent 4668857 commit 267be05
Show file tree
Hide file tree
Showing 6 changed files with 29 additions and 29 deletions.
12 changes: 6 additions & 6 deletions app/views/common/_icons.html.erb
@@ -1,25 +1,25 @@
<span class="icons ui-widget ui-widget-content ui-corner-all">
<ul class="icons">
<li title="View" class="ui-state-default ui-corner-all">
<%= link_to "<span class='ui-icon ui-icon-note' />", {:controller => model.class.to_s.downcase.pluralize, :id => model, :action => 'show'}, {:title => 'View'} %>
<%= link_to "<span class='ui-icon ui-icon-note' />", {:controller => model.class.to_s.downcase.pluralize, :id => model, :action => 'show'} %>
</li>
<li title="Edit" class="ui-state-default ui-corner-all">
<%= link_to "<span class='ui-icon-pencil ui-icon' />",
{:controller => model.class.to_s.downcase.pluralize, :id => model, :action => 'edit'}, {:title => 'Edit', :id=>"edit_#{model.class.to_s.downcase}_#{model.id}"} %>
{:controller => model.class.to_s.downcase.pluralize, :id => model, :action => 'edit'}, {:id=>"edit_#{model.class.to_s.downcase}_#{model.id}"} %>
</li>
<% if assoc.nil? == false && model.public_methods.include?("#{assoc.to_s.singularize}_ids") && model.send("#{assoc.to_s.singularize}_ids").empty? == false %>
<li title="<%= assoc.pluralize.capitalize %>" class="ui-state-default ui-corner-all">
<%= link_to "<span class='ui-icon ui-icon-zoomin' />",
{:controller => model.class.to_s.downcase.pluralize, :id => model.id, :action => assoc.pluralize }, {:title => "#{assoc.pluralize.capitalize}"} %>
{:controller => model.class.to_s.downcase.pluralize, :id => model.id, :action => assoc.pluralize } %>
</li>
<% end %>
<li title="Delete" class="ui-state-default ui-corner-all">
<%= link_to "<span class='ui-icon-trash ui-icon' />", model, {:title => 'Delete', :method => :delete, :confirm => 'Are you sure?'} %>
<%= link_to "<span class='ui-icon-trash ui-icon' />", model, {:method => :delete, :confirm => 'Are you sure?'} %>
</li>
<% if not assoc.nil? %>
<li title="New <%=assoc.capitalize%>" class="ui-state-default ui-corner-all">
<li title="New <%=assoc.capitalize%>" class="ui-state-default ui-corner-all" title="New <%=assoc.capitalize %>">
<%= link_to "<span class='ui-icon-document ui-icon' />",
{:controller => assoc.pluralize, :action => :new, "#{model.class.to_s.downcase}_id".to_sym => model.id }, {:title => "New #{assoc.capitalize}"} %>
{:controller => assoc.pluralize, :action => :new, "#{model.class.to_s.downcase}_id".to_sym => model.id } %>
</li>
<% end %>
</ul>
Expand Down
24 changes: 12 additions & 12 deletions app/views/common/panels/_feature.html.erb
@@ -1,26 +1,26 @@
<span id="panel" class="icons ui-widget ui-widget-content ui-corner-all">
<ul class="icons">
<% if not feature.stories.blank? %>
<li class="ui-state-default ui-corner-all">
<%= link_to "Export", export_feature_path(feature), {:title => 'Export a feature', :id => 'export-feature'} %>
<li class="ui-state-default ui-corner-all" title="Export a feature">
<%= link_to "Export", export_feature_path(feature), {:id => 'export-feature'} %>
</li>
<% end %>
<% if feature.is_diff? %>
<li class="ui-state-default ui-corner-all">
<%= link_to "Changes", changes_feature_path(feature), {:title => 'Check the difference between the systems & your applications features', :id => 'view-changes'} %>
<li class="ui-state-default ui-corner-all" title="Check the difference between the systems & your applications features">
<%= link_to "Changes", changes_feature_path(feature), {:id => 'view-changes'} %>
</li>
<li class="ui-state-default ui-corner-all">
<%= link_to "Merge", merge_feature_path(feature), {:title => 'Merge a systems changes with the feature', :id => 'merge-changes'} %>
<li class="ui-state-default ui-corner-all" title="Merge a systems changes with the feature">
<%= link_to "Merge", merge_feature_path(feature), {:id => 'merge-changes'} %>
</li>
<li class="ui-state-default ui-corner-all">
<%= link_to "Sys Merge", system_merge_feature_path(feature), {:title => 'Merge a features changes with the system', :id => 'merge-system'} %>
<li class="ui-state-default ui-corner-all" title="Merge a features changes with the system">
<%= link_to "Sys Merge", system_merge_feature_path(feature), {:id => 'merge-system'} %>
</li>
<li class="ui-state-default ui-corner-all">
<%= link_to "Patch", feature_path(feature, :format => :patch), {:title => 'Patch a feature with the systems changes', :id => 'patch-changes'} %>
<li class="ui-state-default ui-corner-all" title="Patch a feature with the systems changes">
<%= link_to "Patch", feature_path(feature, :format => :patch), {:id => 'patch-changes'} %>
</li>
<% end %>
<li class="ui-state-default ui-corner-all">
<%= link_to "Edit", edit_feature_path(feature), {:title => 'Edit the feature and it\'s stories', :id => 'edit'} %>
<li class="ui-state-default ui-corner-all" title="Edit the feature and it\'s stories">
<%= link_to "Edit", edit_feature_path(feature), {:id => 'edit'} %>
</li>
</ul>
</span>
Expand Down
12 changes: 6 additions & 6 deletions app/views/common/panels/_project.html.erb
@@ -1,16 +1,16 @@
<span id="panel" class="icons ui-widget ui-widget-content ui-corner-all">
<ul class="icons">
<% if project.location.blank? == false and project.features_to_import? %>
<li class="ui-state-default ui-corner-all">
<%= link_to "Import a feature", import_project_path(project), {:title => 'Allows you to import features singularly', :id => 'import'} %>
<li class="ui-state-default ui-corner-all" title="Allows you to import features singularly">
<%= link_to "Import a feature", import_project_path(project), { :id => 'import'} %>
</li>
<li class="ui-state-default ui-corner-all">
<%= link_to "Import all", import_all_project_path(project), {:title => 'Allows you to import all project features in one easy step', :id => 'import-all'} %>
<li class="ui-state-default ui-corner-all" title="Allows you to import all project features in one easy step">
<%= link_to "Import all", import_all_project_path(project), {:id => 'import-all'} %>
</li>
<% end %>

<li class="ui-state-default ui-corner-all">
<%= link_to "Edit", edit_project_path(project), {:title => 'Allows you to edit a projects information', :id => 'edit'} %>
<li class="ui-state-default ui-corner-all" title="Allows you to edit a projects information">
<%= link_to "Edit", edit_project_path(project), {:id => 'edit'} %>
</li>
</ul>
</span>
Expand Down
4 changes: 2 additions & 2 deletions app/views/common/panels/_step.html.erb
@@ -1,7 +1,7 @@
<span id="panel" class="icons ui-widget ui-widget-content ui-corner-all">
<ul class="icons">
<li class="ui-state-default ui-corner-all">
<%= link_to "Edit", edit_step_path(@step), {:title => 'Edit the step', :id => 'edit'} %>
<li class="ui-state-default ui-corner-all" title="Edit the step">
<%= link_to "Edit", edit_step_path(@step), {:id => 'edit'} %>
</li>
</ul>
</span>
Expand Down
4 changes: 2 additions & 2 deletions app/views/common/panels/_story.html.erb
@@ -1,7 +1,7 @@
<span id="panel" class="icons ui-widget ui-widget-content ui-corner-all">
<ul class="icons">
<li class="ui-state-default ui-corner-all">
<%= link_to "Edit", edit_story_path(story), {:title => 'Edit the story', :id => 'edit'} %>
<li class="ui-state-default ui-corner-all" title="Edit this story">
<%= link_to "Edit", edit_story_path(story), {:id => 'edit'} %>
</li>
</ul>
</span>
Expand Down
2 changes: 1 addition & 1 deletion public/javascripts/application.js
Expand Up @@ -60,7 +60,7 @@ $(document).ready(function() {
}
$('ul.icons li, button.button').button({option: 'text'});
$('span#panel, ul.items-list li > span').animateIconPanel(animateIconOpts);
$('a[title], button[title]').tipsy({fade: true});
$('li[title], button[title]').tipsy({fade: true});
}

instantiateOrderedListEvents();
Expand Down

0 comments on commit 267be05

Please sign in to comment.