app/views/kinney/search/index.html.erb in kinney-0.0.3 vs app/views/kinney/search/index.html.erb in kinney-0.1.0
- old
+ new
@@ -1,67 +1,63 @@
<% @title = t('.title') %>
-<%= content_for :header do %>
- <h1><%= t '.title' %></h1>
-<% end -%>
-
<div class="row">
- <div class="span12">
+ <div class="col-md-12">
+ <h1><%= t '.title' %></h1>
<%- if params[:q].blank? -%>
<%- else -%>
- You searched for <b><%= params[:q] %></b>.
- <%= link_to t('kinney.search.clear'), search_path , :class => :btn if defined?(@clips) %>
+ <%= t 'kinney.search.searched_for' %> <b><%= params[:q] %></b>.
+ <%= link_to t('kinney.search.clear'), search_path , :class => [:btn, 'btn-default' ] if defined?(@clips) %>
<% end -%>
- </div>
+ </div>
</div>
<div class="row">
- <div class="span8" id="clips">
+ <div class="col-xs-12 col-md-8 col-sm-8" id="clips">
<h2><%= t '.clips' %></h2>
<% if @fallback_clips %>
- <div class="alert">
+ <div class="alert alert-warning">
<%= t '.no_clips_match_message' %>
</div>
<% end -%>
<% if @query.blank? %>
<div class="alert alert-success">
<%= t '.no_current_search_clips_message' %>
</div>
<% end -%>
-
+
+ <div class="row">
<% @clips.each_slice(2) do |sliced_clips| %>
- <ul class="thumbnails">
+ <div class="thumbnails">
<% sliced_clips.each do |clip| %>
- <li class="span4 <%= cycle('odd', 'even') %>">
+ <div class="col-xs-6 col-sm-6 col-md-6 <%= cycle('odd', 'even') %>">
<%= render :partial => '/kinney/clip_link', :locals => {:clip => clip} %>
- </li>
+ </div>
<% end -%>
- </ul>
+ </div>
<% end -%>
-
+ </div>
+
</div>
- <div class="span4" id="people">
- <div class="well">
- <h2>People</h2>
- <% if @fallback_people %>
- <div class="alert">
- <%= t '.no_people_match_message' %>
- </div>
+ <div class="col-xs-12 col-sm-4 col-md-4 " id="people">
+ <h2><%= t 'kinney.people.plural' %></h2>
+ <% if @fallback_people %>
+ <div class="alert alert-warning">
+ <%= t '.no_people_match_message' %>
+ </div>
+ <% end -%>
+ <% if @query.blank? %>
+ <div class="alert alert-success">
+ <%= t '.no_current_search_people_message' %>
+ </div>
+ <% end -%>
+ <div class="list-group">
+ <% @people.each do |person| %>
+ <%= link_to person.full_name, person, class: 'list-group-item' %>
<% end -%>
- <% if @query.blank? %>
- <div class="alert alert-success">
- <%= t '.no_current_search_people_message' %>
- </div>
- <% end -%>
- <ul class="nav nav-tabs nav-stacked">
- <% @people.each do |person| %>
- <li>
- <%= link_to person.full_name, person %>
- </li>
- <% end -%>
- </ul>
</div>
</div>
+
</div>
\ No newline at end of file