adminpanel 2.1.7 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29da0ab7934a207e655ae798422d487cf95aa113
-  data.tar.gz: 162367dba7e94eacd6d246a6829d2d1a71ca44c7
+  metadata.gz: f84a209292db49342941725abd3f75e4f12c3058
+  data.tar.gz: 41a69bde0bfab0a8b24bee98a6ca75564966a51e
 SHA512:
-  metadata.gz: a362a95b1f340f7ce1b1a0c3a4d0fefb37f1aab00bd408ed96252f80b401bee2a4666b2faf33743ebbb839b5d846d4a0523da3848da9bd548283ac9d06926664
-  data.tar.gz: 785958fa8f8db09d066e7579b5bea0b957fdf865a79832711a16619119c8b5679356b18abee964c3d54b61919385555912f9450c6957386433e5b6bd1745f0f3
+  metadata.gz: 20fdceadae757d3108d236257263300231dda0f5ef36814e03bbadea1d39ad571fb986858080efacfbe9d3fd4e89be064b3aff62430eb9d8c3219d940a9da6d9
+  data.tar.gz: 2214f3c49105376a9397952a80384ed292a116064fd1dce0248d4796c4ae5d0874c19e414feb5f0b318bc02a2aa44c3c489a5ca73063b7a70ce984447f239e24

data/.travis.yml

@@ -1,7 +1,15 @@
 language: ruby
+
 rvm:
-  - 2.1.1
+  - 2.1
+
+sudo: false
+
+cache: bundler
+
 env:
-  - RAILS=4.0.4
-  - RAILS=4.1.0
+  - RAILS=4.0.8
   - RAILS=4.1.1
+  - RAILS=4.1.2
+  - RAILS=4.1.3
+  - RAILS=4.1.4

data/Gemfile

@@ -1,32 +1,8 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in adminpanel.gemspec
-# gemspec
-
-gem 'rails', '>= 4.0.0', '<= 4.1.1'
-gem 'carrierwave', '~> 0.10.0'
-gem 'rmagick', '2.13.2', require: false
-gem 'jquery-rails', '~> 3.1.0'
-gem 'bcrypt', '~> 3.1.7'
-gem 'rails-i18n', '~> 4.0.2'
-gem 'inherited_resources', '~> 1.4.1'
-gem 'google-api-client', '~> 0.7.1'
-gem 'cancancan', '>= 1.7.1', '<= 1.8'
-gem 'faker', '>= 1.3.0'
-gem 'turbolinks', '>= 2.2.2'
-gem 'font-awesome-rails', '>= 4.0.3.1'
-gem 'koala', '>= 1.9.0', '<= 2.0.0'
+gemspec :development_group => :test
 
 group :assets do
-	gem 'coffee-script', require: true
-	gem 'sass-rails', '>= 4.0.3', require: true
-end
-
-group :development, :test do
-	gem 'minitest', '>= 5.3.4', '<= 6.0.0'
-	gem 'sqlite3', '>= 1.3.9', '<= 2.0.0', :platform => [:ruby, :mswin, :mingw]
-	gem 'minitest-emoji', '2.0.0'
-	gem 'minitest-capybara', '>= 0.6.1', '<= 1.0.0'
-	# gem 'mocha'
-	gem 'poltergeist', '>= 1.5.1', '<= 2.0.0'
+  gem 'sass-rails', '~> 4.0'
+  gem 'coffee-rails', '~> 4.0.1'
 end

data/adminpanel.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |spec|
   spec.version       = Adminpanel::VERSION
   spec.authors       = ['Jose Ramon Camacho', 'Victor Camacho']
   spec.email         = ['info@codn.mx']
-  spec.description   = %q{Gem that makes the CMS for a site a breeze!, supports facebook sharing and analytics integration}
+  spec.description   = %q{Gem that makes the CMS for a site a breeze!, supports facebook sharing, twitter, instagram and analytics integration}
   spec.summary       = %q{Made with <3 by CoDN}
   spec.homepage      = 'https://github.com/joseramonc/adminpanel'
   spec.license       = 'MIT'
@@ -20,29 +20,30 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.0.0'
 
-  spec.requirements  << 'rmagick, v 2.13.2'
+  spec.requirements  << 'rmagick, -v 2.13.2'
 
