mokio 0.0.11 → 0.0.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e673fcdb00f127378b0dc70c8586e6e22cd38322
-  data.tar.gz: 9fb714ca0ca7e7198a308c15e264ab7658247b04
+  metadata.gz: 8c699e4ede04dd7a79e2766ec3509713d773bb90
+  data.tar.gz: 0921f2de69320c60df935bfc8743ce59cd438819
 SHA512:
-  metadata.gz: fa463c58d2d3f9b3eec64b9c782c24d8bfe88cf86bb824b17d1da0f0034347ee6a5419da6352563a530c274c6196df5f14ced82fcd123d6a356f3d7b3e5d3fc7
-  data.tar.gz: b44132d923eba7f55f18403fb760896fdadcc722d21733f629826d84a048bf02eeb6d93fc42415c15a48968029c78807fd509ed435697f36b7bf736dbd2250c0
+  metadata.gz: 52e420ddad472cb8381e668b04f07160ed75ba352c9aa4de5656c62a40117560d96e9b695515dfa3af835dd362f622ee50e075bdc94b4c8b42f6dbedad0e496a
+  data.tar.gz: 940fa445ad459f82942ce668c3f1ad969c2335cda3e6213e2630b41927a3731c0a9f6946c3f6f91ddb2e3b1d2cc503ae96cbe8bc2da9753d0e745d6a40d861da

data/Rakefile

@@ -30,6 +30,8 @@ Bundler::GemHelper.install_tasks
 #   t.verbose = false
 # end
 
+Dir[File.join(File.dirname(__FILE__), 'tasks/**/*.rake')].each {|f| load f }
+
 require 'rspec/core'
 require 'rspec/core/rake_task'
 desc "Run all specs in spec directory (excluding plugin specs)"

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

@@ -645,4 +645,4 @@ select[multiple] {
       bottom: 8px;
     }
   }
-}
+}

data/app/views/mokio/common/_meta.html.slim

@@ -9,32 +9,32 @@
       span.icon16.icomoon-icon-facebook-2.white
       = bt("meta_facebook", Mokio::Meta)
 
-#meta_g_modal.modal.fade role="dialog" aria-hidden="true" style="display:none;" aria-labelledby="meta_g_ModalLabel" 
-  .modal-dialog
-    .modal-content
-      .modal-header
-        h3.modal-title.modal-photo id="meta_g_ModalLabel" 
-          span.icon24.icomoon-icon-google-plus
-          = bt("meta_google", Mokio::Meta)
-          small= bt("meta_google_desc", Mokio::Meta)
+  #meta_g_modal.modal.fade role="dialog" aria-hidden="true" style="display:none;" aria-labelledby="meta_g_ModalLabel"
+    .modal-dialog
+      .modal-content
+        .modal-header
+          h3.modal-title.modal-photo id="meta_g_ModalLabel"
+            span.icon24.icomoon-icon-google-plus
+            = bt("meta_google", Mokio::Meta)
+            small= bt("meta_google_desc", Mokio::Meta)
 
-      .modal-body
-        = f.fields_for :meta do |m|
-          = m.input :g_title
-          = m.input :g_desc
-          = m.input :g_keywords
-          = m.input :g_author
-          = m.input :g_copyright
-          = m.input :g_application_name
+        .modal-body
+          = f.fields_for :meta do |m|
+            = m.input :g_title
+            = m.input :g_desc
+            = m.input :g_keywords
+            = m.input :g_author
+            = m.input :g_copyright
+            = m.input :g_application_name
 
-      .modal-footer
-        button.btn.btn-primary  type="button" data-dismiss="modal" = bt("close")
+        .modal-footer
+          button.btn.btn-primary  type="button" data-dismiss="modal" = bt("close")
 
-  #meta_f_modal.modal.fade role="dialog" aria-hidden="true" style="display:none;" aria-labelledby="meta_f_ModalLabel" 
+  #meta_f_modal.modal.fade role="dialog" aria-hidden="true" style="display:none;" aria-labelledby="meta_f_ModalLabel"
     .modal-dialog
       .modal-content
         .modal-header
