rubber_ring 0.1.0 → 0.1.1

data/app/assets/stylesheets/rubber_ring/cms.scss

@@ -1,200 +1,200 @@
-/**
- * rubber ring specific styles. Here you shall not use any general elements or selectors at all.
- */
-
-@mixin rr-button {
-  // https://bugzilla.mozilla.org/show_bug.cgi?id=739396
-  // doesn't work in firefox for "ctrl + a" at the moment. So in firefox user can delete buttons with ctrl + a
-  -webkit-user-select: none;
-  -moz-user-select: none;
-  -ms-user-select: none;
-  user-select: none;
-
-  width: 12px;
-  height: 13px;
-  display: inline-block;
-  outline: none;
-  border: 0;
-  cursor: pointer;
-}
-
-@mixin rr-button-abs {
-  @include rr-button;
-  right: 1px;
-  top: 1px;
-  position: absolute;
-}
-
-*[contenteditable], img[data-cms] {
-  outline: dashed green 1px;
-  position: relative;
-
-  // disable selection of those action links
-  .reset-content {
-    @include rr-button-abs;
-    background: image-url("glyphicons-halflings.png") no-repeat -217px -25px;
-  }
-}
-
-.reset-image {
-  @include rr-button-abs;
-  position: relative;
-  background: image-url("glyphicons-halflings.png") no-repeat -217px -25px;
-}
-
-.ui-sortable-disabled *[contenteditable] {
-  cursor: text;
-}
-
-#rubber-ring-application {
-
-  a {
-    outline: none;
-    // FF
-  }
-
-  // this is better than to set page_title as div (because of possible <br> with enter
-  [data-cms="page_title"] {
-    display: block;
-  }
-
-  .attachment-manager {
-    display: none;
-    // hide by default
-
-    .uploaded-images {
-      img {
-        width: 65px;
-        cursor: -webkit-grab;
-        cursor: -moz-grab;
-      }
-    }
-
-    .uploaded-attachments {
-      a {
-        text-decoration: none;
-        cursor: -webkit-grab;
-        cursor: -moz-grab;
-      }
-    }
-
-    .remove_not_used_attachments {
-      margin-top: 7px;
-    }
-
-    .image_upload_box {
-      display: -webkit-flex;
-      display: flex;
-      height: 75px;
-      border: dashed green 1px;
-
-      &.drag-hover {
-        background-color: #abee9b;
-      }
-      .image_upload_text {
-        margin: auto;
-      }
-      .preview {
-        display: none;
-      }
-    }
-
-    .rubber_cache_preview {
-      font-family: calibri, tahoma, arial, sans-serif;
-      position: fixed;
-      right: 0;
-      top: 0;
-
-      a {
-        color: green;
-
-        &:visited {
-          color: green;
-        }
-      }
-    }
-  }
-
-  .page-title-manager {
-    display: none;
-    // hide by default
-  }
-
-  #edit-link {
-    display: none;
-    position: absolute;
-    top: 0;
-    left: 0;
-    z-index: 1000;
-  }
-}
-
-.rr-control {
-  input {
-    width: 27px;
-    margin-bottom: 0;
-  }
-
-  [data-action=add] {
-    @include rr-button;
-    background: image-url("glyphicons-halflings.png") no-repeat -1px -97px;
-  }
-
-  [data-action=remove] {
-    @include rr-button;
-    background: image-url("glyphicons-halflings.png") no-repeat -25px -97px;
-  }
-}
-
-// bootstrap overrides
-.tbs * {
-  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
-}
-
-.tbs select {
-  height: 25px;
-  margin-bottom: 0px;
-}
-
-.tbs .navbar {
-  margin-bottom: 0;
-  font-size: 15px;
-}
-
-// for smooth slide animation
-.tbs .well {
-  min-height: 0;
-}
-
-.tbs .well-small {
-  padding: 2px;
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-
-.tbs .navbar-inner {
-  -webkit-border-radius: 0;
-  -moz-border-radius: 0;
-  border-radius: 0;
-}
-
-.tbs .navbar .brand {
-  padding: 8px 20px 8px;
-}
-
-.tbs .alert-saved .alert {
-  padding: 0;
-  margin: 9px 0;
-  font-weight: bold;
-  opacity: 0;
-
-  &.animate {
-    opacity: 1;
-    transition: opacity 1s ease-in-out;
-  }
-}
-
-.tbs [class^="icon-"], .tbs [class*=" icon-"] {
-  margin: 3px 0 0 5px;
-}
+/**
+ * rubber ring specific styles. Here you shall not use any general elements or selectors at all.
+ */
+
+@mixin rr-button {
+  // https://bugzilla.mozilla.org/show_bug.cgi?id=739396
+  // doesn't work in firefox for "ctrl + a" at the moment. So in firefox user can delete buttons with ctrl + a
+  -webkit-user-select: none;
+  -moz-user-select: none;
+  -ms-user-select: none;
+  user-select: none;
+
+  width: 12px;
+  height: 13px;
+  display: inline-block;
+  outline: none;
+  border: 0;
+  cursor: pointer;
+}
+
+@mixin rr-button-abs {
+  @include rr-button;
+  right: 1px;
+  top: 1px;
+  position: absolute;
+}
+
+*[contenteditable], img[data-cms] {
+  outline: dashed green 1px;
+  position: relative;
+
+  // disable selection of those action links
+  .reset-content {
+    @include rr-button-abs;
+    background: image-url("glyphicons-halflings.png") no-repeat -217px -25px;
+  }
+}
+
+.reset-image {
+  @include rr-button-abs;
+  position: relative;
+  background: image-url("glyphicons-halflings.png") no-repeat -217px -25px;
+}
+
+.ui-sortable-disabled *[contenteditable] {
+  cursor: text;
+}
+
+#rubber-ring-application {
+
+  a {
+    outline: none;
+    // FF
+  }
+
+  // this is better than to set page_title as div (because of possible <br> with enter
+  [data-cms="page_title"] {
+    display: block;
+  }
+
+  .attachment-manager {
+    display: none;
+    // hide by default
+
+    .uploaded-images {
+      img {
+        width: 65px;
+        cursor: -webkit-grab;
+        cursor: -moz-grab;
+      }
+    }
+
+    .uploaded-attachments {
+      a {
+        text-decoration: none;
+        cursor: -webkit-grab;
+        cursor: -moz-grab;
+      }
+    }
+
+    .remove_not_used_attachments {
+      margin-top: 7px;
+    }
+
+    .image_upload_box {
+      display: -webkit-flex;
+      display: flex;
+      height: 75px;
+      border: dashed green 1px;
+
+      &.drag-hover {
+        background-color: #abee9b;
+      }
+      .image_upload_text {
+        margin: auto;
+      }
+      .preview {
+        display: none;
+      }
+    }
+
+    .rubber_cache_preview {
+      font-family: calibri, tahoma, arial, sans-serif;
+      position: fixed;
+      right: 0;
+      top: 0;
+
+      a {
+        color: green;
+
+        &:visited {
+          color: green;
+        }
+      }
+    }
+  }
+
+  .page-title-manager {
+    display: none;
+    // hide by default
+  }
+
+  #edit-link {
+    display: none;
+    position: absolute;
+    top: 0;
+    left: 0;
+    z-index: 1000;
+  }
+}
+
+.rr-control {
+  input {
+    width: 27px;
+    margin-bottom: 0;
+  }
+
+  [data-action=add] {
+    @include rr-button;
+    background: image-url("glyphicons-halflings.png") no-repeat -1px -97px;
+  }
+
+  [data-action=remove] {
+    @include rr-button;
+    background: image-url("glyphicons-halflings.png") no-repeat -25px -97px;
+  }
+}
+
+// bootstrap overrides
+.tbs * {
+  font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
+}
+
+.tbs select {
+  height: 25px;
+  margin-bottom: 0px;
+}
+
+.tbs .navbar {
+  margin-bottom: 0;
+  font-size: 15px;
+}
+
+// for smooth slide animation
+.tbs .well {
+  min-height: 0;
+}
+
+.tbs .well-small {
+  padding: 2px;
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.tbs .navbar-inner {
+  -webkit-border-radius: 0;
+  -moz-border-radius: 0;
+  border-radius: 0;
+}
+
+.tbs .navbar .brand {
+  padding: 8px 20px 8px;
+}
+
+.tbs .alert-saved .alert {
+  padding: 0;
+  margin: 9px 0;
+  font-weight: bold;
+  opacity: 0;
+
+  &.animate {
+    opacity: 1;
+    transition: opacity 1s ease-in-out;
+  }
+}
+
+.tbs [class^="icon-"], .tbs [class*=" icon-"] {
+  margin: 3px 0 0 5px;
+}

data/app/controllers/rubber_ring/attachments_controller.rb

@@ -1,52 +1,52 @@
-module RubberRing
-  class AttachmentsController < RubberRingController
-    include Util
-
-    def save_image
-      page = Util.save_page_content(params)
-      width, height = params[:width], params[:height]
-
-      unless width.nil? and height.nil?
-        key  = params[:content].keys.first
-        path = "public/#{page.content[key]}"
-        convert_image(path, width, height) if File.exist?(path)
-      end
-
-      expire_and_respond(page)
-    end
-
-    def convert_image(path, width, height)
-      image = ImageSorcery.new(path)
-      image.convert(path, quality: 90, resize: "#{width}x#{height}>")
-    end
-
-    def save_attachment
-      page = Util.save_page_content(params)
-      expire_and_respond(page)
-    end
-
-    def add
-      name = params[:file].original_filename
-      temp_dir = 'public/upload/temp'
-      Util.save_file_to_fs(temp_dir, name, params[:file].read)
-
-      uploaded_file_path = File.join(temp_dir, name)
-      dir_config = Util.get_attachment_directories(params)
-
-      type = FastImage.type(uploaded_file_path).nil? ? 'file' : 'image'
-      dir, src_dir = "#{type}_dir", "#{type}_src_dir"
-      Util.move_file(uploaded_file_path, dir_config[dir])
-
-      render :json => { src: '/' + File.join(dir_config[src_dir], name), type: type }
-    end
-
-    def remove
-      unless params[:src_to_remove].blank?
-        file_to_remove = "public/#{params[:src_to_remove]}"
-        FileUtils.rm(file_to_remove)
-      end
-
-      render :json => { src: params[:src_to_remove] }
-    end
-  end
-end
+module RubberRing
+  class AttachmentsController < RubberRingController
+    include Util
+
+    def save_image
+      page = Util.save_page_content(params)
+      width, height = params[:width], params[:height]
+
+      unless width.nil? and height.nil?
+        key  = params[:content].keys.first
+        path = "public/#{page.content[key]}"
+        convert_image(path, width, height) if File.exist?(path)
+      end
+
+      expire_and_respond(page)
+    end
+
+    def convert_image(path, width, height)
+      image = ImageSorcery.new(path)
+      image.convert(path, quality: 90, resize: "#{width}x#{height}>")
+    end
+
+    def save_attachment
+      page = Util.save_page_content(params)
+      expire_and_respond(page)
+    end
+
+    def add
+      name = params[:file].original_filename
+      temp_dir = 'public/upload/temp'
+      Util.save_file_to_fs(temp_dir, name, params[:file].read)
+
+      uploaded_file_path = File.join(temp_dir, name)
+      dir_config = Util.get_attachment_directories(params)
+
+      type = FastImage.type(uploaded_file_path).nil? ? 'file' : 'image'
+      dir, src_dir = "#{type}_dir", "#{type}_src_dir"
+      Util.move_file(uploaded_file_path, dir_config[dir])
+
+      render :json => { src: '/' + File.join(dir_config[src_dir], name), type: type }
+    end
+
+    def remove
+      unless params[:src_to_remove].blank?
+        file_to_remove = "public/#{params[:src_to_remove]}"
+        FileUtils.rm(file_to_remove)
+      end
+
+      render :json => { src: params[:src_to_remove] }
+    end
+  end
+end

data/app/controllers/rubber_ring/cms_controller.rb

@@ -1,57 +1,57 @@
-module RubberRing
-  class CmsController < RubberRingController
-    include Build
-    include Publish
-    include Util
-    #require CmsHelper
-
-    before_action :get_options, :except => [:save]
-
-    def save
-      page = Util.save_page_content(params)
-      expire_and_respond(page)
-    end
-
-    def remove
-      page = Page.remove(@options, params[:key])
-      expire_and_respond(page)
-    end
-
-    def save_template
-      page = Page.save_or_update_templates(@options)
-      expire_and_respond(page)
-    end
-
-    def add_template
-      page, new_pt = Page.add_template(@options)
-
-      key_prefix = view_context.build_key_prefix(new_pt, new_pt.key)
-      template = render_to_string :partial => "templates/#{new_pt.template}",
-                                  :layout => false,
-                                  :locals => {:page => page, :key_prefix => key_prefix}
-
-      content_tag_options = {
-        'class'               => new_pt.tclass,
-        'data-template-index' => new_pt.id,
-        'data-template'       => new_pt.template
-      }
-
-      response = view_context.content_tag(new_pt.element, view_context.raw(template), content_tag_options)
-
-      expire_page(params[:page_path])
-      render :json => {new_template: response}
-    end
-
-    def remove_template
-      page = Page.remove_template(@options)
-      expire_and_respond(page)
-    end
-
-  private
-
-    def get_options
-      @options = Util.get_options_from_params(params)
-    end
-
-  end
-end
+module RubberRing
+  class CmsController < RubberRingController
+    include Build
+    include Publish
+    include Util
+    #require CmsHelper
+
+    before_action :get_options, :except => [:save]
+
+    def save
+      page = Util.save_page_content(params)
+      expire_and_respond(page)
+    end
+
+    def remove
+      page = Page.remove(@options, params[:key])
+      expire_and_respond(page)
+    end
+
+    def save_template
+      page = Page.save_or_update_templates(@options)
+      expire_and_respond(page)
+    end
+
+    def add_template
+      page, new_pt = Page.add_template(@options)
+
+      key_prefix = view_context.build_key_prefix(new_pt, new_pt.key)
+      template = render_to_string :partial => "templates/#{new_pt.template}",
+                                  :layout => false,
+                                  :locals => {:page => page, :key_prefix => key_prefix}
+
+      content_tag_options = {
+        'class'               => new_pt.tclass,
+        'data-template-index' => new_pt.id,
+        'data-template'       => new_pt.template
+      }
+
+      response = view_context.content_tag(new_pt.element, view_context.raw(template), content_tag_options)
+
+      expire_page(params[:page_path])
+      render :json => {new_template: response}
+    end
+
+    def remove_template
+      page = Page.remove_template(@options)
+      expire_and_respond(page)
+    end
+
+  private
+
+    def get_options
+      @options = Util.get_options_from_params(params)
+    end
+
+  end
+end