-  spec.add_runtime_dependency 'rails', '>= 4.0.0', '<= 4.1.1'
-  spec.add_runtime_dependency 'carrierwave', '>= 0.10.0', '<= 1.0.0'
-  spec.add_runtime_dependency 'rmagick', '2.13.2'
-  spec.add_runtime_dependency 'jquery-rails', '>= 3.1.0', '<= 4.0.0'
-  spec.add_runtime_dependency 'turbolinks', '>= 2.2.2', '<= 3.0.0'
-  spec.add_runtime_dependency 'bcrypt', '>= 3.1.7', '<= 4.0.0'
-  spec.add_runtime_dependency 'rails-i18n', '>= 4.0.2', '<= 4.1.0'
-  spec.add_runtime_dependency 'inherited_resources', '>= 1.4.1', '<= 2.0.0'
-  spec.add_runtime_dependency 'cancancan', '>= 1.7', '<= 2.0.0'
-  spec.add_runtime_dependency 'google-api-client', '>= 0.7.1', '<= 1.0.0'
-  spec.add_runtime_dependency 'faker', '>= 1.3.0', '<= 2.0.0'
-  spec.add_runtime_dependency 'sass-rails', '>= 4.0.3', '<= 4.1.0'
-  spec.add_runtime_dependency 'font-awesome-rails', '>= 4.0.3.1', '<= 4.1.0'
-  spec.add_runtime_dependency 'koala', '>= 1.9.0', '<= 2.0.0'
-  spec.add_runtime_dependency 'coffee-script', '>= 2.2.0', '<= 3.0.0'
+  spec.add_runtime_dependency 'rails',                '>= 4.0.0','<= 4.1.4'
+  spec.add_runtime_dependency 'rmagick',              '2.13.2'
+  spec.add_runtime_dependency 'bcrypt',               '~> 3.1',  '>= 3.1.7'
+  spec.add_runtime_dependency 'carrierwave',          '~> 0.10', '>= 0.10.0'
+  spec.add_runtime_dependency 'rails-i18n',           '~> 4.0'
+  spec.add_runtime_dependency 'inherited_resources',  '~> 1.5'
+  spec.add_runtime_dependency 'cancancan',            '~> 1.8'
+  spec.add_runtime_dependency 'google-api-client',    '0.7.1'
+  spec.add_runtime_dependency 'faker',                '~> 1.3',   '>= 1.3.0'
+  spec.add_runtime_dependency 'font-awesome-rails',   '~> 4.1',   '>= 4.1.0'
+  spec.add_runtime_dependency 'koala',                '1.9.0'
+  spec.add_runtime_dependency 'twitter',              '5.11.0'
+  spec.add_runtime_dependency 'omniauth-twitter',     '1.0.1'
+  spec.add_runtime_dependency 'instagram',            '1.1.1'
 
-  spec.add_development_dependency 'sqlite3', '>= 1.3.9', '<= 2.0.0'
-  spec.add_development_dependency 'minitest', '>= 5.3.4', '<= 6.0.0'
-  spec.add_development_dependency 'minitest-emoji', '2.0.0'
-  spec.add_development_dependency 'minitest-capybara', '>= 0.6.1', '<= 1.0.0'
+  spec.add_development_dependency 'jquery-rails',     '~> 3.0.0', '>= 3.0.0'
+  spec.add_development_dependency 'turbolinks',       '~> 2.2.2', '>= 2.2.2'
+
+  spec.add_development_dependency 'sqlite3',          '~> 1.3',   '1.3.9'
+  spec.add_development_dependency 'minitest',         '5.3.5'
+  spec.add_development_dependency 'minitest-emoji',   '2.0.0'
+  spec.add_development_dependency 'minitest-capybara','~> 0.7',   '>= 0.7.1'
   # spec.add_development_dependency 'mocha'
-  spec.add_development_dependency 'poltergeist', '>= 1.5.1', '<= 2.0.0'
-  # spec.add_development_dependency 'minitest-debugger'
+  spec.add_development_dependency 'poltergeist',      '~> 1.5',   '>= 1.5.1'
 end

data/app/assets/javascripts/adminpanel/bootstrap-wysihtml5-4pre.js

