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

Minor interface fixes

Browse source
This commit is contained in:
tl3ilaxu 2016-02-04 00:23:12 +01:00
parent 913abe24fd
commit 412cd4b103
4 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/views/orders/_products_modal.html.haml
View file

@ -11,9 +11,9 @@
#product_buttons.container-fluid #product_buttons.container-fluid
- @products.each do |product| - @products.each do |product|
.col-md-2{ data: { name: product.name } } .col-md-2{ data: { name: product.name } }
%button.btn.btn-default.product{ data: { product: product.id, dismiss: :modal } } %button.btn.btn-default.product{ data: { product: product.id, dismiss: :modal }, style: "height: 125px" }
%p= product.name %p= product.name
= image_tag product.avatar(:dagschotel), class: "center" = image_tag product.avatar(:dagschotel), class: "center img-responsive", style: "max-height: 100px"
.modal-footer .modal-footer
%button.btn.btn-default{ data: { dismiss: :modal } } %button.btn.btn-default{ data: { dismiss: :modal } }
Close Close

1
app/views/orders/new.html.haml
View file

@ -5,6 +5,7 @@
= form_tag nil, id: "from_barcode_form", data: { url: URI.join(root_url, "barcodes").to_s } do = form_tag nil, id: "from_barcode_form", data: { url: URI.join(root_url, "barcodes").to_s } do
%input.center-block{ type: :number, name: :id, autofocus: true } %input.center-block{ type: :number, name: :id, autofocus: true }
= "- OR -" = "- OR -"
%p
%button.btn.btn-default.center-block{ data: { toggle: :modal, target: "#products_modal" } } %button.btn.btn-default.center-block{ data: { toggle: :modal, target: "#products_modal" } }
Select Product Without Barcode Select Product Without Barcode
.col-md-4.col-md-offset-1 .col-md-4.col-md-offset-1

8
app/views/products/link.html.haml
View file

@ -1,12 +1,14 @@
.row .row
.col-md-7 .col-md-7
%h4.pull-right Select a product to link the barcode to an existing product ... %h4.center Select a product to link the barcode to an existing product ...
%p
#product_buttons.row #product_buttons.row
- Product.all.each do |product| - Product.all.each do |product|
%tr
.col-md-3 .col-md-3
= button_to product_barcodes_path(product), class: "btn btn-default product", data: { product: product.id, dismiss: :modal }, params: { "barcode[code]" => params[:barcode] } do = button_to product_barcodes_path(product), class: "btn btn-default product", data: { product: product.id, dismiss: :modal }, params: { "barcode[code]" => params[:barcode] }, style: "height: 125px;" do
%p= product.name %p= product.name
= image_tag product.avatar(:dagschotel), class: "center" = image_tag product.avatar(:dagschotel), class: "center img-responsive", style: "max-height: 100px;"
.col-md-5 .col-md-5
%h4 or create a new one %h4 or create a new one
= render 'products/form' = render 'products/form'

1
app/views/welcome/index.html.haml
View file

@ -1,4 +1,5 @@
= content_for :title, "Login" = content_for :title, "Login"
%p
If this is the first time you log in, an account will be created for you. If this is the first time you log in, an account will be created for you.
%div %div
= link_to "Sign in with Zeus WPI account.", omniauth_authorize_path("user", "zeuswpi"), class: "btn btn-large btn-primary" = link_to "Sign in with Zeus WPI account.", omniauth_authorize_path("user", "zeuswpi"), class: "btn btn-large btn-primary"