scrivito_table_widget 0.5.1 → 0.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 24b2c2773708e0df6476395b505a74b78cc1054f
-  data.tar.gz: dd0e10e569b6413eb902ffac451c4617277fec77
+  metadata.gz: 762476b953b26b88a37914e46787eeaaacd82596
+  data.tar.gz: 25c0bc9cff5263e913a7f3e6e3c5fb12bd54c983
 SHA512:
-  metadata.gz: 30682abf63cd5eda5168b2ffefeff5aacbc6317d2bad48d9080263301fb9100866cb57cb60e45439855ccd06e087e2a7c5dde528f3a6a457b8410853859b0946
-  data.tar.gz: 4c995dcc44cfc2e49be8608913b4f2de156bc0627d56955a64c9de2f00abfb43416dfc10444e182135d61e580ecbfe1435f5e832dcccf769c56e4641220bf2e8
+  metadata.gz: fc48538a53b4f5d55e5421cee6da5422a6ceaed259e8887ae9aa9934fe27139a1f1a594a93e50459df6f38bffbac812f37d811a71e8c910d1037f95283673b52
+  data.tar.gz: f52d5b0e2a4afedb65bfd43dadf97946db640e9a70765a094fa76d23dd2dfcb0c9bec4837586a5bbb6d071982b2c2725e360f2727602ef6e57f96948c84d6bc6

data/README.md

@@ -11,6 +11,7 @@ A Widget for Scrivito for a table. It is using Bootstrap 3.
 Add this line to your application's `Gemfile`:
 
     gem 'scrivito_table_widget'
+    gem 'font-awesome-rails'
 
 Add this line to your editing javascript manifest:
 
@@ -18,7 +19,7 @@ Add this line to your editing javascript manifest:
 
 Add this line to your application stylesheet manifest:
 
-    /= require scrivito_table_widget/styles
+    *= require scrivito_table_widget/styles
 
 After that, execute:
 

data/app/assets/javascripts/scrivito_table_widget/jquery.edit.table.js

@@ -59,11 +59,13 @@
     var height = activeElement.outerHeight();
 
     $('.table-buttons.top').css({    top: "-11px",                        left: (base.left - 11), width: width + 23});
-    $('.table-buttons.edit').css({   top: (base.top - 16),                left: (base.left + 5)});
+    $('.table-buttons.edit').css({   top: (base.top - 12),                left: (base.left - 5)});
     $('.table-buttons.left').css({   top: (base.top - 12),                left: -17, height: height + 24});
     $('.table-buttons.bottom').css({ bottom: "-4px",                      left: (base.left + width/2 - 12)});
     $('.table-buttons.right').css({  top: (base.top + height/2 - 11),      right: -23});
 
+    $.fn.edittable.toggleTableOptions('.table-buttons.edit', 'hide');
+
     if(activeElement.get(0).tagName == "TH") {
       $('.table-buttons .add-top').hide();
     } else {
@@ -114,11 +116,16 @@
   }
 
   $.fn.edittable.buttonsEdit = function() {
-    return  $.fn.edittable.button("bold", "", "table-bold") +
-            $.fn.edittable.button("italic", "", "table-italic") +
-            $.fn.edittable.button("align-left", "", "table-left") +
-            $.fn.edittable.button("align-center", "", "table-center") +
-            $.fn.edittable.button("align-right", "", "table-right");
+    return  $.fn.edittable.button("pencil", "", "edit-the-cell alert-gray") +
+            $.fn.edittable.button("bold", "", "table-bold alert-gray") +
+            $.fn.edittable.button("italic", "", "table-italic alert-gray") +
+            $.fn.edittable.button("align-left", "", "table-left alert-gray") +
+            $.fn.edittable.button("align-center", "", "table-center alert-gray") +
+            $.fn.edittable.button("align-right", "", "table-right alert-gray") +
+            $.fn.edittable.button("crosshairs", "", "add-success alert-success") +
+            $.fn.edittable.button("crosshairs", "", "add-info alert-info") +
+            $.fn.edittable.button("crosshairs", "", "add-warning alert-warning") +
+            $.fn.edittable.button("crosshairs", "", "add-danger alert-danger");
   }
 
   $.fn.edittable.buttonsBottom = function() {
@@ -135,16 +142,12 @@
   }
 
   $.fn.edittable.buttonsMain = function() {
-    return  $.fn.edittable.button("pencil", "", "edit-the-table alert-gray") +
-            $.fn.edittable.button("none", "striped", "stripe-table alert-gray") +
-            $.fn.edittable.button("none", "condenced", "condence-table alert-gray") +
-            $.fn.edittable.button("none", "hover", "hover-table alert-gray") +
-            $.fn.edittable.button("none", "border", "border-table alert-gray") +
-            $.fn.edittable.button("none", "first-column", "first-column alert-gray") +
-            $.fn.edittable.button("none", "success", "add-success alert-success") +
-            $.fn.edittable.button("none", "info", "add-info alert-info") +
-            $.fn.edittable.button("none", "warning", "add-warning alert-warning") +
-            $.fn.edittable.button("none", "danger", "add-danger alert-danger");
+    return  $.fn.edittable.button("cog", "", "edit-the-table") +
+            $.fn.edittable.button("none", "striped", "stripe-table") +
+            $.fn.edittable.button("none", "condenced", "condence-table") +
+            $.fn.edittable.button("none", "hover", "hover-table") +
+            $.fn.edittable.button("none", "border", "border-table") +
+            $.fn.edittable.button("none", "first-column", "first-column");
   }
 
   $.fn.edittable.button = function(icon, text, f) {
@@ -179,7 +182,8 @@
     $('.table-widget').find('.table-center').on('click', function() { $.fn.edittable.tableCenter(); });
     $('.table-widget').find('.table-right').on('click', function() { $.fn.edittable.tableRight(); });
 
-    $('.table-widget').find('.edit-the-table').on('click', function() { $.fn.edittable.toggleTableOptions(); });
+    $('.table-widget').find('.edit-the-table').on('click', function() { $.fn.edittable.toggleTableOptions('.table-options.main'); });
+    $('.table-widget').find('.edit-the-cell').on('click', function() { $.fn.edittable.toggleTableOptions('.table-buttons.edit'); });
 
     $('.table-widget').find('.add-left, .add-right').on('mouseover', function() { $.fn.edittable.addHoverVerticalAdd($(this)); });
     $('.table-widget').find('.add-top, .add-bottom').on('mouseover', function() { $.fn.edittable.addHoverHorizontalAdd($(this)); });
@@ -249,8 +253,12 @@
    * Button methods
    ****/
 
-   $.fn.edittable.toggleTableOptions = function() {
-    $('.table-options.main div').not(':first').fadeToggle(100);
+   $.fn.edittable.toggleTableOptions = function(bar, option) {
+    if(option === 'hide') {
+      $(bar +' div').not(':first').hide();
+    } else {
+      $(bar +' div').not(':first').fadeToggle(100);
+    }
    }
 
   $.fn.edittable.bold = function() {

data/app/assets/stylesheets/scrivito_table_widget/editing.css

@@ -24,7 +24,16 @@
   margin-bottom: 0;
 }
 
-.table-buttons div {
+.table-buttons.edit {
+  width: 245px;
+}
+
+.table-options.main {
+  width: 333px;
+}
+
+.table-buttons.edit div.alert-gray,
+.table-options div {
   background: #444444;
 }
 
@@ -91,10 +100,6 @@
   position: relative;
 }
 
-.alert-gray {
-  background-color: #444444;
-}
-
 .table-options .alert-success {
   margin-left: 5px;
 }
@@ -118,10 +123,12 @@ td.active-field {
   outline: 2px solid #444;
 }
 
-.table-options.main div {
+.table-options.main div,
+.table-buttons.edit div {
   display: none;
 }
 
-.table-options.main div:first-child {
+.table-options.main div:first-child,
+.table-buttons.edit div:first-child {
   display: block;
 }

data/app/assets/stylesheets/scrivito_table_widget/styles.css

@@ -1,4 +1,5 @@
 /*
+ *= require font-awesome
  *= require_tree .
  *= require_self
  */

data/lib/scrivito_table_widget/version.rb

@@ -1,3 +1,3 @@
 module ScrivitoTableWidget
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scrivito_table_widget
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
 platform: ruby
 authors:
 - Scrivito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-11 00:00:00.000000000 Z
+date: 2015-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler