spree_multi_slideshow 1.2.1 → 1.3.0

data/lib/generators/spree_multi_slideshow/install/install_generator.rb

@@ -2,23 +2,13 @@ module SpreeMultiSlideshow
   module Generators
     class InstallGenerator < Rails::Generators::Base
       
-      def add_formtastic
-        res = ask "Would you like to run the formtastic install now? [Y/n]"
-        if res == "" || res.downcase == "y"
-          run 'rails generate formtastic:install'
-        else
-          puts "Skiping rails generate formtastic:install, don't forget to run it!"
-        end
-      end
-      
       def add_javascripts
         append_file "app/assets/javascripts/store/all.js", "//= require store/spree_multi_slideshow\n"
-        #append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_slideshow\n"
+        append_file "app/assets/javascripts/admin/all.js", "//= require admin/spree_multi_slideshow\n"
       end
 
       def add_stylesheets
         inject_into_file "app/assets/stylesheets/store/all.css", " *= require store/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
-        inject_into_file "app/assets/stylesheets/admin/all.css", " *= require admin/spree_multi_slideshow\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations
@@ -33,16 +23,6 @@ module SpreeMultiSlideshow
            puts "Skiping rake db:migrate, don't forget to run it!"
          end
       end
-      
-      def add_ckeditor
-        res = ask "Would you like to run the ckeditor generator now? [Y/n]"
-        if res == "" || res.downcase == "y"
-          run 'rails generate ckeditor:install --orm=active_record --backend=paperclip'
-        else
-          puts "Skiping rails generate ckeditor:install --orm=active_record --backend=paperclip, don't forget to run it!"
-        end
-      end
-      
     end
   end
 end

data/lib/spree_multi_slideshow.rb

@@ -1,4 +1,2 @@
 require 'spree_core'
-require 'ckeditor'
-require 'formtastic'
 require 'spree_multi_slideshow/engine'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_multi_slideshow
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-26 00:00:00.000000000 Z
+date: 2013-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.3.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -43,22 +43,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: formtastic
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: paperclip
   requirement: !ruby/object:Gem::Requirement
@@ -75,38 +59,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ckeditor
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rspec-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email: damiano.giacomello@diginess.it
 executables: []
@@ -118,36 +70,37 @@ files:
 - lib/generators/spree_multi_slideshow/install/install_generator.rb
 - lib/spree_multi_slideshow/engine.rb
 - lib/spree_multi_slideshow.rb
-- app/assets/images/store/slides/bg-gallery.png
-- app/assets/images/store/slides/bg-text02.png
-- app/assets/images/store/slides/sprite01.png
-- app/assets/javascripts/admin/slides/index.js
-- app/assets/javascripts/admin/slides/new.js
+- app/assets/images/store/bx_loader.gif
+- app/assets/images/store/controls.png
+- app/assets/javascripts/admin/slide_settings.js.erb
+- app/assets/javascripts/admin/slides/index.js.coffee
+- app/assets/javascripts/admin/slides/new.js.coffee
 - app/assets/javascripts/admin/spree_multi_slideshow.js
-- app/assets/javascripts/store/fadeGallery.js
 - app/assets/javascripts/store/spree_multi_slideshow.js
-- app/assets/stylesheets/admin/spree_multi_slideshow.css
-- app/assets/stylesheets/store/carousel_slideshow.css.scss
 - app/assets/stylesheets/store/spree_multi_slideshow.css
+- app/controllers/spree/admin/slide_settings_controller.rb
 - app/controllers/spree/admin/slides_controller.rb
-- app/controllers/spree/admin/slideshow_types_controller.rb
-- app/controllers/spree/slides_controller.rb
-- app/controllers/spree/slideshow_types_controller.rb
-- app/helpers/spree/slides_helper.rb
-- app/helpers/spree/slideshow_types_helper.rb
+- app/controllers/spree/admin/slideshows_controller.rb
+- app/helpers/spree/slideshows_helper.rb
+- app/models/spree/app_configuration_decorator.rb
+- app/models/spree/product_decorator.rb
 - app/models/spree/slide.rb
-- app/models/spree/slideshow_type.rb
-- app/overrides/slideshow_type_admin_tab.rb
-- app/views/spree/admin/shared/_slideshow_type_tabs.html.erb
+- app/models/spree/slideshow.rb
+- app/models/spree/taxon_decorator.rb
+- app/overrides/slideshow_admin_tab.rb
+- app/views/spree/admin/shared/_slideshow_sub_menu.html.erb
+- app/views/spree/admin/shared/_slideshow_tabs.html.erb
+- app/views/spree/admin/slide_settings/edit.html.erb
 - app/views/spree/admin/slides/_form.html.erb
 - app/views/spree/admin/slides/edit.html.erb
 - app/views/spree/admin/slides/index.html.erb
 - app/views/spree/admin/slides/new.html.erb