-          h3.modal-title.modal-photo id="meta_f_ModalLabel" 
+          h3.modal-title.modal-photo id="meta_f_ModalLabel"
             span.icon24.icomoon-icon-facebook-2
             = bt("meta_facebook", Mokio::Meta)
             small= bt("meta_facebook_desc", Mokio::Meta)

data/app/views/mokio/menus/_form.html.haml

@@ -19,7 +19,7 @@
 #url_box{:style => "display: #{@menu.contents.empty? && !@menu.external_link.blank? ? 'block' : 'none'};"}
   = f.input :external_link, label: btc("external_link",'Menu'), disabled: !@menu.display_editable_field?('external_link')
   = f.input :follow, :as => :select, :collection => [[bt("follow",'Menu'), "true"], [bt("nofollow",'Menu'), "false"]],  :include_blank => false
-= f.input :parent_id, :collection => @menu.parent_tree.collect{|m| [m.name, m.id]}, include_blank: false, disabled: !@menu.display_editable_field?('parent_id')
+= f.input :parent_id, :collection => @menu.parent_tree.collect{|m| ["#{'-' * m.ancestry.count('/')}#{m.name}", m.id]}, include_blank: false, disabled: !@menu.display_editable_field?('parent_id')
 
 .row-fluid
   %label.form-label.span2

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

@@ -1,8 +1,14 @@
 - cache [:tree, menu] do
-  div  class=("menu_div active_#{menu.active} visible_#{menu.visible} fake_#{menu.fake}") 
+  div class=("menu_div active_#{menu.active} visible_#{menu.visible} fake_#{menu.fake}")
     - if menu.fake
       span.menu_name
         = "#{menu.name} (ID: #{menu.id})"
+      span.menu_details
+        span.edit_buttons
+          - if menu.fake && !menu.parent.blank? && menu.children.empty?
+            = table_controls_delete_btn(obj_url(menu.class, menu), btc('confirm', Mokio::Menu))
+          - else
+            span.blank-delete
     - else
       - if menu.invisible_content
         span.warning

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

@@ -6,6 +6,7 @@
     h4
       span= bt("index_title", Mokio::Menu)
       = btn_new( bt("index_add_new", Mokio::Menu), new_url(Mokio::Menu) )
+      = btn_new( bt("index_add_new_menu_position", Mokio::Menu), new_menu_position_menus_url(Mokio::Menu) )
 
 - if @menus.present?
   ol#menusList.sortable

data/app/views/mokio/menus/new_menu_position.slim

@@ -0,0 +1,21 @@
+.span12
+  = render :partial => "mokio/common/notice"
+  .box
+    = box_title do
+      = bt("new_menu_position_title", @menu.class)
+    = common_form do
+      .row-fluid
+        = simple_form_for @menu, :url => create_menu_position_menus_path, :html => { :class => 'form-horizontal' } do |f|
+
+          .row-fluid
+            = f.hidden_field :fake, :value => true
+            = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: false, disabled: !@menu.display_editable_field?('lang_id')
+            = f.input :name
+
+
+          - cache [:form_buttons, obj] do
+            .form-actions
+              = btn_submit bt("save")
+              = btn_submit bt("save_and_create_new"), true
+              = btn_cancel "#{engine_root}#{obj.class.to_s.tableize.gsub("mokio/", "")}"
+

data/config/locales/en.yml

@@ -182,6 +182,7 @@ en:
       content_management: Content management
       page_elements: Site elements
       settings: Settings
+      new_menu_position: New menu position
 
   static_modules:
     actions: Actions
@@ -296,8 +297,9 @@ en:
     not_updated: "Menu <strong>'%{title}'</strong> has NOT been saved"
     not_deleted: "Menu <strong>'%{title}'</strong> has NOT beed deleted"
     index_title: Menu management
