caseadilla 0.0.10 → 0.0.11

data/app/helpers/caseadilla/caseadilla_helper.rb

@@ -124,9 +124,9 @@ module Caseadilla
       caseadilla_form_tag_wrapper(form.text_area(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control'))), form, obj, attribute, options).html_safe
     end
 
-    def caseadilla_text_area_wysiwyg form, obj, attribute, options = {}
+    def caseadilla_text_area_wysiwym form, obj, attribute, options = {}
       options.reverse_merge!({style: "height: 250px;"})
-      caseadilla_form_tag_wrapper(form.text_area(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control wysihtml5'))), form, obj, attribute, options).html_safe
+      caseadilla_form_tag_wrapper(form.text_area(attribute, strip_caseadilla_options(options_hash_with_merged_classes(options, 'form-control wysiwym'))), form, obj, attribute, options).html_safe
     end
 
     def caseadilla_check_box form, obj, attribute, options = {}

data/app/views/layouts/caseadilla_main.html.erb

@@ -8,11 +8,13 @@
   	<% caseadilla_config_stylesheet_includes.each do |stylesheet| %>
   		<%= stylesheet_link_tag(stylesheet) %>
   	<% end %>
+    <link rel="stylesheet" href="/assets/caseadilla/wymeditor/skins/compact/skin.css">
     <link rel="stylesheet" href="//cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.3/css/jasny-bootstrap.min.css">
 
   	<% caseadilla_config_javascript_includes.each do |javascript| %>
   		<%= javascript_include_tag(javascript) %>
   	<% end %>
+    <script src="/assets/caseadilla/wymeditor/jquery.wymeditor.min.js"></script>
     <script src="//cdnjs.cloudflare.com/ajax/libs/jasny-bootstrap/3.1.3/js/jasny-bootstrap.min.js"></script>
 
   	<%= csrf_meta_tag %>

data/caseadilla.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |spec|
   spec.summary       = "A powerful yet unobtrusive CMS and data management system for Rails."
   spec.homepage      = "http://www.xavierbick.com"
   spec.license       = "MIT"
-  spec.required_ruby_version = "2.0.0"
+  spec.required_ruby_version = "~> 2.0.0"
 
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }

data/lib/caseadilla.rb

@@ -1,7 +1,7 @@
 require "caseadilla/version"
 
 if defined?(Rails) && Rails::VERSION::MAJOR == 4
-	require 'caseadilla/engine' 
+	require 'caseadilla/engine'
 	require 'will_paginate'
 	if Caseadilla::Engine.flavor = :steak
 		require 'devise'
@@ -11,4 +11,4 @@ else
 	puts("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
 	puts("!!! WARNING !!! Caseadilla requires Rails >= 4.x !!!")
 	puts("!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!")
-end
+end

data/lib/caseadilla/version.rb

@@ -1,3 +1,3 @@
 module Caseadilla
-  VERSION = "0.0.10"
+  VERSION = "0.0.11"
 end

data/lib/generators/caseadilla/scaffold/scaffold_generator.rb

@@ -101,7 +101,7 @@ module Caseadilla
         when :time, :timestamp            then :time_select
         when :datetime                    then :datetime_select
         when :string                      then :text_field
-        when :text                        then :text_area_wysiwyg
+        when :text                        then :text_area_wysiwym
         when :boolean                     then :check_box
       else
         :text_field

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: caseadilla
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Xavier Bick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-31 00:00:00.000000000 Z
+date: 2015-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -130,13 +130,167 @@ files:
 - app/assets/fonts/caseadilla/glyphicons-halflings-regular.woff
 - app/assets/images/caseadilla/caseadilla.png
 - app/assets/javascripts/caseadilla/bootstrap.js
-- app/assets/javascripts/caseadilla/bootstrap3-wysihtml5.js
 - app/assets/javascripts/caseadilla/caseadilla.js
 - app/assets/javascripts/caseadilla/html5shiv.js
-- app/assets/javascripts/caseadilla/wysihtml5-0.3.0.min.js
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-article.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-aside.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-blockquote.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-command.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-details.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-div.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-figcaption.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-figure.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-footer.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-h1.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-h2.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-h3.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-h4.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-h5.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-h6.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-header.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-hgroup.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-mark.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-meter.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-nav.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-p.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-pre.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-progress.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-rp.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-rt.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-ruby.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-section.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-summary.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/lbl-time.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/wymiframe.css
+- app/assets/javascripts/caseadilla/wymeditor/iframe/default/wymiframe.html
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-article.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-aside.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-blockquote.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-command.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-details.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-div.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-figcaption.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-figure.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-footer.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-h1.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-h2.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-h3.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-h4.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-h5.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-h6.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-header.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-hgroup.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-mark.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-meter.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-nav.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-p.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-pre.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-progress.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-rp.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-rt.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-ruby.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-section.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-summary.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/lbl-time.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/wymiframe.css
+- app/assets/javascripts/caseadilla/wymeditor/iframe/legacy/wymiframe.html
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/development.html
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/icon.png
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/visitor1.eot
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/visitor1.ttf
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/visitor1.woff
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/wymiframe.css
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/wymiframe.html
+- app/assets/javascripts/caseadilla/wymeditor/iframe/pretty/wymiframe.ie.css
+- app/assets/javascripts/caseadilla/wymeditor/jquery.wymeditor.min.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/embed/jquery.wymeditor.embed.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/fullscreen/icon_fullscreen.gif
+- app/assets/javascripts/caseadilla/wymeditor/plugins/fullscreen/jquery.wymeditor.fullscreen.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/hovertools/jquery.wymeditor.hovertools.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/list/jquery.wymeditor.list.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/rdfa/jquery.wymeditor.rdfa.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/resizable/jquery.wymeditor.resizable.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/structured_headings/jquery.wymeditor.structured_headings.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/structured_headings/ruler_arrow.png
+- app/assets/javascripts/caseadilla/wymeditor/plugins/structured_headings/structured_headings.css
+- app/assets/javascripts/caseadilla/wymeditor/plugins/table/jquery.wymeditor.table.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/table/table_delete_column.png
+- app/assets/javascripts/caseadilla/wymeditor/plugins/table/table_delete_row.png
+- app/assets/javascripts/caseadilla/wymeditor/plugins/table/table_insert_column.png
+- app/assets/javascripts/caseadilla/wymeditor/plugins/table/table_insert_row.png
+- app/assets/javascripts/caseadilla/wymeditor/plugins/table/table_join_row.png
+- app/assets/javascripts/caseadilla/wymeditor/plugins/tidy/jquery.wymeditor.tidy.js
+- app/assets/javascripts/caseadilla/wymeditor/plugins/tidy/wand.png
+- app/assets/javascripts/caseadilla/wymeditor/popup.html
+- app/assets/javascripts/caseadilla/wymeditor/skins/compact/icons.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/compact/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/default/icons.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/default/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/legacy/icons.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/legacy/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/minimal/images/bg.header.gif
+- app/assets/javascripts/caseadilla/wymeditor/skins/minimal/images/bg.selector.silver.gif
+- app/assets/javascripts/caseadilla/wymeditor/skins/minimal/images/bg.wymeditor.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/minimal/images/icons.silver.gif
+- app/assets/javascripts/caseadilla/wymeditor/skins/minimal/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/README.md
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/arrow_redo.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/arrow_undo.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/eye.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-blockquote.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-h1.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-h2.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-h3.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-h4.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-h5.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-h6.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-p.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/lbl-pre.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/link_add.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/link_break.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/page_code.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/page_paste.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/photo_add.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/right.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/star.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/style.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/table_add.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_align_center.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_align_justify.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_align_left.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_align_right.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_bold.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_heading_1.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_heading_2.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_heading_3.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_heading_4.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_heading_5.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_heading_6.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_indent.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_indent_remove.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_italic.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_list_bullets.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_list_numbers.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_paragraph.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_strikethrough.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_subscript.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_superscript.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/images/text_underline.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/skin.js
+- app/assets/javascripts/caseadilla/wymeditor/skins/refine/wymiframe.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/seamless/icons.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/seamless/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/silver/images/bg.header.gif
+- app/assets/javascripts/caseadilla/wymeditor/skins/silver/images/bg.selector.silver.gif
+- app/assets/javascripts/caseadilla/wymeditor/skins/silver/images/bg.wymeditor.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/silver/images/icons.silver.gif
+- app/assets/javascripts/caseadilla/wymeditor/skins/silver/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/twopanels/icons.png
+- app/assets/javascripts/caseadilla/wymeditor/skins/twopanels/skin.css
+- app/assets/javascripts/caseadilla/wymeditor/skins/wymeditor_icon.png
 - app/assets/stylesheets/caseadilla/bootstrap-glyphicons.css.scss
 - app/assets/stylesheets/caseadilla/bootstrap-theme.css
-- app/assets/stylesheets/caseadilla/bootstrap-wysihtml5.css
 - app/assets/stylesheets/caseadilla/bootstrap.css
 - app/assets/stylesheets/caseadilla/caseadilla-bootstrap-overrides.css.scss
 - app/assets/stylesheets/caseadilla/caseadilla.scss
@@ -201,7 +355,7 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '='
+  - - "~>"
     - !ruby/object:Gem::Version
       version: 2.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
@@ -211,7 +365,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.7
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A powerful yet unobtrusive CMS and data management system for Rails.

data/app/assets/javascripts/caseadilla/bootstrap3-wysihtml5.js

@@ -1,521 +0,0 @@
-!function($, wysi) {
-    "use strict";
-
-    var tpl = {
-        "font-styles": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li class='dropdown'>" +
-                "<a class='btn dropdown-toggle " + size + " btn-default' data-toggle='dropdown' href='#'>" +
-                "<i class='glyphicon glyphicon-font'></i>&nbsp;<span class='current-font'>" + locale.font_styles.normal + "</span>&nbsp;<b class='caret'></b>" +
-                "</a>" +
-                "<ul class='dropdown-menu'>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='div' tabindex='-1'>" + locale.font_styles.normal + "</a></li>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h1' tabindex='-1'>" + locale.font_styles.h1 + "</a></li>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h2' tabindex='-1'>" + locale.font_styles.h2 + "</a></li>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h3' tabindex='-1'>" + locale.font_styles.h3 + "</a></li>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h4'>" + locale.font_styles.h4 + "</a></li>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h5'>" + locale.font_styles.h5 + "</a></li>" +
-                "<li><a data-wysihtml5-command='formatBlock' data-wysihtml5-command-value='h6'>" + locale.font_styles.h6 + "</a></li>" +
-                "</ul>" +
-                "</li>";
-        },
-
-        "emphasis": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li>" +
-                "<div class='btn-group'>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='bold' title='CTRL+B' tabindex='-1'>" + locale.emphasis.bold + "</a>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='italic' title='CTRL+I' tabindex='-1'>" + locale.emphasis.italic + "</a>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='underline' title='CTRL+U' tabindex='-1'>" + locale.emphasis.underline + "</a>" +
-                "</div>" +
-                "</li>";
-        },
-
-        "lists": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li>" +
-                "<div class='btn-group'>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='insertUnorderedList' title='" + locale.lists.unordered + "' tabindex='-1'><i class='glyphicon glyphicon-list'></i></a>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='insertOrderedList' title='" + locale.lists.ordered + "' tabindex='-1'><i class='glyphicon glyphicon-th-list'></i></a>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='Outdent' title='" + locale.lists.outdent + "' tabindex='-1'><i class='glyphicon glyphicon-indent-right'></i></a>" +
-                "<a class='btn -" + size + " btn-default' data-wysihtml5-command='Indent' title='" + locale.lists.indent + "' tabindex='-1'><i class='glyphicon glyphicon-indent-left'></i></a>" +
-                "</div>" +
-                "</li>";
-        },
-
-        "link": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li>" +
-                ""+
-                "<div class='bootstrap-wysihtml5-insert-link-modal modal fade'>" +
-                "<div class='modal-dialog'>"+
-                "<div class='modal-content'>"+
-                "<div class='modal-header'>" +
-                "<a class='close' data-dismiss='modal'>&times;</a>" +
-                "<h4>" + locale.link.insert + "</h4>" +
-                "</div>" +
-                "<div class='modal-body'>" +
-                "<input value='http://' class='bootstrap-wysihtml5-insert-link-url form-control'>" +
-                "<label class='checkbox'> <input type='checkbox' class='bootstrap-wysihtml5-insert-link-target' checked>" + locale.link.target + "</label>" +
-                "</div>" +
-                "<div class='modal-footer'>" +
-                "<button class='btn btn-default' data-dismiss='modal'>" + locale.link.cancel + "</button>" +
-                "<button href='#' class='btn btn-primary' data-dismiss='modal'>" + locale.link.insert + "</button>" +
-                "</div>" +
-                "</div>" +
-                "</div>" +
-                "</div>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='createLink' title='" + locale.link.insert + "' tabindex='-1'><i class='glyphicon glyphicon-share'></i></a>" +
-                "</li>";
-        },
-
-        "image": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li>" +
-                "<div class='bootstrap-wysihtml5-insert-image-modal modal fade'>" +
-                "<div class='modal-dialog'>"+
-                "<div class='modal-content'>"+
-                "<div class='modal-header'>" +
-                "<a class='close' data-dismiss='modal'>&times;</a>" +
-                "<h4>" + locale.image.insert + "</h4>" +
-                "</div>" +
-                "<div class='modal-body'>" +
-                "<input value='http://' class='bootstrap-wysihtml5-insert-image-url form-control'>" +
-                "</div>" +
-                "<div class='modal-footer'>" +
-                "<button class='btn btn-default' data-dismiss='modal'>" + locale.image.cancel + "</button>" +
-                "<button class='btn btn-primary' data-dismiss='modal'>" + locale.image.insert + "</button>" +
-                "</div>" +
-                "</div>" +
-                "</div>" +
-                "</div>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-command='insertImage' title='" + locale.image.insert + "' tabindex='-1'><i class='glyphicon glyphicon-picture'></i></a>" +
-                "</li>";
-        },
-
-        "html": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li>" +
-                "<div class='btn-group'>" +
-                "<a class='btn " + size + " btn-default' data-wysihtml5-action='change_view' title='" + locale.html.edit + "' tabindex='-1'><i class='glyphicon glyphicon-pencil'></i></a>" +
-                "</div>" +
-                "</li>";
-        },
-
-        "color": function(locale, options) {
-            var size = (options && options.size) ? ' btn-'+options.size : '';
-            return "<li class='dropdown'>" +
-                "<a class='btn dropdown-toggle " + size + " btn-default' data-toggle='dropdown' href='#' tabindex='-1'>" +
-                "<span class='current-color'>" + locale.colours.black + "</span>&nbsp;<b class='caret'></b>" +
-                "</a>" +
-                "<ul class='dropdown-menu'>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='black'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='black'>" + locale.colours.black + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='silver'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='silver'>" + locale.colours.silver + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='gray'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='gray'>" + locale.colours.gray + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='maroon'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='maroon'>" + locale.colours.maroon + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='red'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='red'>" + locale.colours.red + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='purple'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='purple'>" + locale.colours.purple + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='green'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='green'>" + locale.colours.green + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='olive'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='olive'>" + locale.colours.olive + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='navy'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='navy'>" + locale.colours.navy + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='blue'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='blue'>" + locale.colours.blue + "</a></li>" +
-                "<li><div class='wysihtml5-colors' data-wysihtml5-command-value='orange'></div><a class='wysihtml5-colors-title' data-wysihtml5-command='foreColor' data-wysihtml5-command-value='orange'>" + locale.colours.orange + "</a></li>" +
-                "</ul>" +
-                "</li>";
-        }
-    };
-
-    var templates = function(key, locale, options) {
-        return tpl[key](locale, options);
-    };
-
-
-    var Wysihtml5 = function(el, options) {
-        this.el = el;
-        var toolbarOpts = options || defaultOptions;
-        for(var t in toolbarOpts.customTemplates) {
-            tpl[t] = toolbarOpts.customTemplates[t];
-        }
-        this.toolbar = this.createToolbar(el, toolbarOpts);
-        this.editor =  this.createEditor(options);
-
-        window.editor = this.editor;
-
-        $('iframe.wysihtml5-sandbox').each(function(i, el){
-            $(el.contentWindow).off('focus.wysihtml5').on({
-                'focus.wysihtml5' : function(){
-                    $('li.dropdown').removeClass('open');
-                }
-            });
-        });
-    };
-
-    Wysihtml5.prototype = {
-
-        constructor: Wysihtml5,
-
-        createEditor: function(options) {
-            options = options || {};
-
-            // Add the toolbar to a clone of the options object so multiple instances
-            // of the WYISYWG don't break because "toolbar" is already defined
-            options = $.extend(true, {}, options);
-            options.toolbar = this.toolbar[0];
-
-            var editor = new wysi.Editor(this.el[0], options);
-
-            if(options && options.events) {
-                for(var eventName in options.events) {
-                    editor.on(eventName, options.events[eventName]);
-                }
-            }
-            return editor;
-        },
-
-        createToolbar: function(el, options) {
-            var self = this;
-            var toolbar = $("<ul/>", {
-                'class' : "wysihtml5-toolbar",
-                'style': "display:none"
-            });
-            var culture = options.locale || defaultOptions.locale || "en";
-            for(var key in defaultOptions) {
-                var value = false;
-
-                if(options[key] !== undefined) {
-                    if(options[key] === true) {
-                        value = true;
-                    }
-                } else {
-                    value = defaultOptions[key];
-                }
-
-                if(value === true) {
-                    toolbar.append(templates(key, locale[culture], options));
-
-                    if(key === "html") {
-                        this.initHtml(toolbar);
-                    }
-
-                    if(key === "link") {
-                        this.initInsertLink(toolbar);
-                    }
-
-                    if(key === "image") {
-                        this.initInsertImage(toolbar);
-                    }
-                }
-            }
-
-            if(options.toolbar) {
-                for(key in options.toolbar) {
-                    toolbar.append(options.toolbar[key]);
-                }
-            }
-
-            toolbar.find("a[data-wysihtml5-command='formatBlock']").click(function(e) {
-                var target = e.target || e.srcElement;
-                var el = $(target);
-                self.toolbar.find('.current-font').text(el.html());
-            });
-
-            toolbar.find("a[data-wysihtml5-command='foreColor']").click(function(e) {
-                var target = e.target || e.srcElement;
-                var el = $(target);
-                self.toolbar.find('.current-color').text(el.html());
-            });
-
-            this.el.before(toolbar);
-
-            return toolbar;
-        },
-
-        initHtml: function(toolbar) {
-            var changeViewSelector = "a[data-wysihtml5-action='change_view']";
-            toolbar.find(changeViewSelector).click(function(e) {
-                toolbar.find('a.btn').not(changeViewSelector).toggleClass('disabled');
-            });
-        },
-
-        initInsertImage: function(toolbar) {
-            var self = this;
-            var insertImageModal = toolbar.find('.bootstrap-wysihtml5-insert-image-modal');
-            var urlInput = insertImageModal.find('.bootstrap-wysihtml5-insert-image-url');
-            var insertButton = insertImageModal.find('.btn-primary');
-            var initialValue = urlInput.val();
-            var caretBookmark;
-
-            var insertImage = function() {
-                var url = urlInput.val();
-                urlInput.val(initialValue);
-                self.editor.currentView.element.focus();
-                if (caretBookmark) {
-                    self.editor.composer.selection.setBookmark(caretBookmark);
-                    caretBookmark = null;
-                }
-                self.editor.composer.commands.exec("insertImage", url);
-            };
-
-            urlInput.keypress(function(e) {
-                if(e.which == 13) {
-                    insertImage();
-                    insertImageModal.modal('hide');
-                }
-            });
-
-            insertButton.click(insertImage);
-
-            insertImageModal.on('shown', function() {
-                urlInput.focus();
-            });
-
-            insertImageModal.on('hide', function() {
-                self.editor.currentView.element.focus();
-            });
-
-            toolbar.find('a[data-wysihtml5-command=insertImage]').click(function() {
-                var activeButton = $(this).hasClass("wysihtml5-command-active");
-
-                if (!activeButton) {
-                    self.editor.currentView.element.focus(false);
-                    caretBookmark = self.editor.composer.selection.getBookmark();
-                    insertImageModal.appendTo('body').modal('show');
-                    insertImageModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
-                        e.stopPropagation();
-                    });
-                    return false;
-                }
-                else {
-                    return true;
-                }
-            });
-        },
-
-        initInsertLink: function(toolbar) {
-            var self = this;
-            var insertLinkModal = toolbar.find('.bootstrap-wysihtml5-insert-link-modal');
-            var urlInput = insertLinkModal.find('.bootstrap-wysihtml5-insert-link-url');
-            var targetInput = insertLinkModal.find('.bootstrap-wysihtml5-insert-link-target');
-            var insertButton = insertLinkModal.find('.btn-primary');
-            var initialValue = urlInput.val();
-            var caretBookmark;
-
-            var insertLink = function() {
-                var url = urlInput.val();
-                urlInput.val(initialValue);
-                self.editor.currentView.element.focus();
-                if (caretBookmark) {
-                    self.editor.composer.selection.setBookmark(caretBookmark);
-                    caretBookmark = null;
-                }
-
-                var newWindow = targetInput.prop("checked");
-                self.editor.composer.commands.exec("createLink", {
-                    'href' : url,
-                    'target' : (newWindow ? '_blank' : '_self'),
-                    'rel' : (newWindow ? 'nofollow' : '')
-                });
-            };
-            var pressedEnter = false;
-
-            urlInput.keypress(function(e) {
-                if(e.which == 13) {
-                    insertLink();
-                    insertLinkModal.modal('hide');
-                }
-            });
-
-            insertButton.click(insertLink);
-
-            insertLinkModal.on('shown', function() {
-                urlInput.focus();
-            });
-
-            insertLinkModal.on('hide', function() {
-                self.editor.currentView.element.focus();
-            });
-
-            toolbar.find('a[data-wysihtml5-command=createLink]').click(function() {
-                var activeButton = $(this).hasClass("wysihtml5-command-active");
-
-                if (!activeButton) {
-                    self.editor.currentView.element.focus(false);
-                    caretBookmark = self.editor.composer.selection.getBookmark();
-                    insertLinkModal.appendTo('body').modal('show');
-                    insertLinkModal.on('click.dismiss.modal', '[data-dismiss="modal"]', function(e) {
-                        e.stopPropagation();
-                    });
-                    return false;
-                }
-                else {
-                    return true;
-                }
-            });
-        }
-    };
-
-    // these define our public api
-    var methods = {
-        resetDefaults: function() {
-            $.fn.wysihtml5.defaultOptions = $.extend(true, {}, $.fn.wysihtml5.defaultOptionsCache);
-        },
-        bypassDefaults: function(options) {
-            return this.each(function () {
-                var $this = $(this);
-                $this.data('wysihtml5', new Wysihtml5($this, options));
-            });
-        },
-        shallowExtend: function (options) {
-            var settings = $.extend({}, $.fn.wysihtml5.defaultOptions, options || {}, $(this).data());
-            var that = this;
-            return methods.bypassDefaults.apply(that, [settings]);
-        },
-        deepExtend: function(options) {
-            var settings = $.extend(true, {}, $.fn.wysihtml5.defaultOptions, options || {});
-            var that = this;
-            return methods.bypassDefaults.apply(that, [settings]);
-        },
-        init: function(options) {
-            var that = this;
-            return methods.shallowExtend.apply(that, [options]);
-        }
-    };
-
-    $.fn.wysihtml5 = function ( method ) {
-        if ( methods[method] ) {
-            return methods[method].apply( this, Array.prototype.slice.call( arguments, 1 ));
-        } else if ( typeof method === 'object' || ! method ) {
-            return methods.init.apply( this, arguments );
-        } else {
-            $.error( 'Method ' +  method + ' does not exist on jQuery.wysihtml5' );
-        }
-    };
-
-    $.fn.wysihtml5.Constructor = Wysihtml5;
-
-    var defaultOptions = $.fn.wysihtml5.defaultOptions = {
-        "font-styles": true,
-        "color": false,
-        "emphasis": true,
-        "lists": true,
-        "html": false,
-        "link": true,
-        "image": true,
-        "size": 'sm',
-        events: {},
-        parserRules: {
-            classes: {
-                // (path_to_project/lib/css/bootstrap3-wysiwyg5-color.css)
-                "wysiwyg-color-silver" : 1,
-                "wysiwyg-color-gray" : 1,
-                "wysiwyg-color-white" : 1,
-                "wysiwyg-color-maroon" : 1,
-                "wysiwyg-color-red" : 1,
-                "wysiwyg-color-purple" : 1,
-                "wysiwyg-color-fuchsia" : 1,
-                "wysiwyg-color-green" : 1,
-                "wysiwyg-color-lime" : 1,
-                "wysiwyg-color-olive" : 1,
-                "wysiwyg-color-yellow" : 1,
-                "wysiwyg-color-navy" : 1,
-                "wysiwyg-color-blue" : 1,
-                "wysiwyg-color-teal" : 1,
-                "wysiwyg-color-aqua" : 1,
-                "wysiwyg-color-orange" : 1
-            },
-            tags: {
-                "b":  {},
-                "i":  {},
-                "br": {},
-                "ol": {},
-                "ul": {},
-                "li": {},
-                "h1": {},
-                "h2": {},
-                "h3": {},
-                "h4": {},
-                "h5": {},
-                "h6": {},
-                "blockquote": {},
-                "u": 1,
-                "img": {
-                    "check_attributes": {
-                        "width": "numbers",
-                        "alt": "alt",
-                        "src": "url",
-                        "height": "numbers"
-                    }
-                },
-                "a":  {
-                    check_attributes: {
-                        'href': "url", // important to avoid XSS
-                        'target': 'alt',
-                        'rel': 'alt'
-                    }
-                },
-                "span": 1,
-                "div": 1,
-                // to allow save and edit files with code tag hacks
-                "code": 1,
-                "pre": 1
-            }
-        },
-        stylesheets: ["./css/bootstrap3-wysiwyg5-color.css"], // (path_to_project/lib/css/bootstrap3-wysiwyg5-color.css)
-        locale: "en"
-    };
-
-    if (typeof $.fn.wysihtml5.defaultOptionsCache === 'undefined') {
-        $.fn.wysihtml5.defaultOptionsCache = $.extend(true, {}, $.fn.wysihtml5.defaultOptions);
-    }
-
-    var locale = $.fn.wysihtml5.locale = {
-        en: {
-            font_styles: {
-                normal: "Normal text",
-                h1: "Heading 1",
-                h2: "Heading 2",
-                h3: "Heading 3",
-                h4: "Heading 4",
-                h5: "Heading 5",
-                h6: "Heading 6"
-            },
-            emphasis: {
-                bold: "Bold",
-                italic: "Italic",
-                underline: "Underline"
-            },
-            lists: {
-                unordered: "Unordered list",
-                ordered: "Ordered list",
-                outdent: "Outdent",
-                indent: "Indent"
-            },
-            link: {
-                insert: "Insert link",
-                cancel: "Cancel",
-                target: "Open link in new window"
-            },
-            image: {
-                insert: "Insert image",
-                cancel: "Cancel"
-            },
-            html: {
-                edit: "Edit HTML"
-            },
-            colours: {
-                black: "Black",
-                silver: "Silver",
-                gray: "Grey",
-                maroon: "Maroon",
-                red: "Red",
-                purple: "Purple",
-                green: "Green",
-                olive: "Olive",
-                navy: "Navy",
-                blue: "Blue",
-                orange: "Orange"
-            }
-        }
-    };
-
-}(window.jQuery, window.wysihtml5);