releaf 0.1.1 → 0.1.2

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0560889a4c9f9bbfad922e22b7a6a22daf49e7cf
+  data.tar.gz: 20582215d646200c722e10bbc1787466162d931b
+SHA512:
+  metadata.gz: 288b4b11e3d7668d98c54d77dbe61da14d2d83b03a41569f91406e448ceb1bb719e44db4f722f280581751720f252f17205dd19fdb67f6236ad72773530d0f21
+  data.tar.gz: 5d64688b47c6ee3ad126ec7ea67569e05adeb2707349b788d90af0b20cf29e2b0c68c4564659c96f30954b80d15f7c7c9a04a99e12ff82754e0816fb32c82925

data/README.md

@@ -1,11 +1,14 @@
 ## Releaf
 
-Releaf is Admin interface for Rails projects
+Releaf is Admin interface for Rails projects.
+
+Documentation: http://cubesystems.github.com/releaf/
 
 ## Getting started
 
 Releaf will work with Rails 3.2.
 You can add it to your Gemfile with:
+
 ```ruby
 gem 'will_paginate', '~> 3.0.4'
 gem 'acts_as_list'
@@ -26,25 +29,26 @@ gem 'strong_parameters'
 gem 'tinymce-rails', '~> 3.5.8'
 gem 'tinymce-rails-imageupload'
 gem 'will_paginate', '~> 3.0.4'
-gem 'yui-rails', :git => 'https://github.com/ConnectCubed-Open/yui-rails'
+gem 'yui-rails',  '~> 0.2.0'
 ```
 
 Run the bundle command to install it.
 
 Now in config/application.rb set
+
 ```ruby
-  config.active_record.whitelist_attributes = false
+config.active_record.whitelist_attributes = false
 ```
-because releaf is expacting strog_params gem to be used
 
+because releaf is expacting strog_params gem to be used
 
 ```console
 rails generate settings settings
 rake db:migrate
 ```
 
-
 After you install Releaf, you need to run the generator:
+
 ```console
 rails generate releaf:install
 rails generate i18n:releaf:install
@@ -56,17 +60,16 @@ The generator will install an initializer which describes Releaf routes and conf
 
 Now you need to add something like this for releaf itself and standart admin,
 permissions controllers
+
 ```ruby
