From e5444015d2c3f7b7066eb77f124e89d07a258c4a Mon Sep 17 00:00:00 2001
From: Sean Schofield <sean@railsdog.com>
Date: Mon, 21 Jun 2010 10:53:31 -0400
Subject: [PATCH] Fixed issues with gemspec and restored rake task for
 spree:dev:less.  Output is generated in the core/public directory for now
 which may not be ideal but its a starting point.

---
 .gitignore                                |  1 -
 core/app/views/shared/_user_form.html.erb | 17 +---------
 {lib/taskz => core/lib/tasks}/themes.rake |  4 +--
 public/stylesheets/screen.css             | 12 ++-----
 spree.gemspec                             | 41 +++++++++++++++++++++++
 5 files changed, 47 insertions(+), 28 deletions(-)
 rename {lib/taskz => core/lib/tasks}/themes.rake (88%)
 create mode 100644 spree.gemspec

diff --git a/.gitignore b/.gitignore
index bee89f60b91..179d01a9a94 100644
--- a/.gitignore
+++ b/.gitignore
@@ -27,7 +27,6 @@ public/assets
 public/attachments
 public/blank_iframe.html
 public/ckeditora
-spree.gemspec
 spree_dev
 spree_test
 tmp
diff --git a/core/app/views/shared/_user_form.html.erb b/core/app/views/shared/_user_form.html.erb
index cdc22cdb2de..440ec05af13 100644
--- a/core/app/views/shared/_user_form.html.erb
+++ b/core/app/views/shared/_user_form.html.erb
@@ -14,19 +14,4 @@
   </p>
 </div>
 
-<%= hook :signup_below_password_fields %>
-
-<% if Spree::Config[:allow_openid] %>
-  <div id="openid-credentials" style="<%=openid_style(@user)%>" >
-    <p>
-      <%= f.label :openid_identifier, t('OpenID', :default => 'OpenID') %><br />
-      <%= f.text_field :openid_identifier, :class => 'openid_url' %>
-    </p>
-  </div>
-<% end %>
-
-<% if Spree::Config[:allow_openid] %>
-  <p id='enable_login_via_openid' style="<%=password_style(@user)%>" ><a href='#'><%= t :enable_login_via_openid %></a></p>
-  <p id='enable_login_via_login_password' style="<%=openid_style(@user)%>" ><a href='#'><%= t :enable_login_via_login_password %></a></p>
-  <%= javascript_include_tag 'open_id' %>
-<% end %>
+<%= hook :signup_below_password_fields %>
\ No newline at end of file
diff --git a/lib/taskz/themes.rake b/core/lib/tasks/themes.rake
similarity index 88%
rename from lib/taskz/themes.rake
rename to core/lib/tasks/themes.rake
index b0e8a925929..efd86393201 100644
--- a/lib/taskz/themes.rake
+++ b/core/lib/tasks/themes.rake
@@ -6,10 +6,10 @@ namespace :spree do
 
       #RAILS 3 TODO - figure out final resting place for less
       #$LESS_LOAD_PATH = Spree::ExtensionLoader.stylesheet_source_paths.reverse
-      $LESS_LOAD_PATH = [Rails.root.join(, "app", "stylesheets")]
+      $LESS_LOAD_PATH = [Rails.root.join("core", "app", "stylesheets")]
 
       # css files are written to the last loaded theme extension's public/stylesheets directory
-      output_path = $LESS_LOAD_PATH.first.gsub("app/stylesheets", "public/stylesheets")
+      output_path = $LESS_LOAD_PATH.first.to_s.gsub("app/stylesheets", "public/stylesheets")
       FileUtils.mkpath(output_path)
 
       # Build a list of all unique non-partial .less files to compile
diff --git a/public/stylesheets/screen.css b/public/stylesheets/screen.css
index 2e82f78e7b6..bd4158ab166 100644
--- a/public/stylesheets/screen.css
+++ b/public/stylesheets/screen.css
@@ -259,8 +259,8 @@ legend {
   border-right: 1px solid #eeeeee;
 }
 body {
-  margin-top: 0px;
-  background: #ffffff url(../images/tile-slider.png) top left repeat-x;
+  margin-top: 10px;
+  background: #ffffff url(../images/body-back.png) top left repeat-x;
 }
 div.left {
   float: left;
@@ -283,12 +283,6 @@ body.two-col #wrapper { background-image: url(../images/wrapper-back-2.png); }
   overflow: hidden;
   display: block;
 }
-
-.container_bg{
-	width:100%;
-	background:url(../images/tile-header.png) top left repeat-x;
-}
-
 #sidebar {
   display: inline;
   float: left;
@@ -315,7 +309,7 @@ body.two-col #content {
   clear: both;
 }
 #header a { color: #2e6ab1; }
-#header a:hover { color: #3C7DFB; }
+#header a:hover { color: #eeeeee; }
 #footer {
   padding-top: 2em;
   clear: both;
diff --git a/spree.gemspec b/spree.gemspec
new file mode 100644
index 00000000000..379b17c20be
--- /dev/null
+++ b/spree.gemspec
@@ -0,0 +1,41 @@
+version = File.read(File.expand_path("../SPREE_VERSION",__FILE__)).strip
+
+Gem::Specification.new do |s|
+  s.platform    = Gem::Platform::RUBY
+  s.name        = 'spree'
+  s.version     = version
+  s.summary     = 'Full-stack e-commerce framework for Ruby on Rails.'
+  s.description = ''
+
+  s.required_ruby_version     = '>= 1.8.7'
+  s.required_rubygems_version = ">= 1.3.6"
+
+  s.author            = 'Sean Schofield'
+  s.email             = 'sean@railsdog.com'
+  s.homepage          = 'http://spreecommerce.com'
+  s.rubyforge_project = 'spree'
+
+  s.bindir             = 'bin'
+  s.executables        = ['spree']
+  s.default_executable = 'spree'
+
+  s.add_dependency('spree-core',                version)
+  s.add_dependency('spree-payment-gateway',     version)
+  # RAILS3 TODO - add more of the core extensions, etc.
+  s.add_dependency('bundler',        '>= 0.9.26')
+  s.add_dependency('rails',          '= 3.0.0.beta4')
+  s.add_dependency('highline',       '>= 1.5.1')
+  s.add_dependency('authlogic',      '>= 2.1.5')
+  s.add_dependency('activemerchant')
+  s.add_dependency('activerecord-tableless', '>= 0.1.0')
+  s.add_dependency('less', '>= 1.2.20')
+  s.add_dependency('stringex',       '>= 1.0.3')
+  s.add_dependency('chronic',        '>= 0.2.3')
+  s.add_dependency('whenever',       '>= 0.3.7')
+  s.add_dependency('will_paginate')
+  s.add_dependency('state_machine',  '>= 0.9.2')
+  s.add_dependency('faker',          '>= 0.3.1')
+  s.add_dependency('paperclip',      '>= 2.3.1.1')
+  s.add_dependency('resource_controller')
+
+end
\ No newline at end of file