Permalink
Browse files

tried to fixed at spree 1-0-stable

  • Loading branch information...
1 parent 660196a commit 31eef918f1f8a1922c4b88c9c8f8da92f5eb9a63 @damianogiacomello committed Mar 23, 2012
View
@@ -8,3 +8,4 @@ tmp
nbproject
*.swp
spec/dummy
+*.gem
View
@@ -5,6 +5,7 @@ gem 'sqlite3'
gem 'spree', :git => 'git://github.com/spree/spree.git', :branch => '1-0-stable'
gem "paperclip", ">= 2.5.0"
gem "formtastic"
+gem 'ckeditor', '3.7.0.rc3'
group :test do
gem 'rspec-rails', '= 2.6.1'
View
@@ -1,50 +1,50 @@
GIT
remote: git://github.com/spree/spree.git
- revision: 670394bebd0371fac4b058032a35da4c4bdd505b
- branch: 0-70-stable
+ revision: b58d645ac730c95d594552dc777ab3466033bce2
+ branch: 1-0-stable
specs:
- spree (0.70.4.beta)
- spree_api (= 0.70.4.beta)
- spree_auth (= 0.70.4.beta)
- spree_core (= 0.70.4.beta)
- spree_dash (= 0.70.4.beta)
- spree_promo (= 0.70.4.beta)
- spree_sample (= 0.70.4.beta)
- spree_api (0.70.4.beta)
- spree_auth (= 0.70.4.beta)
- spree_core (= 0.70.4.beta)
- spree_auth (0.70.4.beta)
- cancan (= 1.6.5)
- devise (= 1.4.7)
- spree_core (= 0.70.4.beta)
- spree_core (0.70.4.beta)
- activemerchant (= 1.17.0)
+ spree (1.0.4.beta)
+ spree_api (= 1.0.4.beta)
+ spree_auth (= 1.0.4.beta)
+ spree_cmd (= 1.0.4.beta)
+ spree_core (= 1.0.4.beta)
+ spree_dash (= 1.0.4.beta)
+ spree_promo (= 1.0.4.beta)
+ spree_sample (= 1.0.4.beta)
+ spree_api (1.0.4.beta)
+ spree_auth (= 1.0.4.beta)
+ spree_core (= 1.0.4.beta)
+ spree_auth (1.0.4.beta)
+ cancan (= 1.6.7)
+ devise (= 1.4.8)
+ spree_core (= 1.0.4.beta)
+ spree_cmd (1.0.4.beta)
+ spree_core (1.0.4.beta)
+ activemerchant (= 1.20.1)
acts_as_list (= 0.1.4)
- deface (>= 0.7.0)
- faker (= 1.0.0)
- highline (= 1.6.2)
- jquery-rails (>= 1.0.14)
- kaminari (>= 0.12.4)
+ deface (>= 0.7.2)
+ ffaker (~> 1.12.0)
+ highline (= 1.6.8)
+ jquery-rails (>= 1.0.18, <= 1.0.19)
+ kaminari (>= 0.13.0)
meta_search (= 1.1.1)
nested_set (= 1.6.8)
paperclip (= 2.5.0)
- rails (>= 3.1.1, <= 3.1.3)
- rd_find_by_param (= 0.1.1)
- rd_resource_controller
- state_machine (= 1.0.1)
- stringex (= 1.3.0)
- spree_dash (0.70.4.beta)
- spree_core (= 0.70.4.beta)
- spree_promo (0.70.4.beta)
- spree_auth (= 0.70.4.beta)
- spree_core (= 0.70.4.beta)
- spree_sample (0.70.4.beta)
- spree_core (= 0.70.4.beta)
+ rails (>= 3.1.1, <= 3.1.4)
+ state_machine (= 1.1.1)
+ stringex (~> 1.3.0)
+ spree_dash (1.0.4.beta)
+ spree_core (= 1.0.4.beta)
+ spree_promo (1.0.4.beta)
+ spree_auth (= 1.0.4.beta)
+ spree_core (= 1.0.4.beta)
+ spree_sample (1.0.4.beta)
+ spree_core (= 1.0.4.beta)
PATH
remote: .
specs:
- spree_multi_slideshow (0.70.3)
+ spree_multi_slideshow (1.0.0)
formtastic
paperclip (>= 2.5.0)
spree_auth
@@ -67,11 +67,17 @@ GEM
rack-mount (~> 0.8.2)
rack-test (~> 0.6.1)
sprockets (~> 2.0.3)
- activemerchant (1.17.0)
+ active_utils (1.0.3)
+ activesupport (>= 2.3.11)
+ i18n
+ activemerchant (1.20.1)
+ active_utils (>= 1.0.1)
activesupport (>= 2.3.11)
braintree (>= 2.0.0)
builder (>= 2.0.0)
+ i18n
json (>= 1.5.1)
+ money (<= 3.7.1)
activemodel (3.1.3)
activesupport (= 3.1.3)
builder (~> 3.0.0)
@@ -89,10 +95,10 @@ GEM
acts_as_list (0.1.4)
arel (2.2.1)
bcrypt-ruby (3.0.1)
- braintree (2.13.3)
+ braintree (2.14.0)
builder (>= 2.0.0)
builder (3.0.0)
- cancan (1.6.5)
+ cancan (1.6.7)
capybara (1.0.1)
mime-types (>= 1.16)
nokogiri (>= 1.3.3)
@@ -104,10 +110,10 @@ GEM
ffi (~> 1.0.6)
cocaine (0.2.1)
database_cleaner (0.6.7)
- deface (0.7.2)
+ deface (0.8.0)
nokogiri (~> 1.5.0)
rails (>= 3.0.9)
- devise (1.4.7)
+ devise (1.4.8)
bcrypt-ruby (~> 3.0)
orm_adapter (~> 0.0.3)
warden (~> 1.0.3)
@@ -116,10 +122,11 @@ GEM
factory_girl (1.3.3)
faker (1.0.0)
i18n (~> 0.4)
+ ffaker (1.12.1)
ffi (1.0.11)
formtastic (2.0.2)
rails (~> 3.0)
- highline (1.6.2)
+ highline (1.6.8)
hike (1.2.1)
i18n (0.6.0)
jquery-rails (1.0.19)
@@ -140,6 +147,8 @@ GEM
activesupport (~> 3.1.0)
polyamorous (~> 0.5.0)
mime-types (1.17.2)
+ money (3.7.1)
+ i18n (~> 0.4)
multi_json (1.0.4)
nested_set (1.6.8)
activerecord (>= 3.0.0)
@@ -179,10 +188,6 @@ GEM
rdoc (~> 3.4)
thor (~> 0.14.6)
rake (0.9.2.2)
- rd_find_by_param (0.1.1)
- activerecord (~> 3.0)
- activesupport (~> 3.0)
- rd_resource_controller (1.0.1)
rdoc (3.12)
json (~> 1.4)
rspec (2.6.0)
@@ -207,10 +212,10 @@ GEM
sprockets (2.0.3)
hike (~> 1.2)
rack (~> 1.0)
- tilt (!= 1.3.0, ~> 1.1)
+ tilt (~> 1.1, != 1.3.0)
sqlite3 (1.3.5)
- state_machine (1.0.1)
- stringex (1.3.0)
+ state_machine (1.1.1)
+ stringex (1.3.2)
thor (0.14.6)
tilt (1.3.3)
treetop (1.4.10)
View
@@ -9,7 +9,7 @@ Basic Installation
1. Add the following to your Gemfile
<pre>
- gem 'spree_multi_slideshow', :git => 'git://github.com/damianogiacomello/spree_multi_slideshow'
+ gem 'spree_multi_slideshow', '~> 1.0.0'
</pre>
2. Run `bundle install`
3. To copy and apply migrations run:
@@ -35,7 +35,7 @@ displays slides for which the category column, dafault is "home"
</pre>
style layout for slideshow: [small, medium, slide, default => custom]
<pre>
- <%= insert_slideshow(:container_navigation => "span", :class_navigation_container => "my_class", :class_navigation_link => "my_class") %>
+ <%= insert_slideshow(:container_navigation => "tag_container", :class_navigation_container => "my_class_container", :class_navigation_link => "my_class_navigation_prev, my_class_navigation_next") %>
</pre>
added a content_tag for navigatin button, default is nil
View
@@ -3,13 +3,11 @@ require 'rake/testtask'
require 'rake/packagetask'
require 'rubygems/package_task'
require 'rspec/core/rake_task'
-require 'cucumber/rake/task'
-require 'spree_core/testing_support/common_rake'
+require 'spree/core/testing_support/common_rake'
RSpec::Core::RakeTask.new
-Cucumber::Rake::Task.new
-task :default => [:spec, :cucumber ]
+task :default => [:spec]
spec = eval(File.read('spree_multi_slideshow.gemspec'))
@@ -28,4 +26,4 @@ desc "Generates a dummy app for testing"
task :test_app do
ENV['LIB_NAME'] = 'spree_multi_slideshow'
Rake::Task['common:test_app'].invoke
-end
+end
@@ -1 +1,2 @@
//= require admin/spree_core
+//= require ckeditor/init
@@ -1,3 +1,17 @@
/*
*= require admin/spree_core
+ *= require formtastic
*/
+
+.formtastic input, .formtastic textarea, .formtastic select {
+ font-size: 100%;
+ padding: 5px;
+}
+
+.formtastic button {
+ margin: 0;
+ padding: 0 20px 0 0;
+}
+.formtastic button:hover {
+ text-shadow: #FFFFFF -1px -1px 0px;
+}
@@ -2,61 +2,49 @@
*= require store/spree_core
*/
-.gallery{
- width: 900px;
- height:276px;
- padding:15px 0 0;
+.gallery {
overflow: hidden;
z-index:0;
color:#fff;
background:url(/assets/images/bg-gallery.png) no-repeat 20px 0;
- margin-bottom:-2px;
}
-.gallery .frame{
- width:900px;
- overflow:hidden;
+.gallery .frame {
position:relative;
- height:251px;
}
-.gallery .frame ul{
+.gallery .frame ul {
position:absolute;
- overflow:hidden;
margin:0;
padding:0;
list-style:none;
- width:900px;
- height:251px;
}
-.gallery .frame li{
- width:900px;
- height:251px;
+.gallery .frame li {
position:absolute;
top:0;
left:0;
background:#f1f1f1;
}
-.gallery .frame li.active{z-index:2;}
-.gallery img{
+.gallery .frame li.active {z-index:2;}
+.gallery img {
display:block;
}
.gallery .prev,
-.gallery .next{
- position:absolute;
+.gallery .next {
+ /*position:absolute;
top:160px;
left:47px;
background:url(/assets/images/sprite01.png) no-repeat;
width:39px;
- height:39px;
+ height:39px;*/
text-indent:-9999px;
overflow:hidden;
z-index:3;
}
-.gallery .next{
+.gallery .next {
right:56px;
left:auto;
background-position: 0 -43px;
}
-.gallery .text-holder{
+.gallery .text-holder {
background:url(/assets/images/bg-text02.png) no-repeat;
width: 234px;
height:98px;
@@ -67,7 +55,7 @@
font:bold 33px/40px 'Candrb', Arial, Helvetica, sans-serif;
text-align:center;
}
-.gallery .text-holder strong span{
+.gallery .text-holder strong span {
font-size:52px;
display:block;
}
@@ -1,6 +1,6 @@
module Spree
module Admin
- class SlidesController < BaseController
+ class SlidesController < ResourceController
before_filter :load_data
def load_data
@@ -1,6 +1,6 @@
module Spree
module Admin
- class SlideshowTypesController < BaseController
+ class SlideshowTypesController < ResourceController
def location_after_save
edit_admin_slideshow_type_url(@slideshow_type)
Oops, something went wrong.

0 comments on commit 31eef91

Please sign in to comment.