added blueprint and styles extended layout

rngtng · Feb 18, 2010 · d524bc4 · d524bc4
1 parent 12bc7c6
commit d524bc4
Show file tree

Hide file tree

Showing 35 changed files with 1,681 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -4,4 +4,5 @@ log/server.log
 log/test.log
 public/index.html
 public/favicon.ico
-public/images/rails.png
+public/images/rails.png
+.DS_Store
diff --git a/README b/README
@@ -28,6 +28,7 @@ Further Requirements:
 * Rails
 * jQuery
 * Paperclip
+* HTML 5 support right away
 
 more lightweight: sinatra??
 
@@ -39,11 +40,15 @@ Cheating:
 
 http://railsillustrated.com/screencast-file-uploads-progress-in-rails-passenger.html
 http://drogomir.com/blog/2008/6/18/upload-progress-bar-with-mod_passenger-and-apache
+http://drogomir.com/blog/2008/6/30/upload-progress-script-with-safari-support
 http://www.therailsway.com/2009/4/23/uploading-files
+http://github.com/drogus/jquery-upload-progress
 
+http://adamelliot.com/posts/using-paperclip-with-datamapper-sinatra--2
 
 Howto:
 
+
 get apachemodule: http://github.com/mpokrywka/apache-upload-progress-module
 compile:  sudo apxs -c -i -a -Wc,-arch -Wc,ppc7400 -Wl,-arch -Wl,ppc7400  -Wc,-arch -Wc,x86_64 -Wl,-arch -Wl,x86_64 -Wc,-arch -Wc,i386 -Wl,-arch -Wl,i386 mod_upload_progress.c
 create vhost
@@ -55,9 +60,11 @@ add paperclip: http://jimneath.org/2008/04/17/paperclip-attaching-files-in-rails
                http://github.com/thoughtbot/paperclip
 add jQuery: http://railscasts.com/episodes/136-jquery
 add jRails: http://github.com/aaronchi/jrails
+add blueprint: http://blueprintcss.org/
 
 
-
+add asset controller:
+add asset model: 
 
 
 

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -3,14 +3,36 @@
   <head>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
     <title>File Upload Progress | Developer Challenge</title>
-    <%= stylesheet_link_tag 'main' %>
-      <%= javascript_include_tag 'jquery', 'application' %>
+    <%= stylesheet_link_tag 'blueprint/screen' %>
+    <%= stylesheet_link_tag 'styles' %>
+    <%= javascript_include_tag 'jquery', 'application' %>
   </head>
 
   <body>
     <div id="container">
-
-      <%= yield -%>
+
+       <!-- header -->
+       <div id="header" class="span-20">
+         <div class="span-11">
+           <h1>File Upload Progress</h1><br />
+           <p>Developer Challenge</p>
+         </div>
+
+         <div class="span-9 last">
+         </div>
+       </div>
+       <!-- /header -->
+
+       <!-- content -->
+       <div class="span-14" id="content">
+          <%= yield -%>
+       </div>
+       <!-- /content -->
+
+       <!-- sidebar -->
+       <div class="span-5 push-1 last" id="sidebar">
+       </div>
+       <!-- /sidebar -->
 
     </div>
   </body>

diff --git a/config/environment.rb b/config/environment.rb
@@ -18,7 +18,7 @@
   # config.gem "sqlite3-ruby", :lib => "sqlite3"
   config.gem 'paperclip', :source => 'http://gemcutter.org'
 
-  Paperclip.options[:command_path] = "/usr/local/bin"
+ #  Paperclip.options[:command_path] = "/usr/local/bin"
 
   # Only load the plugins named here, in the order given (default is alphabetical).
   # :all can be used as a placeholder for all plugins not explicitly named

