WIP

Gemfile

@@ -25,5 +25,4 @@ group :assets do
   gem "uglifier", ">= 1.0.3"
   gem "sass-rails", "~> 3.2.3"
   gem "coffee-rails", "~> 3.2.1"
-  gem "bootstrap-sass", "~> 2.0.4.0"
 end

Gemfile.lock

@@ -37,7 +37,6 @@ GEM
       i18n (= 0.6.1)
       multi_json (~> 1.0)
     arel (3.0.2)
-    bootstrap-sass (2.0.4.2)
     builder (3.0.4)
     coffee-rails (3.2.2)
       coffee-script (>= 2.2.0)
@@ -161,7 +160,6 @@ PLATFORMS
   ruby
 
 DEPENDENCIES
-  bootstrap-sass (~> 2.0.4.0)
   coffee-rails (~> 3.2.1)
   daemon-spawn
   dalli

app/assets/javascripts/application.js

@@ -7,9 +7,8 @@
 //= require jquery
 //= require jquery_ujs
 //= require cookie
-//= require bootstrap-tab
-//= require bootstrap-alert
 //= require select2
+//= require bootstrap
 //= require_tree .
 
 var _gaq = _gaq || [];

app/assets/javascripts/print.js.coffee

@@ -29,7 +29,7 @@ $(document).ready ->
 
     building.change (event) -> change_printers(event.val)
 
-    if !defaults && (p = $.cookie("printer")) && (b = $.cookie("building"))
-        building.select2("val", b)
-        change_printers(b)
-        printer.select2("val", p)
+    # if !defaults && (p = $.cookie("printer")) && (b = $.cookie("building"))
+    #     building.select2("val", b)
+    #     change_printers(b)
+    #     printer.select2("val", p)

app/assets/stylesheets/application.css.scss

@@ -1,8 +1,44 @@
-@import "defaults";
-
 @import "bootstrap";
-@import "bootstrap-responsive";
 @import "select2";
+// @import "credits";
+// @import "print";
+
+footer {
+    margin-top: 18px;
+    padding-top: 17px;
+    border-top: 1px solid #EEE;
+
+    p {
+      text-align: center;
+
+      a {
+        color: #404040;
+      }
+
+      a:hover {
+        color: #404040;
+      }
+    }
+
+    .disclaimer {
+      font-size: 8pt;
+      color: #BBBBBB;
+    }
+
+    .disclaimer a {
+      color: #BBBBBB;
+    }
+
+    .disclaimer a:hover {
+      color: #BBBBBB;
+    }
+}
+
+.select2-container {
+    width: 100%;
+}
 
-@import "credits";
-@import "print";
+.printatcu-dragdrop {
+  text-align: center;
+  margin: 6px 0px 0px 0px !important;
+}

app/views/application/_footer.html.erb

@@ -0,0 +1,4 @@
+<footer>
+  <p class="disclaimer"><%= t(:disclaimer_html) %>
+  <p>&copy; <%= mail_to "sia2111@columbia.edu", "Sam Aarons", :encode => "hex" %> <%= Time.zone.now.strftime("%Y") %></p>
+</footer>

app/views/application/_head.html.haml

@@ -4,8 +4,8 @@
   %meta{name: "viewport", content: "width=device-width, initial-scale=1.0"}
   %title= t("title")
   = stylesheet_link_tag "application"
-  %link{href: "//fonts.googleapis.com/css?family=Ubuntu", rel: "stylesheet", type: "text/css"}
+  / %link{href: "//fonts.googleapis.com/css?family=Ubuntu", rel: "stylesheet", type: "text/css"}
   = javascript_include_tag "application"
-  %script{type: "text/javascript", src: "https://www.dropbox.com/static/api/1/dropbox.js", id: "dropboxjs", data: {"app-key" => "bypzt1set1uibag"}}
+  %script{type: "text/javascript", src:"//api.filepicker.io/v1/filepicker.js"}
   = csrf_meta_tags
   = include_gon init: true

app/views/application/_header.html.erb

@@ -0,0 +1,3 @@
+<div class="navbar">
+  <a class="navbar-brand" href="<%= root_path %>">Print@CU</a>
+</div>

app/views/prints/new.html.erb

@@ -0,0 +1,48 @@
+<%= form_for @print do |f| %>
+
+<div class="row">
+  <div class="col-sm-3 col-lg-3">
+    <div class="row">
+      <div class="col-lg-12">
+        <%= f.select(:building, buildings, :selected => choose_building) %>
+      </div>
+    </div>
+    <br>
+    <div class="row">
+      <div class="col-lg-12">
+        <%= f.select(:printer, default_printers, :selected => choose_printer) %>
+      </div>
+    </div>
+  </div>
+  <div class="col-sm-1 col-lg-1"><br><span class="hidden-sm divider">>></span></div>
+  <div class="col-sm-4 col-lg-4">
+    <input id="filepicker" data-fp-apikey="Ac88GjthXQdqNsr9JvJJHz" type="filepicker-dragdrop" data-fp-multiple="true" data-fp-drag-class="col-12 printatcu-dragdrop" data-fp-button-class="btn btn-primary btn-block"/>
+  </div>
+  <div class="col-sm-1 col-lg-1"><br><span class="hidden-sm divider">>></span><br><br></div>
+  <div class="col-sm-3 col-lg-3">
+    <%= f.submit(:class => "btn btn-success btn-large btn-block") %>
+    <br>
+    <div class="well">
+      <div class="checkbox">
+        <%= f.label(:collate) do %>
+          <%= f.check_box :collate %>
+          <%= t("helpers.label.print.collate") %>
+        <% end %>
+      </div>
+
+      <div class="checkbox">
+        <%= f.label(:double_sided) do %>
+          <%= f.check_box :double_sided %>
+          <%= t("helpers.label.print.double_sided") %>
+        <% end %>
+      </div>
+
+      <div class="input-group">
+        <span class="input-group-addon">Copies:</span>
+        <%= f.text_field :copies, :class => "form-control", :placeholder => 1, :size => 2, :maxlength => 2 %>
+      </div>
+    </div>
+  </div>
+</div>
+
+<% end %>

db/schema.rb

@@ -17,8 +17,8 @@
     t.integer  "print_id"
     t.string   "filename"
     t.string   "tempfile"
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at", :null => false
+    t.datetime "updated_at", :null => false
     t.string   "url"
   end
 
@@ -27,8 +27,8 @@
     t.string   "printer"
     t.string   "user"
     t.boolean  "double_sided", :default => true
-    t.datetime "created_at"
-    t.datetime "updated_at"
+    t.datetime "created_at",                     :null => false
+    t.datetime "updated_at",                     :null => false
     t.boolean  "collate"
     t.integer  "copies"
     t.string   "ip"