-    index_add_new: Add menu
+    index_add_new: Add menu element
     new_title: "New menu element"
+    index_add_new_menu_position: Add menu position
     edit_title: "Edit menu element"
     copy_title: "Copy menu element"
     save: Save
@@ -319,6 +321,7 @@ en:
     type: Type
     filter: filter ...
     blocks: "Reusable blocks"
+    new_menu_position_title: "New menu position"
 
   pic_galleries:
     active: Active

data/config/locales/pl.yml

@@ -182,6 +182,7 @@ pl:
       content_management: Zarządzanie treścią
       page_elements: Elementy strony
       settings: Ustawienia
+      new_menu_position: Nowa pozycja dla menu
 
   static_modules:
     actions: Akcje
@@ -296,7 +297,8 @@ pl:
     not_updated: "Menu <strong>'%{title}'</strong> nie zostało poprawnie zapisane."
     not_deleted: "Menu <strong>'%{title}'</strong> nie zostało usunięte."
     index_title: Zarządzanie menu
-    index_add_new: Dodaj menu
+    index_add_new: Dodaj element menu
+    index_add_new_menu_position: Dodaj pozycję dla menu
     new_title: "Nowy element menu"
     edit_title: "Edytuj element menu"
     copy_title: "Kopiuj element menu"
@@ -319,6 +321,7 @@ pl:
     type: Typ
     filter: wyszukaj treść ...
     blocks: Bloki
+    new_menu_position_title: Nowa pozycja dla menu
 
   pic_galleries:
     active: Włączona

data/config/routes.rb

@@ -9,11 +9,14 @@ Mokio::Engine.routes.draw do
         member do
           get :update_menu_breadcrumps
           get :copy
+
         end
 
         collection do
           post :sort
-          get  :lang_changed
+          get :lang_changed
+          get :new_menu_position
+          post :create_menu_position
         end
       end
 
@@ -23,7 +26,7 @@ Mokio::Engine.routes.draw do
       resources :static_modules do
         member do
           get :copy
-          get :update_active
+          post :update_active
         end
       end
       
@@ -133,7 +136,7 @@ Mokio::Engine.routes.draw do
 
       resources :module_positions do
         member do
-          get :update_active
+          post :update_active
           get  :copy
         end
       end

data/db/migrate/20140422135850_add_mokio_to_application.rb

@@ -1,6 +1,6 @@
 class AddMokioToApplication < ActiveRecord::Migration
   def change
-    create_table "mokio_available_modules", force: true do |t|
+    create_table "mokio_available_modules" do |t|
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "module_position_id"
@@ -10,7 +10,7 @@ class AddMokioToApplication < ActiveRecord::Migration
     add_index "mokio_available_modules", ["module_position_id"], name: "index_mokio_available_modules_on_module_position_id", using: :btree
     add_index "mokio_available_modules", ["static_module_id"], name: "index_mokio_available_modules_on_static_module_id", using: :btree
 
-    create_table "ckeditor_assets", force: true do |t|
+    create_table "ckeditor_assets" do |t|
       t.string   "data_file_name",               null: false
       t.string   "data_content_type"
       t.integer  "data_file_size"
@@ -27,7 +27,7 @@ class AddMokioToApplication < ActiveRecord::Migration
     add_index "ckeditor_assets", ["assetable_type", "type", "assetable_id"], name: "idx_ckeditor_assetable_type", using: :btree
 
 
-    create_table "mokio_contact_templates", force: true do |t|
+    create_table "mokio_contact_templates" do |t|
       t.text     "tpl"
       t.datetime "created_at"
       t.datetime "updated_at"
@@ -36,7 +36,7 @@ class AddMokioToApplication < ActiveRecord::Migration
 
     add_index "mokio_contact_templates", ["contact_id"], name: "index_mokio_contact_templates_on_contact_id", using: :btree
 
-    create_table "mokio_content_links", force: true do |t|
+    create_table "mokio_content_links" do |t|
       t.integer "content_id"
       t.integer "menu_id"
       t.integer "seq"
@@ -44,7 +44,7 @@ class AddMokioToApplication < ActiveRecord::Migration
 
     add_index "mokio_content_links", ["content_id", "menu_id"], name: "index_mokio_content_links_on_content_id_and_menu_id", unique: true, using: :btree
 
-    create_table "mokio_contents", force: true do |t|
+    create_table "mokio_contents" do |t|
       t.string   "title"
       t.text     "intro"
       t.text     "content"
@@ -71,7 +71,7 @@ class AddMokioToApplication < ActiveRecord::Migration
     add_index "mokio_contents", ["gmap_id"], name: "index_mokio_contents_on_gmap_id", using: :btree
     add_index "mokio_contents", ["meta_id"], name: "index_mokio_contents_on_meta_id", using: :btree
 
-    create_table "mokio_data_files", force: true do |t|
+    create_table "mokio_data_files" do |t|
       t.string   "name"
       t.string   "data_file"
       t.integer  "download_count",     default: 0
@@ -92,7 +92,7 @@ class AddMokioToApplication < ActiveRecord::Migration
 
     add_index "mokio_data_files", ["content_id"], name: "index_mokio_data_files_on_content_id", using: :btree
 
-    create_table "mokio_gmaps", force: true do |t|
+    create_table "mokio_gmaps" do |t|
       t.string   "full_address"
       t.string   "street_number"
       t.string   "route"
@@ -112,7 +112,7 @@ class AddMokioToApplication < ActiveRecord::Migration
     add_index "mokio_gmaps", ["lat"], name: "index_mokio_gmaps_on_lat", using: :btree
     add_index "mokio_gmaps", ["lng"], name: "index_mokio_gmaps_on_lng", using: :btree
 
-    create_table "mokio_langs", force: true do |t|
+    create_table "mokio_langs" do |t|
       t.string   "name"
       t.string   "shortname"
       t.boolean  "active"
@@ -121,7 +121,7 @@ class AddMokioToApplication < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    create_table "mokio_menus", force: true do |t|
+    create_table "mokio_menus" do |t|
       t.string   "name"
       t.boolean  "active",           default: true
       t.integer  "seq"
@@ -148,7 +148,7 @@ class AddMokioToApplication < ActiveRecord::Migration
     add_index "mokio_menus", ["meta_id"], name: "index_mokio_menus_on_meta_id", using: :btree
     add_index "mokio_menus", ["slug"], name: "index_mokio_menus_on_slug", unique: true, using: :btree
 
-    create_table "mokio_meta", force: true do |t|
+    create_table "mokio_meta" do |t|
       t.string   "g_title"
       t.string   "g_desc"
       t.string   "g_keywords"
@@ -164,14 +164,14 @@ class AddMokioToApplication < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    create_table "mokio_module_positions", force: true do |t|
+    create_table "mokio_module_positions" do |t|
       t.string   "name"
       t.string   "tpl"
       t.datetime "created_at"
       t.datetime "updated_at"
     end
 
-    create_table "mokio_recipients", force: true do |t|
+    create_table "mokio_recipients" do |t|
       t.string   "email",                     null: false
       t.boolean  "active",     default: true
       t.datetime "created_at"
@@ -181,7 +181,7 @@ class AddMokioToApplication < ActiveRecord::Migration
 
     add_index "mokio_recipients", ["contact_id"], name: "index_mokio_recipients_on_contact_id", using: :btree
 
-    create_table "mokio_selected_modules", force: true do |t|
+    create_table "mokio_selected_modules" do |t|
       t.integer  "available_module_id"
       t.integer  "menu_id"
       t.integer  "seq"
@@ -189,7 +189,7 @@ class AddMokioToApplication < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    create_table "mokio_static_modules", force: true do |t|
+    create_table "mokio_static_modules" do |t|
       t.integer  "available_modules_id"
       t.string   "title"
       t.text     "content"
@@ -207,7 +207,7 @@ class AddMokioToApplication < ActiveRecord::Migration
       t.text     "intro"
     end
 
-    create_table "mokio_users", force: true do |t|
+    create_table "mokio_users" do |t|
       t.string   "email",                  default: "", null: false
       t.string   "encrypted_password",     default: "", null: false
       t.string   "reset_password_token"

data/lib/mokio/concerns/controllers/menus.rb

@@ -71,6 +71,19 @@ module Mokio
           render :nothing => true
         end
 
+        # Renders form for creating menu positon (fake menu - direct child of a lang root)
+
+        def new_menu_position
+          @menu = Mokio::Menu.new
+        end
+
+        def create_menu_position
+          parent = Mokio::Menu.where(lang_id: params[:menu][:lang_id], ancestry: nil).first
+          params[:menu][:parent_id] = parent.id
+          params[:menu][:deletable] = true
+          create
+        end
+
         private
           #
           # Method to initialize menu's dual select boxes
@@ -109,7 +122,17 @@ module Mokio
 
           def transform_modules #:doc:
             if !params[:menu][:available_module_ids].nil?
-              params[:menu][:available_module_ids] = params[:menu][:available_module_ids].values.flatten
+              av_module_ids = params[:menu][:available_module_ids].values.flatten
+
+              # modules that are always displayed are not saved as selected_modules
+
+              av_modules = AvailableModule.where('id IN (?)', av_module_ids)
+              av_modules.each do |mod|
+                if mod.static_module.always_displayed
+                  av_module_ids.delete(mod.id.to_s)
+                end
+              end
+              params[:menu][:available_module_ids] = av_module_ids
             end
           end
 
@@ -146,7 +169,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def menu_params #:doc:
-            params[:menu].permit(:name, :seq, :target, :external_link, :follow, :parent_id, :active, :visible, :description, :lang_id, :content_ids => [],:available_module_ids => [],
+            params[:menu].permit(:name, :seq, :target, :external_link, :follow, :parent_id, :active, :visible, :description, :lang_id, :fake, :content_ids => [],:available_module_ids => [],
               :meta_attributes => Mokio::Meta.meta_attributes)
           end
       end

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

@@ -21,7 +21,7 @@ module Mokio
         # Get recipient_id's for given email
         #
         def recipient_emails=(emails)
-          self.recipient_ids = Mokio::Recipient.ids_from_emails(emails)
+          self.recipients = emails.delete(' ').split(',').map {|m| Mokio::Recipient.new(email: m) }
         end
 
         #

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

@@ -98,6 +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
+          raise "NoLangDefinedException" if Mokio::Lang.count < 1
           if lang_id.nil? || lang_id == 0
             Mokio::Content.lang(Mokio::Lang.first.id).order(:title) - contents
           else
@@ -202,7 +203,7 @@ module Mokio
           m = self
           slug = m.slug
           unless m.parent.nil? || slug.nil?
-            while !m.parent.fake
+            while m.parent && !m.parent.fake
               slug = m.parent.slug + "/" + slug
               m = m.parent
             end

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

@@ -11,15 +11,6 @@ module Mokio
           belongs_to :contact
           validates :email, :email => true
         end
-
-        module ClassMethods
-          #
-          # Get ids from given emails
-          #
-          def ids_from_emails(emails)
-            emails.delete(' ').split(',').map {|m| Mokio::Recipient.create(email: m).id }
-          end
-        end
       end
     end
   end

data/lib/mokio/engine.rb

@@ -85,5 +85,13 @@ module Mokio
     initializer "mokio.views" do |app|
       app.config.views_config = Mokio::TemplateRenderer.read_config
     end
+
+    config.generators do |g|
+      g.test_framework      :rspec,        :fixture => false
+      g.fixture_replacement :factory_girl, :dir => 'spec/factories'
+      g.assets false
+      g.helper false
+    end
+
   end
 end