midgard/tap
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:ZeusWPI/Tab

Browse source 
Conflicts:
	app/assets/stylesheets/orders.css.scss
This commit is contained in:
Tom Naessens 2014-12-09 22:50:43 +01:00
parent b7a97f4753 6c51972248
commit 2eee65ccf8
4 changed files with 33 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
app/assets/stylesheets/application.css.scss
View file

@ -94,3 +94,8 @@ footer ul li {
.center{ .center{
text-align: center; text-align: center;
} }
.debug_dump{
width: 100%;
margin-top: 30px;
}

13
app/assets/stylesheets/orders.css.scss
View file

@ -5,3 +5,16 @@
.thumbnail { .thumbnail {
min-height: 200px; min-height: 200px;
} }
.form_products {
border-width: 1px;
border-color: #000;
border-style: solid;
margin-bottom: 2px;
}
.form_total {
border-width: 1px;
border-color: #000;
border-style: solid;
}

12
app/views/layouts/application.html.erb
View file

@ -10,12 +10,16 @@
<body> <body>
<%= render "layouts/header" %> <%= render "layouts/header" %>
<div class="container"> <div class="container">
<div class="container" >
<%= yield %> <%= yield %>
</div>
<%= render "layouts/footer" %> <%= render "layouts/footer" %>
<%= debug(params) if Rails.env.development? %>
</div> </div>
<%= debug(params) if Rails.env.development? %>
</body> </body>
</html> </html>

11
app/views/orders/new.html.erb
View file

@ -1,13 +1,16 @@
<%= @user.name %> <h3><%= @user.name %></h3>
<%= form_for( @order, url: user_orders_path(@user)) do |f| %> <%= form_for( @order, url: user_orders_path(@user)) do |f| %>
<%= render 'application/errors', model: @order %> <%= render 'application/errors', model: @order %>
<div id="form_products"> <div class="col-md-2 thumbnail form_products">
<%= f.fields_for :order_products do |op_field| %> <%= f.fields_for :order_products do |op_field| %>
<%= render 'order_products/form_row', f: op_field %> <%= render 'order_products/form_row', f: op_field %>
<% end %> <% end %>
</div> </div>
<%= render 'order_products/total_price', f: f %> <div class="col-md-12 form_total">
<%= f.submit "Order", class: "btn btn-primary " %> <%= render 'order_products/total_price', f: f %>
<%= f.submit "Order", class: "btn btn-primary " %>
</div>
<% end %> <% end %>