@@ -3244,143 +3244,143 @@ rangy.createModule("DomUtil", function(api, module) {
     });
 });
 /*
-	Base.js, version 1.1a
-	Copyright 2006-2010, Dean Edwards
-	License: http://www.opensource.org/licenses/mit-license.php
+  Base.js, version 1.1a
+  Copyright 2006-2010, Dean Edwards
+  License: http://www.opensource.org/licenses/mit-license.php
 */
 
 var Base = function() {
-	// dummy
+  // dummy
 };
 
 Base.extend = function(_instance, _static) { // subclass
-	var extend = Base.prototype.extend;
+  var extend = Base.prototype.extend;
 
-	// build the prototype
-	Base._prototyping = true;
-	var proto = new this;
-	extend.call(proto, _instance);
+  // build the prototype
+  Base._prototyping = true;
+  var proto = new this;
+  extend.call(proto, _instance);
   proto.base = function() {
     // call this method from any other method to invoke that method's ancestor
   };
-	delete Base._prototyping;
-
-	// create the wrapper for the constructor function
-	//var constructor = proto.constructor.valueOf(); //-dean
-	var constructor = proto.constructor;
-	var klass = proto.constructor = function() {
-		if (!Base._prototyping) {
-			if (this._constructing || this.constructor == klass) { // instantiation
-				this._constructing = true;
-				constructor.apply(this, arguments);
-				delete this._constructing;
-			} else if (arguments[0] != null) { // casting
-				return (arguments[0].extend || extend).call(arguments[0], proto);
-			}
-		}
-	};
-
-	// build the class interface
-	klass.ancestor = this;
-	klass.extend = this.extend;
-	klass.forEach = this.forEach;
-	klass.implement = this.implement;
-	klass.prototype = proto;
-	klass.toString = this.toString;
-	klass.valueOf = function(type) {
-		//return (type == "object") ? klass : constructor; //-dean
-		return (type == "object") ? klass : constructor.valueOf();
-	};
-	extend.call(klass, _static);
-	// class initialisation
-	if (typeof klass.init == "function") klass.init();
-	return klass;
+  delete Base._prototyping;
+
+  // create the wrapper for the constructor function
+  //var constructor = proto.constructor.valueOf(); //-dean
+  var constructor = proto.constructor;
+  var klass = proto.constructor = function() {
+    if (!Base._prototyping) {
+      if (this._constructing || this.constructor == klass) { // instantiation
+        this._constructing = true;
+        constructor.apply(this, arguments);
+        delete this._constructing;
+      } else if (arguments[0] != null) { // casting
+        return (arguments[0].extend || extend).call(arguments[0], proto);
+      }
+    }
+  };
+
+  // build the class interface
+  klass.ancestor = this;
+  klass.extend = this.extend;
+  klass.forEach = this.forEach;
+  klass.implement = this.implement;
+  klass.prototype = proto;
+  klass.toString = this.toString;
+  klass.valueOf = function(type) {
+    //return (type == "object") ? klass : constructor; //-dean
+    return (type == "object") ? klass : constructor.valueOf();
+  };
+  extend.call(klass, _static);
+  // class initialisation
+  if (typeof klass.init == "function") klass.init();
+  return klass;
 };
 
 Base.prototype = {
-	extend: function(source, value) {
-		if (arguments.length > 1) { // extending with a name/value pair
-			var ancestor = this[source];
-			if (ancestor && (typeof value == "function") && // overriding a method?
-				// the valueOf() comparison is to avoid circular references
-				(!ancestor.valueOf || ancestor.valueOf() != value.valueOf()) &&
-				/\bbase\b/.test(value)) {
-				// get the underlying method
-				var method = value.valueOf();
-				// override
-				value = function() {
-					var previous = this.base || Base.prototype.base;
-					this.base = ancestor;
-					var returnValue = method.apply(this, arguments);
-					this.base = previous;
-					return returnValue;
-				};
-				// point to the underlying method
-				value.valueOf = function(type) {
-					return (type == "object") ? value : method;
-				};
-				value.toString = Base.toString;
-			}
-			this[source] = value;
-		} else if (source) { // extending with an object literal
-			var extend = Base.prototype.extend;
-			// if this object has a customised extend method then use it
-			if (!Base._prototyping && typeof this != "function") {
-				extend = this.extend || extend;
-			}
-			var proto = {toSource: null};
-			// do the "toString" and other methods manually
-			var hidden = ["constructor", "toString", "valueOf"];
-			// if we are prototyping then include the constructor
-			var i = Base._prototyping ? 0 : 1;
-			while (key = hidden[i++]) {
-				if (source[key] != proto[key]) {
-					extend.call(this, key, source[key]);
-
-				}
-			}
-			// copy each of the source object's properties to this object
-			for (var key in source) {
-				if (!proto[key]) extend.call(this, key, source[key]);
-			}
-		}
-		return this;
-	}
+  extend: function(source, value) {
+    if (arguments.length > 1) { // extending with a name/value pair
+      var ancestor = this[source];
+      if (ancestor && (typeof value == "function") && // overriding a method?
+        // the valueOf() comparison is to avoid circular references
+        (!ancestor.valueOf || ancestor.valueOf() != value.valueOf()) &&
+        /\bbase\b/.test(value)) {
+        // get the underlying method
+        var method = value.valueOf();
+        // override
+        value = function() {
+          var previous = this.base || Base.prototype.base;
+          this.base = ancestor;
+          var returnValue = method.apply(this, arguments);
+          this.base = previous;
+          return returnValue;
+        };
+        // point to the underlying method
+        value.valueOf = function(type) {
+          return (type == "object") ? value : method;
+        };
+        value.toString = Base.toString;
+      }
+      this[source] = value;
+    } else if (source) { // extending with an object literal
+      var extend = Base.prototype.extend;
+      // if this object has a customised extend method then use it
+      if (!Base._prototyping && typeof this != "function") {
+        extend = this.extend || extend;
+      }
+      var proto = {toSource: null};
+      // do the "toString" and other methods manually
+      var hidden = ["constructor", "toString", "valueOf"];
+      // if we are prototyping then include the constructor
+      var i = Base._prototyping ? 0 : 1;
+      while (key = hidden[i++]) {
+        if (source[key] != proto[key]) {
+          extend.call(this, key, source[key]);
+
+        }
+      }
+      // copy each of the source object's properties to this object
+      for (var key in source) {
+        if (!proto[key]) extend.call(this, key, source[key]);
+      }
+    }
+    return this;
+  }
 };
 
 // initialise
 Base = Base.extend({
-	constructor: function() {
-		this.extend(arguments[0]);
-	}
+  constructor: function() {
+    this.extend(arguments[0]);
+  }
 }, {
-	ancestor: Object,
-	version: "1.1",
-
-	forEach: function(object, block, context) {
-		for (var key in object) {
-			if (this.prototype[key] === undefined) {
-				block.call(context, object[key], key, object);
-			}
-		}
-	},
-
-	implement: function() {
-		for (var i = 0; i < arguments.length; i++) {
-			if (typeof arguments[i] == "function") {
-				// if it's a function, call it
-				arguments[i](this.prototype);
-			} else {
-				// add the interface using the extend method
-				this.prototype.extend(arguments[i]);
-			}
-		}
-		return this;
-	},
-
-	toString: function() {
-		return String(this.valueOf());
-	}
+  ancestor: Object,
+  version: "1.1",
+
+  forEach: function(object, block, context) {
+    for (var key in object) {
+      if (this.prototype[key] === undefined) {
+        block.call(context, object[key], key, object);
+      }
+    }
+  },
+
+  implement: function() {
+    for (var i = 0; i < arguments.length; i++) {
+      if (typeof arguments[i] == "function") {
+        // if it's a function, call it
+        arguments[i](this.prototype);
+      } else {
+        // add the interface using the extend method
+        this.prototype.extend(arguments[i]);
+      }
+    }
+    return this;
+  },
+
+  toString: function() {
+    return String(this.valueOf());
+  }
 });/**
  * Detect browser support for specific features
  */
