hallo_rails 0.0.6 → 0.0.7

data/lib/hallo_rails.rb

@@ -23,6 +23,7 @@ module HalloRails
                              update_url: "/#{object_name.pluralize}/#{object.to_param}",
                              blank_text: "<i>Click to Edit</i>".html_safe
 
+      options[:content] = sanitize(options[:content]) if options[:sanitize]
       content_tag options[:tag], options[:content].present? ? options[:content] : options[:blank_text],
                   class: "#{'editable' if !options.has_key?(:editable) or options[:editable]}",
                   id: "#{object_name}_#{method.to_s}",
@@ -39,7 +40,7 @@ module HalloRails
       options.reverse_merge! tag: :div,
                              content: object.send(method).try(:html_safe),
                              blank_text: "<i>Click to Edit</i>".html_safe
-
+      options[:content] = sanitize(options[:content]) if options[:sanitize]
       content_tag( options[:tag], options[:content].present? ? options[:content] : options[:blank_text],
                    class: 'form_editable',
                    id: "#{object_name}_#{method.to_s}",

data/lib/hallo_rails/version.rb

@@ -1,3 +1,3 @@
 module HalloRails
-  VERSION = "0.0.6"
+  VERSION = "0.0.7"
 end

data/vendor/assets/javascripts/hallo.js

@@ -2517,7 +2517,8 @@
             return;
           }
           _this._updatePosition(position, data.selection);
-          return _this.toolbar.show();
+          if (_this.toolbar.html() != '')
+            return _this.toolbar.show();
         });
         this.element.bind('hallounselected', function(event, data) {
           return _this.toolbar.hide();

data/vendor/assets/javascripts/hallo_rails.js.coffee

@@ -12,10 +12,11 @@ default_plugins =
   'hallo-image-insert-edit': {}
 
 init = ->
+  context = this
   $('.editable, .form_editable').each ->
     $el = $(this)
-    plugins = $el.data('editable-plugins') || default_plugins
-    options = $el.data('editable-options') || default_options
+    plugins = $el.data('editable-plugins') || context.default_plugins
+    options = $el.data('editable-options') || context.default_options
     $.extend options, { plugins: plugins }
     $el.hallo options
 
@@ -26,6 +27,7 @@ init = ->
     method_data = {}
     method_data[$el.data('method')] = $el.html()
     data[ $el.data('model') ] = method_data
+    data.in_place_update = true
     for property_name of $el.data()
       if typeof $el.data(property_name) == 'string' and property_name != 'method' and
        property_name != 'model' and property_name != 'updateUrl'

data/vendor/assets/stylesheets/hallo_rails.css.scss

@@ -0,0 +1,148 @@
+.hallotoolbar, .dropdown-menu{
+  @include border-radius;
+  border: 1px solid #AAA;
+  padding: 3px;
+  background-color: #EEE;
+}
+
+.dropdown-menu{
+  z-index: 1000;
+}
+
+.blockselector{
+  @include border-radius(3px);
+  background-color: #E6E6E6;
+  border: 1px solid #ccc;
+  cursor: pointer;
+  color: #555;
+
+  &:hover{
+    border: 1px solid #777;
+  }
+}
+
+.hallo_insert_file_loader{
+  margin: 100px auto;
+  width: 32px;
+  height: 32px;
+  background-image: asset-url('ajax_loader/ajax-loader-bold.gif', 'image');
+}
+
+.hallotoolbar{
+  z-index: 10000;
+}
+
+.ui-dialog{
+  z-index: 10001 !important;
+}
+
+.editable:hover:before, .hallo_updating:before{
+  font-size: 14px;
+  color: orange;
+  display: block;
+  width: 100%;
+  height: 100%;
+  padding-top: 7px;
+  padding-bottom: 7px;
+  position: absolute;
+  top: 0;
+  left: 0;
+  text-align: center;
+  z-index: 1;
+  background-color: white;
+  border: 1px dashed orange;
+  @include opacity(0.9);
+  @include border-radius;
+}
+
+.editable:hover:before{
+  content: "Zum Bearbeiten klicken";   /* "Click to edit" Modify to your language */
+}
+
+.hallo_updating:before{
+  content: "Speichern...";             /* "Saving..." Modify to your language */
+}
+
+.editable.inEditMode:hover:before{
+  display: none;
+}
+
+
+/* Hallo-HTML */
+
+.ui-dialog-content{
+
+  textarea.html_source{
+    width: 98%;
+    height: 94%;
+    min-height: 400px;
+  }
+
+  padding: 10px 15px 10px 0 !important;
+
+  #directory_loader, #no_files{
+    padding-top: 60px;
+    margin-top: 0;
+  }
+
+  #folders{
+    width: 200px;
+  }
+
+  #previews{
+    width: 320px;
+  }
+}
+
+
+/* Hallo-Image-Insert-Edit */
+
+
+#hallo_img_properties{
+  margin-left: 10px;
+  width: 99%;
+  margin-bottom: 15px;
+  padding: 5px;
+
+  display: table;
+
+  .hallo_img_property_row{
+    display: table-row;
+
+    .hallo_img_property_col{
+      display: table-cell;
+      padding-right: 7px;
+      padding-bottom: 5px;
+
+      &:first-child{
+        width: 60px;
+      }
+
+      .img_property_entry{
+        padding-right: 7px;
+      }
+    }
+  }
+
+  #hallo_img_source, #hallo_img_alt{
+    width: 99%;
+  }
+
+  #hallo_img_width, #hallo_img_height{
+    width: 40px;
+  }
+
+  #hallo_img_padding{
+    width: 130px;
+  }
+}
+
+#hallo_img_file_select_ui{
+  height: 300px;
+
+  #hallo_img_file_select_title{
+    margin-bottom: 10px;
+    margin-left: 10px;
+    font-size: 14px;
+  }
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hallo_rails
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-06 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -45,6 +45,7 @@ files:
 - vendor/assets/javascripts/hallo.js
 - vendor/assets/javascripts/hallo_rails.js.coffee
 - vendor/assets/javascripts/rangy-core.js
+- vendor/assets/stylesheets/hallo_rails.css.scss
 homepage: ''
 licenses: []
 post_install_message: 
@@ -59,7 +60,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3288430876181110642
+      hash: -3252560071223483238
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -68,7 +69,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3288430876181110642
+      hash: -3252560071223483238
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24