etabliocms_core 0.0.3 → 0.0.4

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

@@ -1,5 +1,6 @@
 //= require jquery
 //= require jquery_ujs
+//= require jquery.ui.all
 //= require ../../../vendor/assets/javascripts/markitup/jquery.markitup.pack
 //= require ../../../vendor/assets/javascripts/markitup/sets/textile/set
 //= require admin

data/app/assets/javascripts/admin.js

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

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

@@ -1,5 +1,6 @@
 /*
  *= require boilerplate.screen
+ *= require jquery.ui.all
  *= require ../../../vendor/assets/javascripts/markitup/skins/simple/style
  *= require ../../../vendor/assets/javascripts/markitup/sets/textile/style
  *= require admin

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

@@ -120,7 +120,7 @@ header#topbar { color: white; font-weight: bold; background: $background_dark; p
 /* FORM */
 fieldset { border:0; clear:both;
     p {clear:both; margin: 10px 0 20px 0; }
-    legend { font-size:1.5em; font-weight:normal; }
+    legend { font-size:1.5em; font-weight:normal; margin-bottom: 10px; }
     label {color: $grey; width: 80px; padding-right:10px; display:block; float:left; text-align:right; margin-top: 3px }
     select { margin:0; }
     textarea { width: 500px;

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

@@ -30,24 +30,29 @@ module EtabliocmsCore
       end
 
       def item_html(item, stack)
+        title, locale = if defined?(EtabliocmsPages::Page) && item.is_a?(EtabliocmsPages::Page)
+                          [item.titles, item.locales]
+                        else
+                          [item.title, item.locale]
+                        end
         html = [
-            link_to(item.title, edit_path(item), :style => "padding-left:#{stack.size*10}px"),
-            content_tag(:span, I18n.l(item.created_at, :format => :short), :class => "centered"),
-            content_tag(:span, item.locale, :class => 'centered'),
-            actions_links(item, stack.last)
+          link_to(title, edit_path(item), :style => "padding-left:#{stack.size*10}px"),
+          content_tag(:span, I18n.l(item.created_at, :format => :short), :class => "centered"),
+          content_tag(:span, locale, :class => 'centered'),
+          actions_links(item, stack.last)
         ].inject("") { |line, cell_content| line + content_tag(:td, cell_content) }
         content_tag(:tr, html.html_safe)
       end
 
       def actions_links(item, parent)
         links = [
-            link_to(I18n.t('hierarchy.edit'), edit_path(item),
-                    :class => "icon icon-edit",
-                    :title => I18n.t('hierarchy.edit')),
-            link_to(I18n.t('hierarchy.destroy'), destroy_path(item),
-                    :method => :delete,
-                    :confirm => t("#{item.class.to_s.demodulize.underscore}.destroy_confirmation"),
-                    :class => 'icon icon-destroy', :title => I18n.t('hierarchy.destroy'))
+          link_to(I18n.t('admin.edit'), edit_path(item),
+                  :class => "icon icon-edit",
+                  :title => I18n.t('admin.edit')),
+          link_to(I18n.t('admin.destroy'), destroy_path(item),
+                  :method => :delete,
+                  :confirm => t("#{item.class.to_s.demodulize.underscore}.destroy_confirmation"),
+                  :class => 'icon icon-destroy', :title => I18n.t('admin.destroy'))
         ]
         unless item.is_first_of_siblings?(parent)
           links << link_to(I18n.t('hierarchy.up'), move_path(item, "move_higher"),

data/app/helpers/etabliocms_core/application_helper.rb

@@ -5,7 +5,6 @@ module EtabliocmsCore
   module ApplicationHelper
 
     include OutputHelper
-    include PagesHelper
 
     def add_breadcrumb(title, url = nil)
       @breadcrumbs << OpenStruct.new(:title => title, :url => url)
@@ -30,23 +29,5 @@ module EtabliocmsCore
       "#{qualified_controller_name} #{qualified_controller_name}-#{controller.action_name}"
     end
 
-    def render_sidebar?
-      return false if params[:action] == 'index' && params[:controller] == 'pages'
-      return false if params[:action] == 'search' && params[:controller] == 'pages'
-      return false if params[:controller] == 'devise/sessions'
-      true
-    end
-
-    def other_locale
-      case I18n.locale.to_s
-        when 'cs'
-          'en'
-        when 'en'
-          'cs'
-        else
-          'cs'
-      end
-    end
-
   end
 end

data/app/helpers/etabliocms_core/output_helper.rb

@@ -1,8 +1,6 @@
 module EtabliocmsCore::OutputHelper
 
-  def html_out(obj, method = "text", options = {})
-    return "" if obj.nil?
-    string = obj.send(method)
+  def html_out(string = "", options = {})
     string = RedCloth.new(string.to_s)
     string = string.to_html(:textile, :tags)
     string = truncate_and_strip_tags(string, options[:words].to_i) if options[:words]

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

@@ -25,7 +25,8 @@
       <% if etabliocms_core_user_signed_in? -%>
           <strong><%= t('common.logged') %>: <%= link_to current_etabliocms_core_user.email, admin_path %></strong>
           <ul>
-            <li><%= link_to t('common.logout'), destroy_etabliocms_core_user_session_path, {:title => t('common.logout'), :method => :delete} %></li>
+            <li><%= link_to I18n.t('admin.show_public', :domain => request.host), "/", :'data-popup' => true %></li>
+            <li><%= link_to I18n.t('common.logout'), destroy_etabliocms_core_user_session_path, {:title => t('common.logout'), :method => :delete} %></li>
           </ul>
       <% end -%>
 

data/config/initializers/configatron.rb

@@ -1 +0,0 @@
-#TODO make configatron work

data/config/locales/core.cs.yml

@@ -17,6 +17,7 @@ cs:
     back_to_admin: Zpět do administrace
     created_at: Vytvořeno
     actions: Akce
+    show_public: "Ukázat %{domain}"
     locales:
       cs: Česky
       en: Anglicky

data/lib/etabliocms_core/engine.rb

@@ -1,3 +1,9 @@
+require 'devise'
+require 'configatron'
+require 'redcloth'
+require 'jquery-rails'
+require 'jquery-ui-rails'
+
 module EtabliocmsCore
 
   class Engine < ::Rails::Engine
@@ -24,7 +30,6 @@ module EtabliocmsCore
       end
     end
 
-
   end
 
 end

data/lib/etabliocms_core/version.rb

@@ -1,3 +1,3 @@
 module EtabliocmsCore
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/form_helper.rb

@@ -6,20 +6,20 @@ module ActionView
       DEFAULT_TEXTAREA_HEIGHT = 200
 
       def boolean_yes_no_select(object_name, method, options = {}, html_options = {})
-        choices = {
-                'Ne' => false,
-                'Ano' => true
-        }
+        choices = [
+          ['Ano', true],
+          ['Ne', false],
+        ]
         InstanceTag.new(object_name, method, self, options.delete(:object)).to_select_tag(choices, options, html_options)
       end
 
       def textile_text_area(object_name, method, options = {})
-        obj = self.instance_variable_get("@#{object_name}")
         html = InstanceTag.new(object_name, method, self, options.delete(:object)).to_text_area_tag(options)
+        id = options[:id] || "#{object_name}_#{method}"
         html << javascript_tag do
           %Q(
                   $(function() {
-                      $('##{object_name}_#{method}').markItUp(mySettings);
+                      $('##{id}').markItUp(mySettings);
                   });
               )
         end
@@ -37,4 +37,4 @@ module ActionView
       end
     end
   end
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: etabliocms_core
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-25 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &19546480 !ruby/object:Gem::Requirement
+  requirement: &7572500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,32 @@ dependencies:
         version: 3.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *19546480
+  version_requirements: *7572500
+- !ruby/object:Gem::Dependency
+  name: jquery-rails
+  requirement: &7572080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *7572080
+- !ruby/object:Gem::Dependency
+  name: jquery-ui-rails
+  requirement: &7571600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *7571600
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &19542100 !ruby/object:Gem::Requirement
+  requirement: &7571080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *19542100
+  version_requirements: *7571080
 - !ruby/object:Gem::Dependency
   name: configatron
-  requirement: &19541720 !ruby/object:Gem::Requirement
+  requirement: &7567560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *19541720
+  version_requirements: *7567560
 - !ruby/object:Gem::Dependency
   name: RedCloth
-  requirement: &19540960 !ruby/object:Gem::Requirement
+  requirement: &7566940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -54,10 +76,10 @@ dependencies:
         version: 4.2.9
   type: :runtime
   prerelease: false
-  version_requirements: *19540960
+  version_requirements: *7566940
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &19539860 !ruby/object:Gem::Requirement
+  requirement: &7566480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *19539860
+  version_requirements: *7566480
 description: Small CMS
 email:
 - patrikjira@gmail.com
@@ -147,7 +169,6 @@ files:
 - app/models/etabliocms_core/user.rb
 - app/helpers/etabliocms_core/output_helper.rb
 - app/helpers/etabliocms_core/admin/table_tree_helper.rb
-- app/helpers/etabliocms_core/pages_helper.rb
 - app/helpers/etabliocms_core/application_helper.rb
 - config/routes.rb
 - config/initializers/configatron.rb

data/app/helpers/etabliocms_core/pages_helper.rb

@@ -1,33 +0,0 @@
-module EtabliocmsCore::PagesHelper
-
-  def render_tree(nodes = [])
-    html = ""
-    nodes.select { |node| node.visible }.each do |node|
-      html << "<li class='#{'no-divider' if node == nodes.last && node.level == 0 }'>"
-      html << page_link(node)
-      html << render_tree(node.children) if node.children.present? && actual?(node)
-      html << "</li>"
-    end
-    content_tag(:ul, html.html_safe)
-  end
-
-  def page_link(node)
-    link_to(node.title, node.url.present? ? node.url : page_path(node),
-            :class => node_class(node),
-            :style => "padding-left: #{node.level*10 + 15}px").html_safe
-  end
-
-  def actual?(node)
-    if node.url.present?
-      (node.url =~ /zeptejte-se/ && params[:controller] == 'questions') || false
-    else
-      @page.present? ? @page.self_and_ancestors.include?(node) : false
-    end
-
-  end
-
-  def node_class(node)
-    actual?(node) ? 'active' : 'inactive'
-  end
-
-end