Merge pull request #92 from ZeusWPI/interface

Minor interface changes

app/assets/stylesheets/orders.css.scss

@@ -26,11 +26,13 @@
   }
   button.product {
     width: 100%;
+    height: 100px;
     p {
       overflow: hidden;
       text-overflow: ellipsis;
     }
     img {
+      max-height: 70%;
       max-width: 100%;
       margin-left: auto;
       margin-right: auto;

app/views/orders/_products_modal.html.haml

@@ -13,7 +13,7 @@
             .col-md-2{ data: { name: product.name } }
               %button.btn.btn-default.product{ data: { product: product.id, dismiss: :modal } }
                 %p= product.name
-                = image_tag product.avatar(:dagschotel), class: "center"
+                = image_tag product.avatar(:dagschotel), class: "center img-responsive"
       .modal-footer
         %button.btn.btn-default{ data: { dismiss: :modal } }
           Close

app/views/orders/new.html.haml

@@ -5,8 +5,9 @@
       = 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 }
       = "- OR -"
-      %button.btn.btn-default.center-block{ data: { toggle: :modal, target: "#products_modal" } }
-        Select Product Without Barcode
+      %p
+        %button.btn.btn-default.center-block{ data: { toggle: :modal, target: "#products_modal" } }
+          Select Product Without Barcode
   .col-md-4.col-md-offset-1
     = form_for [@user, @order] do |f|
       = render 'errors', object: @order

app/views/products/link.html.haml

@@ -1,12 +1,14 @@
 .row
   .col-md-7
-    %h4.pull-right Select a product to link the barcode to an existing product ...
-    #product_buttons.row
-      - Product.all.each do |product|
-        .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
-            %p= product.name
-            = image_tag product.avatar(:dagschotel), class: "center"
+    %h4.center Select a product to link the barcode to an existing product ...
+    %p
+      #product_buttons.row
+        - Product.all.each do |product|
+          %tr
+          .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
+              %p= product.name
+              = image_tag product.avatar(:dagschotel), class: "center img-responsive"
   .col-md-5
     %h4 or create a new one
     = render 'products/form'

app/views/welcome/index.html.haml

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