Permalink
Browse files

more bootstrap changes

  • Loading branch information...
1 parent 7eb2c6d commit b8183b0c0e95bd497e5f26f7ba3b24eae358b171 @zherk committed Apr 16, 2012
Showing with 21 additions and 34 deletions.
  1. +5 −5 app/views/layouts/application.html.erb
  2. +16 −29 app/views/spends/index.html.erb
@@ -10,22 +10,22 @@
<%= csrf_meta_tags %>
</head>
<body>
- <div class="container">
+ <div class="container-fluid">
<%if notice%>
<div class="row-fluid">
<div class="span12">
- <p class="notice">
+ <div class="alert alert-info">
<%= notice %>
- </p>
+ </div>
</div>
</div>
<% end -%>
<%if alert%>
<div class="row-fluid">
<div class="span12">
- <p class="alert">
+ <div class="alert alert-error">
<%= alert %>
- </p>
+ </div>
</div>
</div>
<% end -%>
@@ -1,32 +1,18 @@
-<div class="row-fluid">
- <div class="span12" >
- <%= form_tag spends_path, :method => 'get' do %>
- <div class="row-fluid">
- <div class="span6">
- <%= select_date @period_date, :prefix => :period, :order => [:month, :year] %>
- </div>
- <div class="span6">
- <%= submit_tag "Cambiar" %>
- </div>
- </div>
- <% end %>
- </div>
-</div>
-<div class="row-fluid">
- <div class="span12" >
- <h1>Lista de gastos</h1>
- </div>
+<%= form_tag spends_path, :method => 'get', :class => "form-inline" do %>
+<%= select_date @period_date, :prefix => :period, :order => [:month, :year] %>
+<%= submit_tag "Cambiar" %>
+<% end %>
+<div class="page-header">
+ <h1>Lista de gastos</h1>
</div>
-<table class="table table-bordered table-striped">
+<table class="table table-bordered table-striped table-condensed">
<thead>
<tr>
<th>Fecha</th>
<th>Titulo</th>
<th>Monto</th>
<th>Marcas</th>
<th/>
- <th/>
- <th/>
</tr>
</thead>
<tbody>
@@ -36,20 +22,21 @@
<td><%= spend.titulo %></td>
<td><%= number_to_currency(spend.ammount, :unit => "$") %></td>
<td><%= raw(to_tags_links_listing(spend.tags)) %></td>
- <td><%= link_to 'Show', spend %></td>
- <td><%= link_to 'Edit', edit_spend_path(spend) %></td>
- <td><%= link_to 'Destroy', spend, :confirm => 'Are you sure?', :method => :delete %></td>
+ <td>
+ <div class="btn-group">
+ <%= link_to 'Edit', edit_spend_path(spend), :class => "btn" %>
+ <%= link_to 'Destroy', spend, :confirm => 'Are you sure?', :method => :delete, :class => "btn" %>
+ </div></td>
</tr>
<% end %>
</tbody>
<tfoot>
<tr>
<td colspan="2" >Monto final</td>
- <td><%= number_to_currency(@sum, :unit => "$") %> <td/>
- <td/>
- <td/>
- <td/>
+ <td colspan="3"><%= number_to_currency(@sum, :unit => "$") %> </td>
</tr>
</tfoot>
</table>
-<%= link_to 'Nuevo gasto', new_spend_path %>
+<div class="btn-group">
+ <%= link_to 'Nuevo gasto', new_spend_path, :class => "btn" %>
+</div>

0 comments on commit b8183b0

Please sign in to comment.