@@ -9457,7 +9457,7 @@ wysihtml5.views.Textarea = wysihtml5.views.View.extend(
     // Array (or single string) of stylesheet urls to be loaded in the editor's iframe
     stylesheets:          [],
     // Placeholder text to use, defaults to the placeholder attribute on the textarea element
-    placeholderText:      undef,
+    placeholderText:      'Lorem ipsum dolor sit amec',
     // Whether the rich text editor should be rendered on touch devices (wysihtml5 >= 0.3.0 comes with basic support for iOS 5)
     supportTouchDevices:  true
   };

data/app/assets/javascripts/adminpanel/spinner.js.coffee

@@ -1,11 +1,11 @@
-$(document).on 'click', 'a.accordion-toggle', ->
+$(document).on 'click', 'a.spinner-link', ->
   $( this ).attr 'data-clicked', true
 
 $(document).on 'page:fetch', ->
-  $('a.accordion-toggle[data-clicked="true"]').children('i:first').toggleClass('hidden')
-  $('a.accordion-toggle[data-clicked="true"]').prepend '<i class="fa fa-spinner fa-spin"></i>'
+  $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass('hidden')
+  $('a.spinner-link[data-clicked="true"]').prepend '<i class="fa fa-spinner fa-spin"></i>'
 
 $(document).on 'page:restore', ->