-- app/views/spree/admin/slideshow_types/_form.html.erb
-- app/views/spree/admin/slideshow_types/edit.html.erb
-- app/views/spree/admin/slideshow_types/index.html.erb
-- app/views/spree/admin/slideshow_types/new.html.erb
-- db/migrate/20120116081431_create_slideshow_types.rb
+- app/views/spree/admin/slideshows/_form.html.erb
+- app/views/spree/admin/slideshows/edit.html.erb
+- app/views/spree/admin/slideshows/index.html.erb
+- app/views/spree/admin/slideshows/new.html.erb
+- app/views/spree/admin/slideshows/new.js.erb
+- db/migrate/20120116081431_create_slideshows.rb
 - db/migrate/20120116083546_create_slides.rb
 - db/migrate/20120323164044_multi_slideshow_namespace.rb
 - config/locales/en.yml

data/app/assets/javascripts/admin/slides/index.js

@@ -1,10 +0,0 @@
-$(document).ready(function(){
-
-  $('#new_slide_link').click(function (event) {
-    event.preventDefault();
-    $(this).hide();
-    $.ajax({type: 'GET', url: this.href, data: ({authenticity_token: AUTH_TOKEN}),
-            success: function(r){ $('#slides').html(r);} });
-  });
-
-});

data/app/assets/javascripts/admin/slides/new.js

@@ -1,5 +0,0 @@
-$('#cancel_link').click(function (event) {
-  event.preventDefault();
-  $('#new_slide_link').show();
-  $('#slides').html('');
-});

data/app/assets/javascripts/store/fadeGallery.js

