cardboard_cms 0.1.4 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 575d0f91810cee3ed6ceed4224d66422c4a4b0bb
-  data.tar.gz: a648b9a242e0aefcedad3ef2f3b97a1b4d100de6
+  metadata.gz: 79f74648f48e899a4cc6e823888f15ed437fe408
+  data.tar.gz: c42474efb3ca96d02db0e23896e26530d9b2b287
 SHA512:
-  metadata.gz: f9643eeedddf6d09ab471775c97d10eb7b5de52bb6e6f77f696b4dec5d49a5e89d18b88834ff0de35d25d87a8a3471b83fd27381a48d0826a5c1f488d7ef3301
-  data.tar.gz: e4292f66de41c65643d3931ab0168f86a7d688753e1a4321b22bdc89804229e6dedfcf21f8da0c59e07d5084699324983b2d18a3c5794adda87fe5018f424ee4
+  metadata.gz: 321b542f56a6083e0ab9961b45d776c3d564b306ca33cd87086248a54cd832316b9f1f13b1bb63b7262d26e3e069f36982c3d3da9f95cd91672479ed49083966
+  data.tar.gz: 8d74c9ae9ded58328e7536f53d81ae69fe39dfb24a88bf5cb4d54181be48eaa0620d115ae25b594e8cbbeb7a37cc9d02b3bf862aecd07de8ef60f3ef88a5becb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cardboard_cms (0.1.4)
+    cardboard_cms (0.1.6)
       bootstrap-datepicker-rails
       bootstrap-sass (~> 2.2)
       bootstrap-wysihtml5-rails

data/app/assets/javascripts/cardboard/rich_text.js

@@ -56,9 +56,19 @@ var rich_text_editor_defaults = {
 }
 
 $(document).on("ready pjax:end", function(e){
-  // console.log($(".wysihtml5").length);
   if($(".wysihtml5").length) {
     $('.wysihtml5').wysihtml5(rich_text_editor_defaults);
+    $('iframe.wysihtml5-sandbox').wysihtml5_size_matters();
+
+    // TODO: find a better way to handle multiple RTE on a single page
+    $(".bootstrap-wysihtml5-insert-link-modal .tab-content div").each(function (index) {
+      $(this).attr("id", $(this).attr("id") + index.toString());            
+    });
+    $(".bootstrap-wysihtml5-insert-link-modal .nav li a").each(function (index) {
+      $(this).attr("href", $(this).attr("href") + index.toString());
+      if(index % 3 == 0) $(this).tab('show');
+    });
+    // END TODO
   }
 });
 
@@ -68,12 +78,14 @@ $(document).on('cocoon:after-insert', function(e, insertedItem) {
   }
 });
 
-$(document).on('click', '.bootstrap-wysihtml5-insert-link-modal #link_pages a', function(e){
-  e.preventDefault;
+
+
+$(document).on('click', '.bootstrap-wysihtml5-insert-link-modal .link_pages a', function(e){
+  e.preventDefault();
+  console.log("clicked");
   modal = $(this).closest(".bootstrap-wysihtml5-insert-link-modal");
   modal.find("input.bootstrap-wysihtml5-insert-link-url").val($(this).data("url"));
   modal.find("#insert_link").click();
-  return false;
 });
 
 $(document).on('change', '.bootstrap-wysihtml5-insert-link-modal .tab-pane input', function(){

data/app/views/cardboard/rich_editor/_links_modal.html.slim

@@ -5,24 +5,26 @@ li
       h3 Insert link
 
     .modal-body
-      ul class="nav nav-tabs"
+      ul class="nav nav-pills"
         li
-          a href="#link_pages" data-toggle="tab" Pages
+          a href="#link_pane_1" data-toggle="pill" Pages
         li
-          a href="#link_url" data-toggle="tab" URL
+          a href="#link_pane_2" data-toggle="pill" URL
         li
-          a href="#link_email" data-toggle="tab" Email
+          a href="#link_pane_3" data-toggle="pill" Email
 
       div class="tab-content"    
-        div class="tab-pane" id="link_pages" 
+        div.tab-pane class="link_pages" id="link_pane_1" 
           ul
             = nested_pages do |page, subpages|
               li
                 = link_to page.title, "#", "data-url" => page.url
                 = content_tag(:ul, subpages) if subpages
-        div class="tab-pane" id="link_url" 
+
+        div.tab-pane id="link_pane_2" 
           input placeholder='http://website.com' class='input-xlarge' value='http://'
-        div class="tab-pane" id="link_email" 
+        
+        div.tab-pane id="link_pane_3" 
           input placeholder='mailto:email@example.com' class='input-xlarge'
 
       input class='bootstrap-wysihtml5-insert-link-url' type="hidden"  

data/lib/cardboard/engine.rb

@@ -20,6 +20,7 @@ require 'jquery-ui-rails'
 require 'decorators'
 require 'bootstrap-wysihtml5-rails'
 require 'select2-rails'
+require 'jquery-rails'
 
 
 module Cardboard

data/lib/cardboard/version.rb

@@ -1,3 +1,3 @@
 module Cardboard
-  VERSION = "0.1.4"
+  VERSION = "0.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cardboard_cms
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.6
 platform: ruby
 authors:
 - Michael Elfassy
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-16 00:00:00.000000000 Z
+date: 2014-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails