etabliocms_core 0.0.8 → 0.0.9

data/app/assets/javascripts/admin-core.js

@@ -3,5 +3,5 @@
 //= require jquery.ui.all
 //= require ../../../vendor/assets/javascripts/markitup/jquery.markitup.pack
 //= require ../../../vendor/assets/javascripts/markitup/sets/textile/set
-//= require admin
+//= require core
 //= require shared

data/app/assets/javascripts/core.js

@@ -0,0 +1,33 @@
+var Admin = function() {
+
+    return {
+        initPopUp : function() {
+            $('a[data-popup=true]').click(function(e) {
+                e.preventDefault();
+                window.open($(this).attr('href'));
+            })
+        },
+
+        hideAndDestroyFields : function(self) {
+            var $self = $(self);
+            $self.closest(".fields").hide().
+                find("input[type=hidden]").val("1");
+        },
+
+        addFields : function(selector, content, association) {
+            var object_id = new Date().getTime().toString().substring(5);
+            var regexp = new RegExp("new_" + association, "g");
+            content = content.replace(regexp, object_id);
+
+            content = $(content);
+            content.find("input[data-kind=position]").val(object_id);
+            $('label', content).each(function(i) {
+                var id = 'id-' + new Date().getTime() + i;
+                $(this).attr('for', id).next().find('select:enabled, input:enabled').attr('id', id);
+                $(this).next('input, textarea, select').attr('id', id);
+            });
+
+            $(selector).append(content);
+        }
+    }
+}();

data/app/assets/stylesheets/admin-core.css

@@ -3,7 +3,7 @@
  *= require jquery.ui.all
  *= require ../../../vendor/assets/javascripts/markitup/skins/simple/style
  *= require ../../../vendor/assets/javascripts/markitup/sets/textile/style
- *= require admin
+ *= require core
  *= require shared
 */
 

data/app/assets/stylesheets/{admin.css.scss → core.css.scss}

@@ -127,6 +127,10 @@ fieldset { border:0; clear:both;
         &.small-text-area { height:50px; }
     }
     .submit { float:right; margin-right:3px; }
+    .submit-box { width: 750px; text-align: right; margin-top: 15px;
+        .submit { float: none;}
+        span.or { padding: 0 10px; font-style: italic; }
+    }
     .checkbox label {width:160px; }
     .multiple-select { height:5em; }
     input {
@@ -159,7 +163,7 @@ table {
     &.admin-table { border-collapse: collapse;
         td { padding: 3px; border: 1px solid $grey_dark; }
     }
-    .centered { text-align: center; display: block; }
+    .centered { text-align: center;  }
     .thumbnail { max-width: 250px; overflow: hidden;
         img { max-width: 240px; }
     }
@@ -169,6 +173,9 @@ table {
 
 /* OTHER */
 .submit { border: 4px solid $background_dark; background: $background_dark; font-weight: bold; color: white; font-size: 1.1em; @include round(); }
+.handle { text-align: center; 
+    img:hover { cursor: pointer }
+}
 
 #flash { text-align:center; margin: 10px 100px;
     p { margin:0;  border:0; padding: 10px; background: none;
@@ -190,3 +197,15 @@ table {
 }
 
 #errorExplanation { margin: 0 0 20px 0;}
+
+.nested-fields-table { border-collapse: collapse; margin: 10px 0 20px 0;
+    th { font-weight: bold; text-align:center; }
+    tbody td { padding:4px 2px; border:0;
+        &.thumbnail{ text-align: center;
+            img { max-height: 35px;  }
+        }
+    }
+    tr.fields { line-height: 15px;
+        td { vertical-align: middle; }
+    }
+}

data/app/assets/stylesheets/shared.css.scss

@@ -24,5 +24,6 @@
 .icon-refresh { background: image_url('icons/icon-refresh.gif'); }
 .icon-pause { background: image_url('icons/icon-pause.gif'); }
 .icon-stop { background: image_url('icons/icon-stop.gif'); }
+.icon-copypaste { background: image_url('icons/icon-copypaste.png'); }
 
 .public-icon-top  { background-image: image_url('public/icon-top.png'); }

data/app/controllers/etabliocms_core/admin/base_controller.rb

@@ -7,6 +7,7 @@ module EtabliocmsCore
       layout "admin"
 
       helper "etabliocms_core/admin/table_tree"
+      helper "etabliocms_core/admin/nested_fields"
 
     end
   end

data/app/helpers/etabliocms_core/admin/nested_fields_helper.rb

@@ -0,0 +1,21 @@
+module EtabliocmsCore
+  module Admin
+    module NestedFieldsHelper
+
+      def link_to_add_fields(name, f, association, target, options = {})
+        new_object = f.object.class.reflect_on_association(association).klass.new
+        fields = f.fields_for(association, new_object, :child_index => "new_#{association}") do |builder|
+          render(association.to_s.singularize + "_fields", :builder => builder)
+        end
+        link_to_function(name,
+                         "Admin.addFields('#{target}', '#{escape_javascript(fields)}', '#{association}')",
+                         options).html_safe
+      end
+
+      def link_to_remove_fields(name, f)
+        f.hidden_field(:_destroy) + link_to_function(name, "Admin.hideAndDestroyFields(this)")
+      end
+
+    end
+  end
+end

data/app/models/etabliocms_core/user.rb

@@ -5,5 +5,7 @@ module EtabliocmsCore
 
     attr_accessible :email, :password, :password_confirmation, :remember_me
 
+    has_paper_trail
+
   end
 end

data/app/views/etabliocms_core/admin/users/_form.html.erb

@@ -18,7 +18,7 @@
     <%= f.password_field :password_confirmation, :class => 'text-field' %>
   </p>
 
-  <p>
+  <p class="submit-box">
     <%= submit_tag t('admin.save'), :class => 'submit' %>
   </p>
 

data/app/views/layouts/admin.html.erb

@@ -14,6 +14,12 @@
   <title><%= yield :title %> | <%= t('admin.admin') %> </title>
   <%= stylesheet_link_tag "admin-core" %>
   <%= javascript_include_tag "admin-core" %>
+
+  <% if defined? EtabliocmsPages %>
+      <%= stylesheet_link_tag "admin-pages" %>
+      <%= javascript_include_tag "admin-pages" %>
+  <% end %>
+
   <%= csrf_meta_tags %>
 </head>
 

data/config/locales/core.cs.yml

@@ -13,6 +13,8 @@ cs:
     destroy: Odstranit
     edit: Editovat
     save: Uložit
+    save_and_continue: Uložit a pokračovat
+    or: nebo
     refresh: Obnovit
     back_to_admin: Zpět do administrace
     created_at: Vytvořeno

data/db/migrate/20120314110048_create_versions.etabliocms_core_engine.rb

@@ -0,0 +1,13 @@
+class CreateVersions < ActiveRecord::Migration
+  def change
+    create_table :versions do |t|
+      t.string   :item_type, :null => false
+      t.integer  :item_id,   :null => false
+      t.string   :event,     :null => false
+      t.string   :whodunnit
+      t.text     :object
+      t.datetime :created_at
+    end
+    add_index :versions, [:item_type, :item_id]
+  end
+end

data/lib/etabliocms_core/engine.rb

@@ -6,6 +6,7 @@ require 'jquery-ui-rails'
 require 'acts_as_sluggy'
 require 'extended_nested_set'
 require 'textile_extension_pack'
+require 'paper_trail'
 
 module EtabliocmsCore
 

data/lib/etabliocms_core/version.rb

@@ -1,3 +1,3 @@
 module EtabliocmsCore
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etabliocms_core
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-12 00:00:00.000000000 Z
+date: 2012-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &8553280 !ruby/object:Gem::Requirement
+  requirement: &12608440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *8553280
+  version_requirements: *12608440
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &8600640 !ruby/object:Gem::Requirement
+  requirement: &12551400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8600640
+  version_requirements: *12551400
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
-  requirement: &8599920 !ruby/object:Gem::Requirement
+  requirement: &12549840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8599920
+  version_requirements: *12549840
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &8599180 !ruby/object:Gem::Requirement
+  requirement: &12547980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *8599180
+  version_requirements: *12547980
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &8598500 !ruby/object:Gem::Requirement
+  requirement: &12546420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8598500
+  version_requirements: *12546420
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &8597700 !ruby/object:Gem::Requirement
+  requirement: &12544560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -76,10 +76,21 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *8597700
+  version_requirements: *12544560
+- !ruby/object:Gem::Dependency
+  name: paper_trail
+  requirement: &12559760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *12559760
 - !ruby/object:Gem::Dependency
   name: acts_as_sluggy
-  requirement: &8597160 !ruby/object:Gem::Requirement
+  requirement: &12558520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8597160
+  version_requirements: *12558520
 - !ruby/object:Gem::Dependency
   name: extended_nested_set
-  requirement: &8596540 !ruby/object:Gem::Requirement
+  requirement: &12557600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8596540
+  version_requirements: *12557600
 - !ruby/object:Gem::Dependency
   name: textile_extension_pack
-  requirement: &8595860 !ruby/object:Gem::Requirement
+  requirement: &12556680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8595860
+  version_requirements: *12556680
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &8595160 !ruby/object:Gem::Requirement
+  requirement: &12555900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8595160
+  version_requirements: *12555900
 description: Small CMS
 email:
 - patrikjira@gmail.com
@@ -140,11 +151,11 @@ files:
 - app/views/etabliocms_core/admin/users/new.html.erb
 - app/views/etabliocms_core/admin/users/edit.html.erb
 - app/views/etabliocms_core/admin/users/index.html.erb
+- app/assets/javascripts/core.js
 - app/assets/javascripts/shared.js
-- app/assets/javascripts/admin.js
 - app/assets/javascripts/admin-core.js
 - app/assets/stylesheets/shared.css.scss
-- app/assets/stylesheets/admin.css.scss
+- app/assets/stylesheets/core.css.scss
 - app/assets/stylesheets/admin-core.css
 - app/assets/images/admin/background-sidebar-top.png
 - app/assets/images/admin/line-heading.gif
@@ -203,6 +214,7 @@ files:
 - app/controllers/etabliocms_core/application_controller_extension.rb
 - app/models/etabliocms_core/user.rb
 - app/helpers/etabliocms_core/output_helper.rb
+- app/helpers/etabliocms_core/admin/nested_fields_helper.rb
 - app/helpers/etabliocms_core/admin/table_tree_helper.rb
 - app/helpers/etabliocms_core/application_helper.rb
 - config/routes.rb
@@ -211,6 +223,7 @@ files:
 - config/locales/devise.cs.yml
 - config/locales/core.cs.yml
 - config/locales/cs.rb
+- db/migrate/20120314110048_create_versions.etabliocms_core_engine.rb
 - db/migrate/20120222142355_create_users.etabliocms_core_engine.rb
 - lib/form_helper.rb
 - lib/etabliocms_core/version.rb

data/app/assets/javascripts/admin.js

@@ -1,11 +0,0 @@
-var Admin = function() {
-
-    return {
-        initPopUp : function() {
-            $('a[data-popup=true]').click(function(e) {
-                e.preventDefault();
-                window.open($(this).attr('href'));
-            })
-        }
-    }
-}();