@@ -1,229 +0,0 @@
-// page init
-jQuery(function($) {
-	initGalleries();
-});
-
-// galleries init
-function initGalleries(){
-	// main banner slideshow
-	jQuery('div.gallery').fadeGallery({
-		autoRotation: true,
-		switchTime: 5000, //ms
-		duration: 800 //ms
-	});
-};
-
-// slideshow plugin
-jQuery.fn.fadeGallery = function(_options){
-	var _options = jQuery.extend({
-		slideElements:'div.gallery-inner > ul > li',
-		pagerGener: false,
-		pagerHold: false,
-		pagerLinks:'ul.nav-list li',
-		btnNext:'a.gallery-control.right',
-		btnPrev:'a.gallery-control.left',
-		btnPlayPause:'a.play-pause',
-		btnPlay:'a.play',
-		btnPause:'a.pause',
-		pausedClass:'paused',
-		disabledClass: 'disabled',
-		playClass:'playing',
-		activeClass:'active',
-		currentNum:false,
-		allNum:false,
-		startSlide:null,
-		noCircle:false,
-		caption:'ul.caption > li',
-		pauseOnHover:false,
-		autoRotation:false,
-		autoHeight:false,
-		onChange:false,
-		switchTime:3000,
-		duration:650,
-		event:'click'
-	},_options);
-
-	return this.each(function(){
-		// gallery options
-		var _this = jQuery(this);
-		var _slides = jQuery(_options.slideElements, _this);
-		var _btnPrev = jQuery(_options.btnPrev, _this);
-		var _btnNext = jQuery(_options.btnNext, _this);
-		var _btnPlayPause = jQuery(_options.btnPlayPause, _this);
-		var _btnPause = jQuery(_options.btnPause, _this);
-		var _btnPlay = jQuery(_options.btnPlay, _this);
-		var _pauseOnHover = _options.pauseOnHover;
-		var _autoRotation = _options.autoRotation;
-		var _activeClass = _options.activeClass;
-		var _disabledClass = _options.disabledClass;
-		var _pausedClass = _options.pausedClass;
-		var _playClass = _options.playClass;
-		var _autoHeight = _options.autoHeight;
-		var _duration = _options.duration;
-		var _switchTime = _options.switchTime;
-		var _controlEvent = _options.event;
-		var _currentNum = (_options.currentNum ? jQuery(_options.currentNum, _this) : false);
-		var _allNum = (_options.allNum ? jQuery(_options.allNum, _this) : false);
-		var _startSlide = _options.startSlide;
-		var _noCycle = _options.noCircle;
-		var _onChange = _options.onChange;
-		var _pagerGener = _options.pagerGener;
-		var _pagerHold = jQuery(_options.pagerHold,_this);
-		var _caption = jQuery(_options.caption,_this);
-		var _paging = '';
-		if(_pagerGener){
-			for(var i=0; i< _slides.length; i++){
-				_paging += '<li><a href="#">'+(i+1)+'</a></li>';
-			}
-			_pagerHold.html('<ul>'+_paging+'</ul>');
-		}
-		var _pagerLinks = jQuery(_options.pagerLinks, _this);
-		// gallery init
-		var _hover = false;
-		var _prevIndex = 0;
-		var _currentIndex = 0;
-		var _slideCount = _slides.length;
-		var _timer;
-		if(_slideCount < 2) return;
-
-		_prevIndex = _slides.index(_slides.filter('.'+_activeClass));
-		if(_prevIndex < 0) _prevIndex = _currentIndex = 0;
-		else _currentIndex = _prevIndex;
-		if(_startSlide != null) {
-			if(_startSlide == 'random') _prevIndex = _currentIndex = Math.floor(Math.random()*_slideCount);
-			else _prevIndex = _currentIndex = parseInt(_startSlide);
-		}
-		_slides.hide().eq(_currentIndex).show();
-		_caption.hide().eq(_currentIndex).show();
-		if(_autoRotation) _this.removeClass(_pausedClass).addClass(_playClass);
-		else _this.removeClass(_playClass).addClass(_pausedClass);
-
-		// gallery control
-		if(_btnPrev.length) {
-			_btnPrev.bind(_controlEvent,function(){
-				prevSlide();
-				return false;
-			});
-		}
-		if(_btnNext.length) {
-			_btnNext.bind(_controlEvent,function(){
-				nextSlide();
-				return false;
-			});
-		}
-		if(_pagerLinks.length) {
-			_pagerLinks.each(function(_ind){
-				jQuery(this).bind(_controlEvent,function(){
-					if(_currentIndex != _ind) {
-						_prevIndex = _currentIndex;
-						_currentIndex = _ind;
-						switchSlide();
-					}
-					return false;
-				});
-			});
-		}
-
-		// play pause section
-		if(_btnPlayPause.length) {
-			_btnPlayPause.bind(_controlEvent,function(){
-				if(_this.hasClass(_pausedClass)) {
-					_this.removeClass(_pausedClass).addClass(_playClass);
-					_autoRotation = true;
-					autoSlide();
-				} else {
-					_autoRotation = false;
-					if(_timer) clearTimeout(_timer);
-					_this.removeClass(_playClass).addClass(_pausedClass);
-				}
-				return false;
-			});
-		}
-		if(_btnPlay.length) {
-			_btnPlay.bind(_controlEvent,function(){
-				_this.removeClass(_pausedClass).addClass(_playClass);
-				_autoRotation = true;
-				autoSlide();
-				return false;
-			});
-		}
-		if(_btnPause.length) {
-			_btnPause.bind(_controlEvent,function(){
-				_autoRotation = false;
-				if(_timer) clearTimeout(_timer);
-				_this.removeClass(_playClass).addClass(_pausedClass);
-				return false;
-			});
-		}
-		// gallery animation
-		function prevSlide() {
-			_prevIndex = _currentIndex;
-			if(_currentIndex > 0) _currentIndex--;
-			else {
-				if(_noCycle) return;
-				else _currentIndex = _slideCount-1;
-			}
-			switchSlide();
-		}
-		function nextSlide() {
-			_prevIndex = _currentIndex;
-			if(_currentIndex < _slideCount-1) _currentIndex++;
-			else {
-				if(_noCycle) return;
-				else _currentIndex = 0;
-			}
-			switchSlide();
-		}
-		function refreshStatus() {
-			if(_pagerLinks.length) _pagerLinks.removeClass(_activeClass).eq(_currentIndex).addClass(_activeClass);
-			if(_currentNum) _currentNum.text(_currentIndex+1);
-			if(_allNum) _allNum.text(_slideCount);
-			_slides.eq(_prevIndex).removeClass(_activeClass);
-			_slides.eq(_currentIndex).addClass(_activeClass);
-			if(_noCycle) {
-				if(_btnPrev.length) {
-					if(_currentIndex == 0) _btnPrev.addClass(_disabledClass);
-					else _btnPrev.removeClass(_disabledClass);
-				}
-				if(_btnNext.length) {
-					if(_currentIndex == _slideCount-1) _btnNext.addClass(_disabledClass);
-					else _btnNext.removeClass(_disabledClass);
-				}
-			}
-			if(typeof _onChange === 'function') {
-				_onChange(_this, _currentIndex);
-			}
-		}
-		function switchSlide() {
-			_slides.eq(_prevIndex).stop().animate({opacity:0},{duration: _duration, queue: false,complete:function(){
-				jQuery(this).css({display:'none'});
-			}})
-			_slides.eq(_currentIndex).stop().css({display:'block',opacity:0}).animate({opacity:1},{duration: _duration, queue: false,complete:function(){
-				jQuery(this).css({opacity:''});
-			}})
-			_caption.eq(_prevIndex).fadeOut();
-			_caption.eq(_currentIndex).fadeIn();
-			if(_autoHeight) _slides.eq(_currentIndex).parent().animate({height:_slides.eq(_currentIndex).outerHeight(true)},{duration:_duration,queue:false});
-			refreshStatus();
-			autoSlide();
-		}
-
-		// autoslide function
-		function autoSlide() {
-			if(!_autoRotation || _hover) return;
-			if(_timer) clearTimeout(_timer);
-			_timer = setTimeout(nextSlide,_switchTime+_duration);
-		}
-		if(_pauseOnHover) {
-			_this.hover(function(){
-				_hover = true;
-				if(_timer) clearTimeout(_timer);
-			},function(){
-				_hover = false;
-				autoSlide();
-			});
-		}
-		refreshStatus();
-		autoSlide();
-	});
-};