-  $('a.accordion-toggle[data-clicked="true"]').children('i:first').remove()
-  $('a.accordion-toggle[data-clicked="true"]').children('i:first').toggleClass 'hidden'
-  $('a.accordion-toggle[data-clicked="true"]').data 'clicked', false
+  $('a.spinner-link[data-clicked="true"]').children('i:first').remove()
+  $('a.spinner-link[data-clicked="true"]').children('i:first').toggleClass 'hidden'
+  $('a.spinner-link[data-clicked="true"]').data 'clicked', false

data/app/assets/stylesheets/adminpanel/bootstrap-wysihtml5.css

@@ -1,102 +1,48 @@
 ul.wysihtml5-toolbar {
-	margin: 0;
-	padding: 0;
-	display: block;
+  margin: 0;
+  padding: 0;
+  display: block;
 }
 
 ul.wysihtml5-toolbar::after {
-	clear: both;
-	display: table;
-	content: "";
+  clear: both;
+  display: table;
+  content: "";
 }
 
 ul.wysihtml5-toolbar > li {
-	float: left;
-	display: list-item;
-	list-style: none;
-	margin: 0 5px 10px 0;
+  float: left;
+  display: list-item;
+  list-style: none;
+  margin: 0 5px 10px 0;
 }
 
 ul.wysihtml5-toolbar a[data-wysihtml5-command=bold] {
-	font-weight: bold;
+  font-weight: bold;
 }
 
 ul.wysihtml5-toolbar a[data-wysihtml5-command=italic] {
-	font-style: italic;
+  font-style: italic;
 }
 
 ul.wysihtml5-toolbar a[data-wysihtml5-command=underline] {
-	text-decoration: underline;
+  text-decoration: underline;
 }
 
 ul.wysihtml5-toolbar a.btn.wysihtml5-command-active {
-	background-image: none;
-	-webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
-	-moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
-	box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
-	background-color: #E6E6E6;
-	background-color: #D9D9D9;
-	outline: 0;
+  background-image: none;
+  -webkit-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+  -moz-box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+  box-shadow: inset 0 2px 4px rgba(0, 0, 0, 0.15),0 1px 2px rgba(0, 0, 0, 0.05);
+  background-color: #E6E6E6;
+  background-color: #D9D9D9;
+  outline: 0;
 }
 
 ul.wysihtml5-commands-disabled .dropdown-menu {
-	display: none !important;
-}
-
-ul.wysihtml5-toolbar div.wysihtml5-colors {
-  display:block;
-  width: 50px;
-  height: 20px;
-  margin-top: 2px;
-  margin-left: 5px;
-  position: absolute;
-  pointer-events: none;
+  display: none !important;
 }
 
 ul.wysihtml5-toolbar a.wysihtml5-colors-title {
   padding-left: 70px;
 }
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="black"] {
-  background: black !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="silver"] {
-  background: silver !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="gray"] {
-  background: gray !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="maroon"] {
-  background: maroon !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="red"] {
-  background: red !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="purple"] {
-  background: purple !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="green"] {
-  background: green !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="olive"] {
-  background: olive !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="navy"] {
-  background: navy !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="blue"] {
-  background: blue !important;
-}
-
-ul.wysihtml5-toolbar div[data-wysihtml5-command-value="orange"] {
-  background: orange !important;
-}