-  mount_releaf_at '/admin'
-  namespace :admin do
-    resources :admins, :roles do
-        get :confirm_destroy, :on => :member
-        match :urls, :on => :collection
-      end
-  end
+mount_releaf_at '/admin'
+namespace :admin do
+  releaf_resources :admins, :roles
+end
 ```
 
 Add dragonfly initializer (/config/initializers/dragonfly.rb)
+
 ```ruby
 require 'dragonfly/rails/images'
 ```

data/Rakefile

@@ -21,6 +21,14 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include('app/**/*.rb')
 end
 
+desc "Run specs and generate coverage report."
+task :ci do
+  rm_rf "coverage" if File.exists? 'coverage'
+  ENV['RAILS_ENV'] = 'test'
+  ENV['COVERAGE'] ||= 'y'
+  Rake::Task[:spec].invoke
+end
+
 desc 'Dummy test app tasks'
 namespace :dummy do
   desc 'Remove current dummy app'

data/app/assets/javascripts/releaf/controllers/base.js

@@ -120,46 +120,6 @@ jQuery(function()
 
 
 
-    // initialize date/datetime/time pickers
-    jQuery(document.body).delegate('form', 'initcalendars', function() {
-        var forms = jQuery(this);
-        var options = {
-            timeFormat: 'HH:mm:ss',
-            controlType: 'select',
-            showHour: true,
-            showMinute: true,
-            // showSecond: true,
-            // showTimezone: true,
-        }
-
-        forms.find('.date_picker').each(function() {
-            var picker = jQuery(this);
-            var opt = options;
-            opt['dateFormat'] = picker.attr('data-date-format') || 'yy-mm-dd';
-            picker.datepicker(opt);
-        });
-
-        forms.find('.datetime_picker').each(function() {
-            var picker = jQuery(this);
-            var opt = options;
-            opt['dateFormat'] = picker.attr('data-date-format') || 'yy-mm-dd';
-            opt['pickerTimeFormat'] = picker.attr('data-time-format') || 'HH:mm'
-            picker.datetimepicker(opt);
-        });
-
-        /*
-         * forms.find('.time_picker').each(function() {
-         *     var picker = jQuery(this);
-         *     var opt = options;
-         *     opt['pickerTimeFormat'] = picker.attr('data-time-format') || 'HH:mm'
-         *     picker.timepicker(options);
-         * });
-         */
-    });
-
-    jQuery('form').trigger('initcalendars');
-
-
     jQuery('form').on('keyup, change', '.sync_field', function(e) {
         var input = jQuery(e.target);
         var value_div = input.parents('.value:first');

data/app/assets/javascripts/releaf/include/field.type_date_or_datetime_or_time.js

@@ -0,0 +1,43 @@
+jQuery(document).ready(function() {
+    // initialize date/datetime/time pickers
+    jQuery(document.body).delegate('form', 'initcalendars', function() {
+        var forms = jQuery(this);
+        var options = {
+            timeFormat: 'HH:mm:ss',
+            controlType: 'select',
+            showHour: true,
+            showMinute: true,
+            changeMonth: true,
+            changeYear: true
+            // showSecond: true,
+            // showTimezone: true,
+        }
+
+        forms.find('.date_picker').each(function() {
+            var picker = jQuery(this);
+            var opt = options;
+            opt['dateFormat'] = picker.attr('data-date-format') || 'yy-mm-dd';
+            picker.datepicker(opt);
+        });
+
+        forms.find('.datetime_picker').each(function() {
+            var picker = jQuery(this);
+            var opt = options;
+            opt['dateFormat'] = picker.attr('data-date-format') || 'yy-mm-dd';
+            opt['pickerTimeFormat'] = picker.attr('data-time-format') || 'HH:mm'
+            picker.datetimepicker(opt);
+        });
+
+        /*
+         * forms.find('.time_picker').each(function() {
+         *     var picker = jQuery(this);
+         *     var opt = options;
+         *     opt['pickerTimeFormat'] = picker.attr('data-time-format') || 'HH:mm'
+         *     picker.timepicker(options);
+         * });
+         */
+    });
+
+    jQuery('form').trigger('initcalendars');
+
+});

data/app/assets/javascripts/releaf/include/nested_fields.js

@@ -1,71 +1,64 @@
-jQuery(function()
+jQuery(document).ready(function()
 {
-    var forms = jQuery('form');
 
-	forms.each(function()
-	{
-		var form = jQuery( this );
-		form.find( '.nested_wrap' ).each(function()
-		{
-			var nested = jQuery( this );
-			var list = nested.find( '.list:first' );
-			var template = jQuery( '<div></div>' ).append( nested.find( '.template:first' ).clone().removeClass( 'template' ) ).html();
+    jQuery(document.body).on('click', '.nested_wrap .add', function(e) {
+        e.stopPropagation;
+        var button = jQuery(e.target);
+        var nested_wrap = button.parents('.nested_wrap:first');
+        var key = 'on-' + new Date().getTime();
+        var template = jQuery( '<div></div>' ).append( nested_wrap.find( '.template:first' ).clone().removeClass( 'template' ) ).html();
+        var item = jQuery( template.replace( /(".*?)(_template_)(.*?")/g, '$1' + key + '$3' ) );
+        var list = nested_wrap.find( '.list:first' );
+        list.append( item );
 
-			nested.on( 'click', '.add', function()
-			{
-				var key = 'on-' + new Date().getTime();
-				var item = jQuery( template.replace( /(".*?)(_template_)(.*?")/g, '$1' + key + '$3' ) );
-				list.append( item );
-				if( item.is('tr') )
-				{
-					item.fadeIn( 'normal' );
-					item.trigger('itemadd');
-				}
-				else
-				{
-					item.css({ opacity: 0 });
-					item.slideDown( 'fast', function()
-					{
-						item.css({ opacity: '' });
-						item.find( 'input:first' ).focus();
-						item.hide();
-						item.fadeIn( 'fast' );
-						item.trigger('itemadd');
-					});
-				}
-			});
 
-			nested.on( 'click', '.remove', function()
-			{
-				var item = jQuery( this ).parents( '.item' );
-				var destroy = item.find( '.destroy' );
-				var end = function()
-				{
-					item.hide();
-					item.trigger('itemremoveend');
-					if( destroy.length > 0 )
-					{
-						destroy.val( true );
-					}
-					else
-					{
-						item.remove();
-					}
-				}
-				if( item.is('tr') )
-				{
-					item.fadeOut( 'fast', end );
-				}
-				else
-				{
-					item.fadeOut( 'fast', function()
-					{
-						item.css( 'opacity', 0 ).show().slideUp( 'fast', end );
-					});
-				}
-                item.trigger('itemremove');
-			});
-		});
-	});
+        if( item.is('tr') )
+        {
+            item.fadeIn( 'normal' );
+            item.trigger('itemadd');
+        }
+        else
+        {
+            item.css({ opacity: 0 });
+            item.slideDown( 'fast', function()
+            {
+                item.css({ opacity: 1 });
+                item.find( 'input:first' ).focus();
+                item.hide();
+                item.fadeIn( 'fast' );
+                item.trigger('itemadd');
+            });
+        }
+
+    });
+
+
+    jQuery(document.body).on('click', '.nested_wrap .remove', function(e) {
+        e.stopPropagation;
+        var button = jQuery(e.target);
+        var item = button.parents('.item:first');
+        var destroy = item.find('input.destroy');
+
+        var remove_item = function()
+        {
+            item.css('display', 'none');
+            item.trigger('itemremoveend');
+            if ( destroy.length > 0 )
+            {
+                destroy.val( true );
+            }
+            else
+            {
+                item.remove();
+            }
+        }
+
+
+        item.css('overflow', 'hidden');
+        item.animate({opacity: 0, height: 0}, 'fast', 'swing', remove_item)
+
+        item.trigger('itemremove');
+
+    });
 
 });

data/app/assets/javascripts/releaf/include/sortable.js

@@ -1,25 +1,27 @@
 jQuery(document).ready(function() {
-    jQuery('.list[data-sortable]').sortable({
-        axis: "y",
-        ontainment: "parent",
-        cursor: "move",
-        delay: 150,
-        distance: 5,
-        handle: '> .handle',
-        items: "> .item",
-        scroll: true,
-        update: function( event, ui ) {
-            jQuery(this).trigger('sortableupdate');
-        }
-    });
 
-    jQuery('[data-sortable]').on('sortableupdate', function() {
-        var sortable_container = jQuery(this);
-        sortable_container.find('> .item > input[type="hidden"].position').each(function(i) {
-            jQuery(this).attr('value', i);
+    jQuery(document.body).on('initsortable', function(e) {
+        jQuery(e.target).find('.list[data-sortable]').sortable({
+            axis: "y",
+            ontainment: "parent",
+            cursor: "move",
+            delay: 150,
+            distance: 5,
+            handle: '> .handle',
+            items: "> .item",
+            scroll: true,
+            update: function( event, ui ) {
+                jQuery(this).trigger('sortableupdate');
+            }
         });
     });
 
+    jQuery(document.body).trigger('initsortable');
+
+    jQuery( document.body ).on('itemadd', function (e) {
+        jQuery(e.target).trigger('initsortable');
+    });
+
     jQuery( document.body ).on('itemadd', '.list[data-sortable]', function (e) {
         jQuery(e.target).trigger('sortableupdate');
     });

data/app/assets/stylesheets/releaf/controllers/releaf/content.css.erb

@@ -159,6 +159,11 @@
 	margin-left: 0;
 	display: inline-block;
 }
+.controller-releaf-content .global_fields .value span
+{
+  padding-top: 2px;
+	display: inline-block;
+}
 .controller-releaf-content .global_fields select
 {
 	width: 158px;
@@ -407,6 +412,7 @@ margin: 0;
 }
 .controller-releaf-content .nested_object .field {
   border-bottom: 1px dotted #DDD;
+  margin: 0;
 }
 .controller-releaf-content .field .object_url {
   padding-left: 85px;

data/app/assets/stylesheets/releaf/include/field.css.erb

@@ -78,31 +78,38 @@
 }
 
 /* type: textarea */
-.field.type_textarea,
-.field.type_richtext
+.create-feature .field.type_textarea,
+.create-feature .field.type_richtext,
+.edit-feature .field.type_textarea,
+.edit-feature .field.type_richtext
 {
   width: 710px;
   margin: 0 auto;
 }
 
-.field.type_textarea .label_wrap,
-.field.type_richtext .label_wrap
+.create-feature .field.type_textarea .label_wrap,
+.create-feature .field.type_richtext .label_wrap,
+.edit-feature .field.type_textarea .label_wrap,
+.edit-feature .field.type_richtext .label_wrap
 {
 	float: none;
 	text-align: left;
 	width: auto;
 }
-.field.type_textarea .value,
-.field.type_richtext .value
+.create-feature .field.type_textarea .value,
+.create-feature .field.type_richtext .value,
+.edit-feature .field.type_textarea .value,
+.edit-feature .field.type_richtext .value
 {
 	margin-left: 0;
 	padding-left: 0;
 }
-.field.type_textarea textarea,
-.field.type_richtext textarea
+.create-feature .field.type_textarea textarea,
+.create-feature .field.type_richtext textarea,
+.edit-feature .field.type_textarea textarea,
+.edit-feature .field.type_richtext textarea
 {
-    min-width: 650px;
-	<%# width: 100%; %>
+  min-width: 650px;
 	-moz-box-sizing: border-box;
 	box-sizing: border-box;
 }
@@ -226,6 +233,9 @@
 
 
 
+.nested_wrap .add {
+  margin: 10px;
+}
 .nested_wrap .item {
   position: relative;
   background-color: #F3F3F3;
@@ -240,6 +250,13 @@
   padding: 0;
   border: none;
 }
+.nested_wrap .item .nested_wrap {
+  background-color: #ededed;
+}
+.nested_wrap .item .nested_wrap,
+.nested_wrap .item .nested_wrap .item {
+  border: 1px dotted gray;
+}
 
 .nested_wrap .field .label_wrap {
   width: auto;
@@ -249,9 +266,16 @@
 .nested_wrap .field .value {
   margin-left: 0;
 }
-.nested_wrap .field {
-  border-bottom: 1px dotted #DDD;
-}
 .value_preview {
   padding:  5px;
 }
+.nested_wrap .list > .resource
+{
+  padding-top: 10px;
+  padding-bottom: 10px;
+  border-top: 1px dotted #DDD;
+}
+.nested_wrap .list > .resource:last-child
+{
+  border-bottom: 1px dotted #DDD;
+}