diff --git a/public/images/black.jpg b/public/images/black.jpg
diff --git a/public/stylesheets/blueprint/ie.css b/public/stylesheets/blueprint/ie.css
@@ -0,0 +1,35 @@
+/* -----------------------------------------------------------------------
+
+
+ Blueprint CSS Framework 0.9
+ http://blueprintcss.org
+
+   * Copyright (c) 2007-Present. See LICENSE for more info.
+   * See README for instructions on how to use Blueprint.
+   * For credits and origins, see AUTHORS.
+   * This is a compressed file. See the sources in the 'src' directory.
+
+----------------------------------------------------------------------- */
+
+/* ie.css */
+body {text-align:center;}
+.container {text-align:left;}
+* html .column, * html .span-1, * html .span-2, * html .span-3, * html .span-4, * html .span-5, * html .span-6, * html .span-7, * html .span-8, * html .span-9, * html .span-10, * html .span-11, * html .span-12, * html .span-13, * html .span-14, * html .span-15, * html .span-16, * html .span-17, * html .span-18, * html .span-19, * html .span-20, * html .span-21, * html .span-22, * html .span-23, * html .span-24 {display:inline;overflow-x:hidden;}
+* html legend {margin:0px -8px 16px 0;padding:0;}
+sup {vertical-align:text-top;}
+sub {vertical-align:text-bottom;}
+html>body p code {*white-space:normal;}
+hr {margin:-8px auto 11px;}
+img {-ms-interpolation-mode:bicubic;}
+.clearfix, .container {display:inline-block;}
+* html .clearfix, * html .container {height:1%;}
+fieldset {padding-top:0;}
+textarea {overflow:auto;}
+input.text, input.title, textarea {background-color:#fff;border:1px solid #bbb;}
+input.text:focus, input.title:focus {border-color:#666;}
+input.text, input.title, textarea, select {margin:0.5em 0;}
+input.checkbox, input.radio {position:relative;top:.25em;}
+form.inline div, form.inline p {vertical-align:middle;}
+form.inline label {position:relative;top:-0.25em;}
+form.inline input.checkbox, form.inline input.radio, form.inline input.button, form.inline button {margin:0.5em 0;}
+button, input.button {position:relative;top:0.25em;}
diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/cross.png b/public/stylesheets/blueprint/plugins/buttons/icons/cross.png
diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/key.png b/public/stylesheets/blueprint/plugins/buttons/icons/key.png
diff --git a/public/stylesheets/blueprint/plugins/buttons/icons/tick.png b/public/stylesheets/blueprint/plugins/buttons/icons/tick.png
diff --git a/public/stylesheets/blueprint/plugins/buttons/readme.txt b/public/stylesheets/blueprint/plugins/buttons/readme.txt
@@ -0,0 +1,32 @@
+Buttons
+
+* Gives you great looking CSS buttons, for both <a> and <button>.
+* Demo: particletree.com/features/rediscovering-the-button-element
+
+
+Credits
+----------------------------------------------------------------
+
+* Created by Kevin Hale [particletree.com]
+* Adapted for Blueprint by Olav Bjorkoy [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.
+
+2) Use the following HTML code to place the buttons on your site:
+
+  <button type="submit" class="button positive">
+    <img src="css/blueprint/plugins/buttons/icons/tick.png" alt=""/> Save
+  </button>
+
+  <a class="button" href="/password/reset/">
+    <img src="css/blueprint/plugins/buttons/icons/key.png" alt=""/> Change Password
+  </a>
+
+  <a href="#" class="button negative">
+    <img src="css/blueprint/plugins/buttons/icons/cross.png" alt=""/> Cancel
+  </a>
diff --git a/public/stylesheets/blueprint/plugins/buttons/screen.css b/public/stylesheets/blueprint/plugins/buttons/screen.css
@@ -0,0 +1,97 @@
+/* -------------------------------------------------------------- 
+  
+   buttons.css
+   * Gives you some great CSS-only buttons.
+   
+   Created by Kevin Hale [particletree.com]
+   * particletree.com/features/rediscovering-the-button-element
+
+   See Readme.txt in this folder for instructions.
+
+-------------------------------------------------------------- */
+
+a.button, button {
+  display:block;
+  float:left;
+  margin: 0.7em 0.5em 0.7em 0;
+  padding:5px 10px 5px 7px;   /* Links */
+
+  border:1px solid #dedede;
+  border-top:1px solid #eee;
+  border-left:1px solid #eee;
+
+  background-color:#f5f5f5;
+  font-family:"Lucida Grande", Tahoma, Arial, Verdana, sans-serif;
+  font-size:100%;
+  line-height:130%;
+  text-decoration:none;
+  font-weight:bold;
+  color:#565656;
+  cursor:pointer;
+}
+button {
+  width:auto;
+  overflow:visible;
+  padding:4px 10px 3px 7px;   /* IE6 */
+}
+button[type] {
+  padding:4px 10px 4px 7px;   /* Firefox */
+  line-height:17px;           /* Safari */
+}
+*:first-child+html button[type] {
+  padding:4px 10px 3px 7px;   /* IE7 */
+}
+button img, a.button img{
+  margin:0 3px -3px 0 !important;
+  padding:0;
+  border:none;
+  width:16px;
+  height:16px;
+  float:none;
+}
+
+
+/* Button colors
+-------------------------------------------------------------- */
+
+/* Standard */
+button:hover, a.button:hover{
+  background-color:#dff4ff;
+  border:1px solid #c2e1ef;
+  color:#336699;
+}
+a.button:active{
+  background-color:#6299c5;
+  border:1px solid #6299c5;
+  color:#fff;
+}
+
+/* Positive */
+body .positive {
+  color:#529214;
+}
+a.positive:hover, button.positive:hover {
+  background-color:#E6EFC2;
+  border:1px solid #C6D880;
+  color:#529214;
+}
+a.positive:active {
+  background-color:#529214;
+  border:1px solid #529214;
+  color:#fff;
+}
+
+/* Negative */
+body .negative {
+  color:#d12f19;
+}
+a.negative:hover, button.negative:hover {
+  background-color:#fbe3e4;
+  border:1px solid #fbc2c4;
+  color:#d12f19;
+}
+a.negative:active {
+  background-color:#d12f19;
+  border:1px solid #d12f19;
+  color:#fff;
+}
diff --git a/public/stylesheets/blueprint/plugins/fancy-type/readme.txt b/public/stylesheets/blueprint/plugins/fancy-type/readme.txt
@@ -0,0 +1,14 @@
+Fancy Type
+
+* Gives you classes to use if you'd like some 
+  extra fancy typography. 
+
+Credits and instructions are specified above each class
+in the fancy-type.css file in this directory.
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this plugin to lib/settings.yml.
+   See compress.rb for instructions.
diff --git a/public/stylesheets/blueprint/plugins/fancy-type/screen.css b/public/stylesheets/blueprint/plugins/fancy-type/screen.css
@@ -0,0 +1,71 @@
+/* --------------------------------------------------------------
+
+   fancy-type.css
+   * Lots of pretty advanced classes for manipulating text.
+
+   See the Readme file in this folder for additional instructions.
+
+-------------------------------------------------------------- */
+
+/* Indentation instead of line shifts for sibling paragraphs. */
+   p + p { text-indent:2em; margin-top:-1.5em; }
+   form p + p  { text-indent: 0; } /* Don't want this in forms. */
+
+
+/* For great looking type, use this code instead of asdf:
+   <span class="alt">asdf</span>
+   Best used on prepositions and ampersands. */
+
+.alt {
+  color: #666;
+  font-family: "Warnock Pro", "Goudy Old Style","Palatino","Book Antiqua", Georgia, serif;
+  font-style: italic;
+  font-weight: normal;
+}
+
+
+/* For great looking quote marks in titles, replace "asdf" with:
+   <span class="dquo">&#8220;</span>asdf&#8221;
+   (That is, when the title starts with a quote mark).
+   (You may have to change this value depending on your font size). */
+
+.dquo { margin-left: -.5em; }
+
+
+/* Reduced size type with incremental leading
+   (http://www.markboulton.co.uk/journal/comments/incremental_leading/)
+
+   This could be used for side notes. For smaller type, you don't necessarily want to
+   follow the 1.5x vertical rhythm -- the line-height is too much.
+
+   Using this class, it reduces your font size and line-height so that for
+   every four lines of normal sized type, there is five lines of the sidenote. eg:
+
+   New type size in em's:
+     10px (wanted side note size) / 12px (existing base size) = 0.8333 (new type size in ems)
+
+   New line-height value:
+     12px x 1.5 = 18px (old line-height)
+     18px x 4 = 72px
+     72px / 5 = 14.4px (new line height)
+     14.4px / 10px = 1.44 (new line height in em's) */
+
+p.incr, .incr p {
+  font-size: 10px;
+  line-height: 1.44em;
+  margin-bottom: 1.5em;
+}
+
+
+/* Surround uppercase words and abbreviations with this class.
+   Based on work by Jørgen Arnor Gårdsø Lom [http://twistedintellect.com/] */
+
+.caps {
+  font-variant: small-caps;
+  letter-spacing: 1px;
+  text-transform: lowercase;
+  font-size:1.2em;
+  line-height:1%;
+  font-weight:bold;
+  padding:0 2px;
+}
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/doc.png b/public/stylesheets/blueprint/plugins/link-icons/icons/doc.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/email.png b/public/stylesheets/blueprint/plugins/link-icons/icons/email.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/external.png b/public/stylesheets/blueprint/plugins/link-icons/icons/external.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/feed.png b/public/stylesheets/blueprint/plugins/link-icons/icons/feed.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/im.png b/public/stylesheets/blueprint/plugins/link-icons/icons/im.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png b/public/stylesheets/blueprint/plugins/link-icons/icons/pdf.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png b/public/stylesheets/blueprint/plugins/link-icons/icons/visited.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/icons/xls.png b/public/stylesheets/blueprint/plugins/link-icons/icons/xls.png
diff --git a/public/stylesheets/blueprint/plugins/link-icons/readme.txt b/public/stylesheets/blueprint/plugins/link-icons/readme.txt
@@ -0,0 +1,18 @@
+Link Icons
+* Icons for links based on protocol or file type.
+
+This is not supported in IE versions < 7.
+
+
+Credits
+----------------------------------------------------------------
+
+* Marc Morgan
+* Olav Bjorkoy  [bjorkoy.com]
+
+
+Usage
+----------------------------------------------------------------
+
+1) Add this line to your HTML:
+  <link rel="stylesheet" href="css/blueprint/plugins/link-icons/screen.css" type="text/css" media="screen, projection">