Project

General

Profile

« Previous | Next » 

Revision 9d060de2

Added by Amos Benari almost 12 years ago

  • ID 9d060de2bdc6864ac6b5cc2c0a5820c6b518bba1

fixed dropdown location for action button and bookmark.

View differences:

app/helpers/application_helper.rb
end
def action_buttons(*args)
content_tag(:div, :class => "btn-toolbar btn-toolbar-condensed") do
toolbar_action_buttons args
end
end
def toolbar_action_buttons(*args)
# the no-buttons code is needed for users with less permissions
return unless args
args = args.flatten.map{|arg| arg unless arg.blank?}.compact
......
#multiple buttons
primary = args.delete_at(0)
content_tag(:div,:class => "btn-group") do
primary + link_to(content_tag(:span, '', :class=>'caret'),'#', :class=>'btn dropdown-toggle', :'data-toggle'=>'dropdown') +
content_tag(:ul,:class=>"dropdown-menu") do
app/helpers/puppetclasses_and_environments_helper.rb
def import_proxy_select hash
proxies = Environment.find_import_proxies
action_buttons(
toolbar_action_buttons(
proxies.map do |proxy|
display_link_if_authorized("Import from #{proxy.name}", hash.merge(:proxy => proxy))
end.flatten
app/views/common/_searchbar.erb
<%= form_tag eval("#{controller_name}_path"), :method => "get", :class=>"form-inline form-search row-fluid" do %>
<div class="btn-group">
<div class="span8">
<div class="btn-toolbar btn-toolbar-condensed">
<div class="btn-group span12">
<div class="span9">
<%= auto_complete_search(:search, params[:search].try(:squeeze," "),
{:placeholder => "Filter ..."},
{ :delay => 100, :min_length => -1 }).html_safe %>
</div>
<button class="btn btn-small" onclick="$('.form-search').submit()"><%= icon_text("search", "Search") %></button>
<button class="btn btn-small hidden-tablet" onclick="$('.form-search').submit()"><%= icon_text("search", "Search") %></button>
<button class="btn btn-small visible-tablet" onclick="$('.form-search').submit()"><%= icon_text("search", "") %></button>
<button class="btn dropdown-toggle" data-toggle="dropdown">
<span class="caret"></span>
</button>
......
{:id => "bookmark", :"data-url"=> new_bookmark_path(:kontroller => controller_name)}%></li>
</ul>
</div>
</div>
<% end -%>
<div id="bookmarks-modal" class="modal hide fade">
public/stylesheets/style.css
.override-param{
text-decoration: line-through;
}
.btn-toolbar-condensed{margin: 0;}

Also available in: Unified diff