ideyabox 0.1.4 → 0.1.5

data/app/assets/javascripts/default.js

@@ -15,7 +15,7 @@ $(document).ready(function(){
 
   $(".chosen_select").chosen();
   $('.pagination').hide();
-
+  $("ol.sortable ol").hide();
 
 
   $('.zebra th a').live('click', function () {
@@ -29,6 +29,15 @@ $(document).ready(function(){
     
   });
 
+  $("ol.sortable").on('click', 'a.expand', function(e){
+    e.preventDefault();
+    var $inList = $(this).parent('div').siblings("ol");
+    $inList.toggle();
+    $(this).toggleClass('minus');
+    $(this).toggleClass('plus');
+  });
+  
+
   $('#sort_button').on('click', function (e) {
     $.ajax( {
       type: 'post',
@@ -81,4 +90,10 @@ $(document).ready(function(){
     $('.crop_params input').val('');
   });
 
+});
+
+$(function() {
+    $( "#accordion" ).accordion({
+      heightStyle: "content"
+    });
 });

data/app/assets/stylesheets/default.scss.erb

@@ -33,6 +33,18 @@ a.del {
   i {display:inline;}
   &:hover {color:#FF0000;}
 }
+
+@mixin radius($radius) {
+  -webkit-border-radius: $radius;
+  -moz-border-radius: $radius;
+  border-radius: $radius;   
+}
+@mixin box-shadow($blur, $color) {
+  -webkit-box-shadow: 0 0 $blur $color;
+  -moz-box-shadow: 0 0 $blur $color;
+  box-shadow: 0 0 $blur $color; 
+}
+
 .icon-large{font-size:1.5em;}
 .horizontal_items {
   display:none;
@@ -514,7 +526,7 @@ ol.sortable {
   width: 100%;
   li {
     width:100%;
-    margin: 12px 0;
+    margin: 5px 0;
     vertical-align: middle;
     padding: 0;
   }
@@ -524,13 +536,45 @@ ol.sortable {
     background-color: #F8F8F8;
     width:100%;
     vertical-align: middle;
-    padding: 10px 0;
-    a {margin-left: 10px;}
+    padding: 5px 0;
+    position: relative;
+    border:1px solid #000;
+    @include radius(7px);
+    a {position: relative;}
+
+    a.title {margin-left: 30px;}
+    a.expand {
+      &.plus:after {content:"+";}
+      &.minus {
+        &:after {content:"-";}
+        padding: 0 5px 2px 5px;
+      }
+      margin-left: 10px;
+      font-size: 15px;
+      font-weight: bold;
+      background-color: $deepgreen;
+      display: inline-block;
+      padding: 0 4px 2px 4px;
+      color: #FFF;
+      &:hover{color: #FFF;}
+      &.non-display {display:none;}
+      @include radius(10px);
+    }
+    .toggleshow {position: relative;margin-left: 5px;display: inline-block;width: 12px;height: 12px;}
+    a.del {margin-right: 10px;}
+    .icon-large{font-size: 1.2em;position: absolute;left: 0;top: 0;}
+
     .del {float: right;min-width:30px;}
-    &:hover {background-color:#C4FFCB;outline:1px dashed green;}
+    &:hover {background-color:#C4FFCB;border:1px dashed green;}
   }
 }
-.ui-nestedSortable-error {background:#fbe3e4; outline:1px dashed red;}
-.placeholder {background-color: #C4FFCB; outline:1px dashed green;}
+.ui-nestedSortable-error {background:#fbe3e4; border:1px dashed red;}
+.placeholder {background-color: #C4FFCB; border:1px dashed green;@include radius(7px);}
 .ui-sortable-placeholder {background-color: #C4FFCB !important;height:2.6em;visibility:visible !important;}
 
+#accordion {
+  h1,h2,h3,h4 {
+    cursor:pointer;
+    &:hover {color:$a_hover_color;}
+  }
+}

data/app/helpers/admin_helper.rb

@@ -146,10 +146,16 @@ module AdminHelper
 
   def children(i)
       html = ""
-      html << "
-      <li id=\"list_#{i.id}\">
-      <div>#{link_to i.title, [:edit, :admin, i]}
-      " 
+      html << "<li id=\"list_#{i.id}\">"
+      html <<"<div>"
+
+      html << expand_button(i)
+      if i.has_attribute?("visible")
+        html << visible_button(i)
+      end
+      html <<"#{link_to i.title, [:edit, :admin, i], :class=>'title'}" 
+      
+
       html << delete_button(i)  
       html << "</div>"
       
@@ -165,6 +171,16 @@ module AdminHelper
       return html
   end
 
+  def expand_button(i)
+    link_to '', '#', :class=>"expand plus #{'non-display' if i.children.empty?}"
+  end
+
+  def visible_button(object)
+    link_to [:toggleshow, :admin, object], :remote => true, :class=>"toggleshow" do
+      raw("<i class=\'#{object.visible? ? 'icon-eye-open icon-large' : 'icon-eye-close icon-large not-work'}\'></i>")
+    end
+  end
+
   def delete_button(object)
     link_to [:admin, object], :class => :del, :confirm => 'Точно удалить?', :method => :delete do
         raw("<span> Удалить </span>")
@@ -193,6 +209,20 @@ module AdminHelper
             update: function(){
               var serialized = $('ol.sortable').nestedSortable('serialize');
               $.ajax({url: '#{url}', data: serialized});
+
+              $('ol.sortable .expand').each(function(){
+                var $inlist = $(this).parent('div').siblings("ol").first();
+                if ($inlist.find('li').length === 0) {
+                  $(this).addClass('non-display');
+                } else {
+                  if ($inlist.css('display') == 'none') {
+                    $(this).addClass('plus').removeClass('minus');
+                  } else {
+                    $(this).addClass('minus').removeClass('plus');
+                  }
+                  $(this).removeClass('non-display');
+                }
+              });
             }
           });
         });

data/lib/generators/ideyabox/admin/templates/assets/admin.scss.erb

@@ -1,3 +1,4 @@
 //*= require default
+//= require redactor-rails
 //
 //*= require_self

data/lib/ideyabox/version.rb

@@ -1,3 +1,3 @@
 module Ideyabox
-  VERSION = "0.1.4"
+  VERSION = "0.1.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ideyabox
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-08 00:00:00.000000000 Z
+date: 2012-12-16 00:00:00.000000000 Z
 dependencies: []
 description: Write a gem description
 email: