mokio 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d075d4b3838e3120c82c5d4970cebcd78f329773
-  data.tar.gz: 2c64df9f1f249f23234bbfe4a229b8abe185729b
+  metadata.gz: 8d9580cc7a530c2fa75974d77e5b22e972a83619
+  data.tar.gz: 720f18e51b6d58b2a7bb31e10bbb27e890b37a29
 SHA512:
-  metadata.gz: 3dd0be5bc579b84a929a476eea48e4d54c10357a89b364e88108de305105989d008b66bf69f88e22ef04779f459639d959a40a2594ead88e17eb9d6009ed2489
-  data.tar.gz: f84b5dd7d74daba6b8c52aa9ff7dcafb8336566cd502e587fd82e24e463209631d43ccb703f11722ae9c6433ce6122faae8296b38cdec755df2ea13beaee32fd
+  metadata.gz: 2dc1cd4ff618b9bfc077e9cbb6ce05eaccf69024d7e39d2fd6ed139b1a7fa9bc4f5a896c93b6b0075bfe3f59d4d340ce4dd65355cd261fb0d973a489b1415478
+  data.tar.gz: fb8eeb931e6bb4195152c91147433e802223ecf47010b9e62ab7adc2ffbaebe73297154d7cd61618ced3c0084a386e98195f6c17d2cb57c0c176f9ce8dde094c

data/app/assets/stylesheets/backend/icons.css.scss

@@ -5699,7 +5699,7 @@
   *margin-right: .3em;
   line-height: 14px;
   vertical-align: text-top;
-  background-image: url("backend/glyphicons-halflings.png");
+  background-image: image-url("backend/glyphicons-halflings.png");
   background-position: 14px 14px;
   background-repeat: no-repeat;
 }
@@ -5713,7 +5713,7 @@
 .dropdown-menu > li > a:hover > [class*=" icon-"],
 .dropdown-menu > .active > a > [class^="icon-"],
 .dropdown-menu > .active > a > [class*=" icon-"] {
-  background-image: url("backend/glyphicons-halflings-white.png");
+  background-image: image-url("backend/glyphicons-halflings-white.png");
 }
 
 .icon-glass {

data/app/models/mokio/content.rb

@@ -15,8 +15,8 @@
 #  gallery_type :string(255)
 #  editable     :boolean          default(TRUE)
 #  deletable    :boolean          default(TRUE)
-#  display_from :date
-#  display_to   :date
+#  display_from :datetime
+#  display_to   :datetime
 #  created_at   :datetime
 #  updated_at   :datetime
 #  meta_id      :integer

data/app/views/mokio/articles/_form.html.slim

@@ -5,8 +5,8 @@
 = f.input :title, disabled: !obj.display_editable_field?('title')
 = f.input :intro,    :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !obj.display_editable_field?('intro')
 = f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !obj.display_editable_field?('content')
-= f.input :display_from, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from) if f.object.display_from) },  disabled: !obj.display_editable_field?('display_from')
-= f.input :display_to, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to) if f.object.display_to) },  disabled: !obj.display_editable_field?('display_to')
+= f.input :display_from, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_from", :value => (localize(f.object.display_from, :format => :datepicker) if f.object.display_from) },  disabled: !obj.display_editable_field?('display_from')
+= f.input :display_to, :wrapper => :date, :as => :string,   :input_html => { :class => "mask-date display_to", :value => (localize(f.object.display_to, :format => :datepicker) if f.object.display_to) },  disabled: !obj.display_editable_field?('display_to')
 .row-fluid
   label.form-label.span2
     = t('menus.content_assoc')

data/app/views/mokio/menus/_menu.html.slim

@@ -2,7 +2,7 @@
   div  class=("menu_div active_#{menu.active} visible_#{menu.visible} fake_#{menu.fake}") 
     - if menu.fake
       span.menu_name
-        = menu.name
+        = "#{menu.name} (ID: #{menu.id})"
     - else
       - if menu.invisible_content
         span.warning
@@ -11,7 +11,7 @@
         span.blank
           | !
       span.menu_name
-        = link_to menu.name, edit_url(menu.class, menu)
+        = link_to "#{menu.name} (ID: #{menu.id})", edit_url(menu.class, menu)
       span.menu_details
         span.content_type
           = menu.content_type

data/config/initializers/ckeditor.rb

@@ -8,7 +8,7 @@ Ckeditor.setup do |config|
 
   # Allowed image file types for upload.
   # Set to nil or [] (empty array) for all file types
-  # config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff"]
+  config.image_file_types = ["jpg", "jpeg", "png", "gif", "tiff", "svg"]
 
   # Allowed attachment file types for upload.
   # Set to nil or [] (empty array) for all file types

data/config/locales/en.yml

@@ -23,6 +23,7 @@ en:
   time:
     formats:
       default: "%d-%m-%Y"
+      datepicker: "%d-%m-%Y %H:%M"
   date:
     formats:
       default: "%d-%m-%Y"
@@ -575,9 +576,8 @@ en:
     dayNamesShort: "Sun,Mon,Tue,Wed,Thu,Fri,Sat"
     dayNamesMin: "Su,Mo,Tu,We,Th,Fr,Sa"
     weekHeader: "Wk"
-    mask: "99/99/9999"
-    maskFormat: "MM/dd/yyyy"
-    dateFormat: "mm/dd/yy"
+    mask: "99/99/9999 99:99"
+    dateFormat: "dd/mm/yy"
     firstDay: "0"
     isRTL: "0"
     showMonthAfterYear: "0"
@@ -652,6 +652,7 @@ en:
             password_confirmation:
               confirmation: Passwords do not match
             email:
+              taken: Given e-mail address is taken
               blank: Email cannot be empty
               invalid: Provided an incorrect e-mail address
       editable:

data/config/locales/pl.yml

@@ -23,6 +23,7 @@ pl:
   time:
     formats:
       default: "%d-%m-%Y"
+      datepicker: "%d-%m-%Y %H:%M"
   date:
     formats:
       default: "%d-%m-%Y"
@@ -575,8 +576,7 @@ pl:
     dayNamesShort: "Nie,Pn,Wt,Śr,Czw,Pt,So"
     dayNamesMin: "N,Pn,Wt,Śr,Cz,Pt,So"
     weekHeader: "Tydz"
-    mask: 99-99-9999
-    maskFormat: dd-MM-yyyy
+    mask: 99-99-9999 99:99
     dateFormat: "dd-mm-yy"
     firstDay: "1"
     isRTL: "0"
@@ -652,6 +652,7 @@ pl:
             password_confirmation:
               confirmation: Hasła się nie zgadzają
             email:
+              taken: Podany adres e-mail jest już zajęty
               blank: Proszę wpisać adres email
               invalid: Podano nieprawidłowy adres e-mail
       editable:

data/db/migrate/20141209072051_change_data_type_for_display_dates.rb

@@ -0,0 +1,8 @@
+class ChangeDataTypeForDisplayDates < ActiveRecord::Migration
+  def change
+    change_table :mokio_contents do |t|
+      t.change :display_from, :datetime
+      t.change :display_to, :datetime
+    end
+  end
+end

data/db/migrate/20141209101853_add_menu_css_options.rb

@@ -0,0 +1,6 @@
+class AddMenuCssOptions < ActiveRecord::Migration
+  def change
+    add_column :mokio_menus, :css_class, :string
+    add_column :mokio_menus, :css_body_class, :string
+  end
+end

data/lib/generators/mokio/ga_script_generator.rb

@@ -0,0 +1,26 @@
+module Mokio
+  class GaScriptGenerator < Rails::Generators::Base #:nodoc:
+    source_root File.expand_path("../templates", __FILE__)
+    argument :uid, :type => :string
+    desc "Creates Google Analytics script and partial view"
+
+    def create_script
+      script = <<TEXT
+        (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+                (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+                m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+              })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+
+              ga('create', '#{uid}', 'auto');
+              ga('send', 'pageview');
+TEXT
+      Mokio::ExternalScript.create(:name => "Google Analytics", :script =>script)
+    end
+
+    def create_view
+      puts "Paste it into your layout body: " + "= render :partial => 'frontend/layout_elements/google_analytics'".green
+      template "_google_analytics.html.slim", "app/views/frontend/layout_elements/_google_analytics.html.slim"
+    end
+
+  end
+end

data/lib/generators/mokio/positions_generator.rb

@@ -0,0 +1,14 @@
+module Mokio
+  class PositionsGenerator < Rails::Generators::Base #:nodoc:
+    argument :names, :type => :array
+
+    desc "Creates module positions"
+    def create_positions
+      names.each do |name|
+        Mokio::ModulePosition.create(:name => name)
+        puts "Successfully created #{name.green} position."
+      end
+    end
+
+  end
+end

data/lib/generators/mokio/templates/_google_analytics.html.slim

@@ -0,0 +1,3 @@
+- content_for :js do
+  javascript:
+    #{build_external_script "Google Analytics"}

data/lib/mokio.rb

@@ -251,4 +251,5 @@ require "mokio/concerns"
 require "mokio/frontend_helpers"
 require "mokio/logger"
 require "mokio/template_renderer"
+require "mokio/slugged"
 require "mokio/version"

data/lib/mokio/concerns/models/content.rb

@@ -10,7 +10,7 @@ module Mokio
         included do
           include Mokio::Concerns::Models::Common
 
-          has_many :content_links
+          has_many :content_links, :dependent => :destroy
           has_many :data_files, :dependent => :destroy
           has_many :menus, :through => :content_links
 
@@ -30,8 +30,13 @@ module Mokio
           scope :lang,          -> (lang_id) { where('lang_id = ? or lang_id is null', lang_id) }
           scope :order_default, -> { order("seq asc") }
           scope :active,        -> { where(active: true) }
+          scope :_displayed_from, -> { where("display_from < ? OR display_from IS NULL", Time.zone.now) }
+          scope :_displayed_to, -> { where("display_to > ? OR display_to IS NULL", Time.zone.now) }
+          scope :displayed, -> { active._displayed_from._displayed_to}
+
           scope :order_created, -> { reorder(nil).order('created_at DESC') }
 
+          before_save :update_display_to
           after_save :update_etag
 
           self.per_page = 15
@@ -53,6 +58,17 @@ module Mokio
           self.touch(:etag)
         end
 
+
+        #
+        # Update display_to field: set time to 23:59:59 if time is set to 00:00:00
+        #
+        def update_display_to
+          if self.display_to && self.display_to.time.strftime("%H:%M") == "00:00"
+            updated = self.display_to.end_of_day
+            self.display_to = updated
+          end
+        end
+
         #
         # Output for title field
         #

data/lib/mokio/concerns/models/menu.rb

@@ -53,6 +53,16 @@ module Mokio
           end
         end
 
+        module ClassMethods
+          #
+          # Columns for table - needed for coping a menu
+          #
+          def columns_for_table
+            %w(name active updated_at lang_id)
+          end
+        end
+
+
         #
         # Friendly_id slug_candidates (<b>gem 'friendly_id'</b>)
         #
@@ -65,7 +75,7 @@ module Mokio
 
         def build_slug
           if parent.nil?
-            return ''
+            ''
           elsif !parent.fake
             parent.slug
           else
@@ -88,7 +98,7 @@ module Mokio
         # Returns list of contents available for assignment to given menu element (based on lang_id) ordered by title
         #
         def available_contents
-          if (lang_id.nil? || lang_id == 0)
+          if lang_id.nil? || lang_id == 0
             Mokio::Content.lang(Mokio::Lang.first.id).order(:title) - contents
           else
             Mokio::Content.lang(lang_id).order(:title) - contents
@@ -124,7 +134,7 @@ module Mokio
         #
         def available_modules_by_pos
           menu_id = (self.id.nil? ? -1 : self.id)
-          if (lang_id.nil? || lang_id == 0)
+          if lang_id.nil? || lang_id == 0
             Mokio::AvailableModule.not_selected_for_menu(menu_id).for_lang(Mokio::Lang.first.id).group_by(&:module_position_id)
           else
             Mokio::AvailableModule.not_selected_for_menu(menu_id).for_lang(lang_id).group_by(&:module_position_id)
@@ -164,11 +174,11 @@ module Mokio
         end
 
         def content_type
-          if (contents.length > 1)
+          if contents.length > 1
             I18n.t('menus.list').titleize
-          elsif (contents.length == 1)
+          elsif contents.length == 1
             I18n.t(contents[0].type.underscore).titleize
-          elsif (!external_link.blank?)
+          elsif !external_link.blank?
             I18n.t('external_link', Menu).titleize
           else
             ''
@@ -176,7 +186,7 @@ module Mokio
         end
 
         #
-        # Retruns always editable fields
+        # Returns always editable fields
         #
         def always_editable_fields
           @always = %w(active seq visible always_displayed ancestry)
@@ -191,13 +201,20 @@ module Mokio
         def full_slug
           m = self
           slug = m.slug
-          unless m.parent.nil?
+          unless m.parent.nil? || slug.nil?
             while !m.parent.fake
               slug = m.parent.slug + "/" + slug
               m = m.parent
             end
             slug
           end
+          slug
+        end
+
+        # Real slug - menu slug hierarchical or not, with lang prefix or not
+
+        def real_slug (hierarchical)
+          "/#{hierarchical ? full_slug : slug}"
         end
 
         #

data/lib/mokio/engine.rb

@@ -35,6 +35,7 @@ module Mokio
         ActionView::Base.send :include, Mokio::FrontendHelpers::StaticModulesHelper
         ActionView::Base.send :include, Mokio::FrontendHelpers::ContentHelper
         ActionView::Base.send :include, Mokio::FrontendHelpers::ExternalScriptsHelper
+        ActionView::Base.send :include, Mokio::FrontendHelpers::LangsHelper
       end
     end
 

data/lib/mokio/frontend_helpers.rb

@@ -2,4 +2,5 @@ require 'mokio/frontend_helpers/content_helper'
 require 'mokio/frontend_helpers/menu_helper'
 require 'mokio/frontend_helpers/static_modules_helper'
 require 'mokio/frontend_helpers/external_scripts_helper'
+require 'mokio/frontend_helpers/langs_helper'
 

data/lib/mokio/frontend_helpers/external_scripts_helper.rb

@@ -13,11 +13,8 @@ module Mokio
       # * +script_name+ - external script name from mokio_external_scripts
 
       def build_external_script(script_name)
-        html = "";
         result  = Mokio::ExternalScript.find_by(name:script_name)
-        if !result.blank?
-          html = build_common(result)
-        end
+        html = result.blank? ? "" : build_common(result)
         html.html_safe
       end
 
@@ -29,9 +26,9 @@ module Mokio
       # * +result+ - all external scripts from mokio_external_scripts
 
       def build_all_external_scripts
-        html = "";
+        html = ""
         result = Mokio::ExternalScript.all
-        if !result.blank?
+        unless result.blank?
           result.each do |position|
             html = build_common(position)
           end
@@ -50,12 +47,12 @@ module Mokio
       # * +obj.script+ - external script content from mokio_external_scripts
       # * +obj.name+ - external script name from mokio_external_scripts
 
-      def build_common(obj)
+      def build_common(obj, html_comments = false)
         html = ""
-        if !obj.blank?
-          html << "<!--#{obj.name} - EXTERNAL SCRIPT START-->\n"
+        unless obj.blank?
+          html << "<!--#{obj.name} - EXTERNAL SCRIPT START-->\n" if html_comments
           html << obj.script + "\n"
-          html << "<!--#{obj.name} END -->\n"
+          html << "<!--#{obj.name} END -->\n"  if html_comments
           html.html_safe
         end
       end

data/lib/mokio/frontend_helpers/langs_helper.rb

@@ -0,0 +1,31 @@
+module Mokio
+  module FrontendHelpers
+    #
+    # Frontend helper methods used with Mokio::Lang objects
+    #
+    module LangsHelper
+      #
+      # Builds forms with buttons to choose site language
+      # Pass your controller action path and check params[:lang_code]
+      #
+      # ==== Attributes
+      #
+      # * +controller_action+ - your controller action path (e.g. "content_home_path")
+      # * +image_folder+ - folder where helper will search country flag images (default: "langs" - searched in app/assets/images/langs)
+      # * +submit_class+ - submit buttons css class (defaut: "btn-lang-submit")
+      # * +image_ext+ - language flag image extension(defaut: "png")
+      #
+      def build_lang_menu(controller_action, image_folder = "langs", submit_class = "btn-lang-submit", image_ext = "png")
+        html = ""
+        Mokio::Lang.active.each do |lang|
+          lang_form =  form_tag(controller_action, :id => "#{lang.shortname}_lang_form") do
+            hidden_field_tag("lang_code", lang.shortname) +
+            image_submit_tag("#{image_folder}/#{lang.shortname}.#{image_ext}", :class => submit_class)
+          end
+          html << lang_form
+        end
+        html.html_safe
+      end
+    end
+  end
+end

data/lib/mokio/frontend_helpers/menu_helper.rb

@@ -6,7 +6,7 @@ module Mokio
     module MenuHelper
 
       #
-      # Builds menu tree for specified arguments, returns html
+      # Builds menu tree for specified arguments, returns html. Left for backward compatibility. Use build_menu_extended instead.
       #
       # ==== Attributes
       #
@@ -70,6 +70,7 @@ module Mokio
       # * +limit+ - how deep should builder look for children
       # * +index+ - how deep is function already
       #
+
       def build_items(item, limit, index, hierarchical  = false, root_path = "")
         return "" if index > limit || !item.children.present?
 
@@ -98,6 +99,174 @@ module Mokio
 
       alias_method :create_menu, :build_menu
 
+      #
+      # Finds proper menu element - based on lang and menu position and calls build_menu_extended for this menu element
+      #
+
+      def build_menu_extended_lang(menu_position_name, lang_code, limit = 999999, include_menu_parent = false, options = {hierarchical: true, with_nav: true, nav_class: "nav_menu", active_class: "active", item_class: nil, item_with_children_class: nil, item_without_children_class: nil, ul_class: nil, ul_wrapper_class: nil, ul_nested_class:nil, ul_nested_wrapper_class:nil, a_class: nil})
+        lang = Mokio::Lang.find_by_shortname(lang_code)
+        menu_parent = Mokio::Menu.where(lang_id: lang.id, name: menu_position_name) unless lang.blank?
+        build_menu_extended(menu_parent.first.id, limit, include_menu_parent, options) unless menu_parent.blank?
+      end
+
+
+      #
+      # Builds menu tree for specified arguments, returns html. Allows specifying css classes and start from any menu element.
+      # Menu structure:
+      # <nav> (optional)
+      #   <div class='#{ul_wrapper_class}'>
+      #     <ul class='#{ul_class}'>
+      #       <div class='#{item_wrapper_class}'> (optional)
+      #         <li class='#{item_class} #{item_with_children_class} #{active_class}'>
+      #            <a>item.slug or item.full_slug</a>
+      #           <div class='#{ul_nested_wrapper_class}'>
+      #             <ul class="#{ul_nested_class}">
+      #               <li class='#{item_class}#{item without_children_class}'>
+      #                 <a class='#{active_class}'>item.slug or item.full_slug</a>
+      #               </li>
+      #               <li class='#{item_class}#{item without_children_class}'
+      #                 <a class='#{active_class}'>item.slug or item.full_slug</a>
+      #               </li>
+      #             </ul>
+      #           </div>
+      #         </li>
+      #       </div>
+      #       <li class='#{item_class}#{item without_children_class}'>
+      #         <a class='#{active_class}'>item.slug or item.full_slug</a>
+      #       <li>
+      #     </ul>
+      #   </div>
+      # </nav>
+      #
+      # ==== Attributes
+      #
+      # * +menu_parent_id+ - starting menu element's id - this element will be displayed or not and all its children will be displayed
+      # * +include_menu_parent+ - whether parent menu element should be displayed or not
+      # * +limit+      - how deep should builder look for children, count starts from 1
+      # * +options+   - hash with following options:
+      # *   +hierarchical+ - specifies if you want to use hierarchical links or not
+      # *   +with_nav+  - whether nav element should be generated
+      # *   +nav_class+  - css class of the nav element
+      # *   +active_class+  - css class of the active items
+      # *   +item_class+  - css class of the items
+      # *   +item_with_children_class+  - css class of the items that have children
+      # *   +item_without_children_class+  - css class of the items without children
+      # *   +ul_class+  - css class of the ul element
+      # *   +ul_wrapper_class+ - css class of the ul wrapper class, if nil then wrapper for ul will not be generated
+      # *   +ul_nested_class+  - css class of the nested ul element
+      # *   +ul_nested_wrapper_class+ - css class of the ul wrapper class, generated only for nested uls, if nil then wrapper for nested ul will not be generated
+      # *   +a_class+ - css class of the a element
+      #*    +content_type+ - content types for which we'll build menu items(string or array e.g. "Mokio::Article" OR ["Mokio::Article", "Mokio::PicGallery"])
+      #*    +content_item_class+ - css class of the content items (not Mokio::Menu, specified above)
+
+      # if you need hierarchical links in your frontend, add following route to your routes.rb
+
+      # get "/*menu_path/:menu_id" => "content#show"
+      # get "/:menu_id" => "content#show"
+
+      def build_menu_extended(menu_parent_id, limit = 999999, include_menu_parent = false, options = {})
+
+        set_options_defaults(options)
+
+        html = ""
+        html = "<nav #{"class='#{options[:nav_class]}'" if options[:nav_class]} id='menuMain'>" if options[:with_nav]
+        html << "<div class='#{options[:ul_wrapper_class]}'>" unless options[:ul_wrapper_class].nil?
+        html << "<ul #{"class='#{options[:ul_class]}'" if options[:ul_class]}>"
+        begin
+          menu_parent = Mokio::Menu.find(menu_parent_id)
+          if include_menu_parent
+            html << build_menu_items_extended(menu_parent, limit, 1, menu_parent.ancestor_ids, options)
+          else
+            menu_parent.children.order_default.each do |i|
+              html << build_menu_items_extended(i, limit, 1, i.ancestor_ids, options)
+            end
+          end
+
+        rescue => e
+          MOKIO_LOG.error "BUILD MENU ERROR: #{e}"
+        end
+        html << "</ul>"
+        html << "</div>" unless options[:ul_wrapper_class].nil?
+        html << "</nav>"  if options[:with_nav]
+        html.html_safe
+      end
+
+      # Builds menu starting from given menu element (real menu only)
+      # - displays all its children
+
+      def build_menu_items_extended (i, limit, index, active_ids = [], options)
+
+        return "" if index > limit
+
+        html = ""
+        if i.visible && i.active
+          item_class = build_item_class(i, options, active_ids)
+          html << "<li #{"class='#{item_class}'" unless item_class.blank?}>"
+
+          if i.external_link.blank?
+            html << "<a #{"class='#{options[:a_class]}'" if options[:a_class]} href='#{i.real_slug(options[:hierarchical])}'>#{i.name}</a>"
+          else
+            html << "<a #{"class='#{options[:a_class]}'" if options[:a_class]} href='#{i.external_link}' #{"rel='nofollow'" unless i.follow  || i.follow.nil?} #{"target='#{i.target}'" unless (i.target.blank? || i.target == '_self') }>#{i.name}</a>"
+          end
+
+          items_html = ""
+
+          i.children.order_default.each do |item_child|
+            items_html << build_menu_items_extended(item_child, limit, index + 1, active_ids, options)
+          end
+
+          content_item_class = [item_class, options[:content_item_class]].compact.join(" ")
+          i.contents.displayed.order_default.each do |content|
+            next if options[:content_type].blank? || options[:content_type].exclude?(content.type.to_s)
+            items_html << "<li #{"class='#{content_item_class}'" unless content_item_class.blank?}>"
+            items_html << "<a #{"class='#{options[:a_class]}'" if options[:a_class]} href='#{content.slug}'>#{content.title}</a>" if content.respond_to?("slug")
+            items_html << "</li>"
+          end
+
+          unless items_html.empty?
+            html << "<div class='#{options[:ul_nested_wrapper_class]}'>" unless options[:ul_nested_wrapper_class].nil?
+            html << "<ul #{"class='#{options[:ul_nested_class]}'" if options[:ul_nested_class]}>"
+            html << items_html
+            html << "</ul>"
+            html << "</div>" unless options[:ul_nested_wrapper_class].nil?
+          end
+          html << "</li>"
+        end
+        html.html_safe
+      end
+
+
+      # Builds css class fot one menu item
+
+      def build_item_class(i, options, active_ids)
+
+        item_class = []
+
+        item_class << options[:item_class]
+        item_class << i.css_class
+
+        if i.has_children?
+          item_class << options[:item_with_children_class]
+        else
+          item_class << options[:item_without_children_class]
+        end
+
+        item_class << options[:active_class] if i.slug == params[:menu_id] || i.slug == request.original_fullpath.match(/(\D+\/{1}|\D+)/)[0].gsub('/', '') || active_ids.include?(i.id)
+        item_class.compact.join(" ")
+      end
+
+
+      # Sets default values for build_menu_extended
+
+      def set_options_defaults(options)
+        options[:hierarchical] = true unless options.has_key? :hierarchical
+        options[:with_nav] = true unless options.has_key? :with_nav
+        options[:nav_class] = "nav_menu" unless options.has_key? :nav_class
+        options[:active_class] =  "active" unless options.has_key? :active_class
+        options[:content_type] = "" unless options.has_key? :content_type
+      end
+
+
       #
       # Raises IsNotAMokioMenuErrorr if obj isn't a Mokio::Menu object
       #

data/lib/mokio/slugged.rb

@@ -0,0 +1,17 @@
+module Mokio
+  module Slugged
+    def slug
+      "/#{slug_prefix}/#{id}/#{slug_candidate.parameterize}"
+    end
+    def print_slug
+      "#{slug}/print"
+    end
+    protected
+    def slug_prefix
+      "content"
+    end
+    def slug_candidate
+      title
+    end
+  end
+end

data/lib/mokio/version.rb

@@ -2,5 +2,5 @@ module Mokio
   #
   # Actual Mokio version
   #
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mokio
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - versoft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-19 00:00:00.000000000 Z
+date: 2014-12-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -1466,9 +1466,14 @@ files:
 - db/migrate/20140731061227_create_mokio_external_scripts.rb
 - db/migrate/20141009125027_alter_external_scripts.rb
 - db/migrate/20141024131942_migrate_external_codes_to_external_scripts.rb
+- db/migrate/20141209072051_change_data_type_for_display_dates.rb
+- db/migrate/20141209101853_add_menu_css_options.rb
 - lib/generators/mokio/copy/assets_generator.rb
 - lib/generators/mokio/copy/views_generator.rb
+- lib/generators/mokio/ga_script_generator.rb
 - lib/generators/mokio/install_generator.rb
+- lib/generators/mokio/positions_generator.rb
+- lib/generators/mokio/templates/_google_analytics.html.slim
 - lib/generators/mokio/templates/mokio.rb
 - lib/mokio.rb
 - lib/mokio/common.rb
@@ -1523,11 +1528,13 @@ files:
 - lib/mokio/frontend_helpers.rb
 - lib/mokio/frontend_helpers/content_helper.rb
 - lib/mokio/frontend_helpers/external_scripts_helper.rb
+- lib/mokio/frontend_helpers/langs_helper.rb
 - lib/mokio/frontend_helpers/menu_helper.rb
 - lib/mokio/frontend_helpers/static_modules_helper.rb
 - lib/mokio/logger.rb
 - lib/mokio/simple-form-wrappers.rb
 - lib/mokio/site_helper.rb
+- lib/mokio/slugged.rb
 - lib/mokio/solr_config.rb
 - lib/mokio/template_renderer.rb
 - lib/mokio/uploader.rb