mokio 0.0.12 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8c699e4ede04dd7a79e2766ec3509713d773bb90
-  data.tar.gz: 0921f2de69320c60df935bfc8743ce59cd438819
+  metadata.gz: 7a79602440d253b63fdbecb64b2934f431ca4c90
+  data.tar.gz: c6eac19bc0b242e2f67bb35f962de4252d650f44
 SHA512:
-  metadata.gz: 52e420ddad472cb8381e668b04f07160ed75ba352c9aa4de5656c62a40117560d96e9b695515dfa3af835dd362f622ee50e075bdc94b4c8b42f6dbedad0e496a
-  data.tar.gz: 940fa445ad459f82942ce668c3f1ad969c2335cda3e6213e2630b41927a3731c0a9f6946c3f6f91ddb2e3b1d2cc503ae96cbe8bc2da9753d0e745d6a40d861da
+  metadata.gz: 1aaa048e9c81f0428aed55617141c2dc4bb8261245ffc4ac21a3d1ba23894d16a73b36a856d98c9e4c4f7fa9b60f994165cc2c6f4b98cdf0d688c3df71811eb7
+  data.tar.gz: 2c5786798f82fb34b4b3515297e9212a4082f9bb5014c2915c824e1671ff2717b88da6e297e04930699958d9326ff109a7fdab06b57a2519662b87729c59900a

data/app/assets/javascripts/backend/movie_gallery.js.erb

@@ -17,8 +17,8 @@ $(document).ready(function() {
   // loads modal with edit form - displays loader during modal load    
   $('.edit-youtube').click(function(e) {
     e.preventDefault();
-    $('#gallery-loader').show();
-    $('#gallery-loader').offset({top: $(this).parent().parent().offset().top, left: $(this).parent().parent().offset().left});
+//    $('#gallery-loader').show();
+//    $('#gallery-loader').offset({top: $(this).parent().parent().offset().top, left: $(this).parent().parent().offset().left});
     
     var url = $(this).attr('data-href');
     $('#edit-youtube-form').load(url, function(result){
@@ -113,7 +113,7 @@ $(document).ready(function() {
   //
   function sortablephotos(){
     $('.sortable').sortable({
-      // handle: '.dragable .handler',
+      handle: '.drag_wrapper',
       placeholder: "ui-state-highlight",
 
       //

data/app/assets/javascripts/backend/photo_gallery/functions.js

@@ -60,16 +60,14 @@ function prettyphoto(){
 
 function gallery_lazy_load() {
   //hide the action buttons
-  $('.actionBtn, .dragable').hide();
+  $('.actionBtn').hide();
   //show action buttons on hover image
   $('.galleryView>li').hover(
     function () {
        $(this).find('.actionBtn').stop(true, true).show(300);
-       $(this).find('.dragable,.handler').stop(true, true).show(300);
     },
     function () {
         $(this).find('.actionBtn').stop(true, true).hide(300);
-        $(this).find('.dragable,.handler').stop(true, true).hide(300);
     }
   );
   //
@@ -154,7 +152,7 @@ function edit_image_button() {
 //
 function sortablephotos(){
   $('.sortable').sortable({
-    handle: '.dragable .handler',
+    handle: '.drag_wrapper',
     placeholder: "ui-state-highlight",
 
     //

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

@@ -75,7 +75,7 @@ button.uploader {
 
       .handler {
         background: black;
-        opacity: $default-opacity;
+
         padding: 4px 1px;
         cursor: pointer;
       }
@@ -159,10 +159,22 @@ input.btn[type="submit"] {
   margin-right: 15px;
 }
 
+
+
+//.ui-state-highlight {
+//  background-color: #F5F5F5 !important;
+//  border: 1px solid #E5E5E5 !important;
+//  box-shadow: 0 1px 0 rgba(229, 229, 229, 0.1) !important;
+//}
+
+// 20.02.2015 mz
 .ui-state-highlight {
+  min-width: 114px;
   background-color: #F5F5F5 !important;
-  border: 1px solid #E5E5E5 !important;
-  box-shadow: 0 1px 0 rgba(229, 229, 229, 0.1) !important;
+  border: 1px dashed #E5E5E5 !important;
+  box-shadow: 0 1px 0 rgba(229,229,229,0.1) !important;
+  min-height: 94px;
+  
 }
 
 #FlashInfo {
@@ -646,3 +658,21 @@ select[multiple] {
     }
   }
 }
+
+// 20.02.2015 mz
+.drag_wrapper {
+
+  cursor:move;
+  height:auto;
+  width:auto;
+}
+
+.sortableli {
+
+
+  min-height:100px;
+
+  .drag_wrapper {
+    min-height:100px;
+  }
+}

data/app/controllers/passwords_controller.rb

@@ -0,0 +1,8 @@
+class PasswordsController < Devise::PasswordsController
+  protected
+  def after_sending_reset_password_instructions_path_for(resource_name)
+    flash[:alert]=t("devise.passwords.send_instructions")
+    Mokio::Engine.routes.url_helpers.root_path<<new_user_session_path[1..-1] #delete one slash to prevent link like this: /backend//users/sign_in
+  end
+
+end

data/app/models/mokio/contact.rb

@@ -4,6 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  title        :string(255)
+#  subtitle :text
 #  intro        :text
 #  content      :text
 #  type         :string(255)

data/app/models/mokio/content.rb

@@ -4,6 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  title        :string(255)
+#  subtitle :text
 #  intro        :text
 #  content      :text
 #  type         :string(255)

data/app/models/mokio/menu.rb

@@ -22,6 +22,8 @@
 #  fake             :boolean          default(FALSE)
 #  meta_id          :integer
 #  slug             :string(255)
+# css_class :string
+# css_body_class :string
 #
 module Mokio
   class Menu < ActiveRecord::Base

data/app/models/mokio/mov_gallery.rb

@@ -4,6 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  title        :string(255)
+#  subtitle :text
 #  intro        :text
 #  content      :text
 #  type         :string(255)

data/app/models/mokio/pic_gallery.rb

@@ -4,6 +4,7 @@
 #
 #  id           :integer          not null, primary key
 #  title        :string(255)
+#  subtitle :text
 #  intro        :text
 #  content      :text
 #  type         :string(255)

data/app/models/mokio/static_module.rb

@@ -5,6 +5,7 @@
 #  id                   :integer          not null, primary key
 #  available_modules_id :integer
 #  title                :string(255)
+#  subtitle :text
 #  content              :text
 #  external_link        :string(255)
 #  lang_id              :integer

data/app/views/devise/mailer/reset_password_instructions.slim

@@ -0,0 +1,8 @@
+p = t("devise.mailer.hello")<<" #{@resource.email}"
+
+p = t("devise.mailer.reset_password_first_paragraph")
+
+= link_to t("backend.change_password"), edit_password_url(@resource, reset_password_token: @token)
+
+p = t("devise.mailer.reset_password_second_paragraph")
+p = t("devise.mailer.reset_password_third_paragraph")

data/app/views/devise/passwords/edit.html.haml

@@ -0,0 +1,41 @@
+!!!
+%html{xmlns: "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
+    %title MOKIO - CMS Open Source
+    %meta{content: "MOKIO", name: "description"}/
+    %meta{content: "MOKIO", name: "application-name"}/
+
+    / Mobile Specific Metas
+    %meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
+    = stylesheet_link_tag 'backend'
+    = csrf_meta_tags
+    = favicon_link_tag 'backend/favicon.ico'
+
+    %link{href: "images/favicon.ico", rel: "shortcut icon"}/
+  %body.loginPage
+    .container-fluid
+      #header
+        .row-fluid
+          .navbar
+            .navbar-inner
+              .container-fluid
+                %a#logo.brand{href: "http://www.bloomnet.eu", target: "_blank", title: "MOKIO - CMS Open Source"}
+                  = image_tag "backend/mokio-logo.svg", alt:"Logo MOKIO"
+    .container-fluid
+      .loginContainer
+        -#= bt("reset_password_instruction")
+        = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :put }) do |f|
+          = f.input :reset_password_token, as: :hidden
+          = f.input :only_password, as: :hidden, value: true
+          = f.full_error :reset_password_token
+          .form-row.row-fluid
+            -#= f.input :email, required: true, autofocus: true, :wrapper => :label_newline
+            = f.input :password, label: t("activerecord.attributes.mokio/user.password"), required: true, autofocus: true, :wrapper => :label_newline
+            = f.input :password_confirmation, label: t("activerecord.attributes.mokio/user.password_confirmation"), required: true, :wrapper => :label_newline
+          %br
+          -# = link_to bt("sign_up"), new_registration_path(resource_name)
+          -#= f.button :submit, bt("sign_in"), class: 'btn btn-info', id: 'loginBtn'
+          = f.button :submit, bt("change_password"), id:"loginBtn", class: 'btn btn-info'
+
+        -#= link_to "ble ble", new_user_password_path(resource_name)

data/app/views/devise/passwords/new.html.haml

@@ -0,0 +1,35 @@
+!!!
+%html{xmlns: "http://www.w3.org/1999/xhtml"}
+  %head
+    %meta{content: "text/html; charset=utf-8", "http-equiv" => "Content-Type"}/
+    %title MOKIO - CMS Open Source
+    %meta{content: "MOKIO", name: "description"}/
+    %meta{content: "MOKIO", name: "application-name"}/
+
+    / Mobile Specific Metas
+    %meta{content: "width=device-width, initial-scale=1.0", name: "viewport"}/
+    = stylesheet_link_tag 'backend'
+    = csrf_meta_tags
+    = favicon_link_tag 'backend/favicon.ico'
+
+    %link{href: "images/favicon.ico", rel: "shortcut icon"}/
+  %body.loginPage
+    .container-fluid
+      #header
+        .row-fluid
+          .navbar
+            .navbar-inner
+              .container-fluid
+                %a#logo.brand{href: "http://www.bloomnet.eu", target: "_blank", title: "MOKIO - CMS Open Source"}
+                  = image_tag "backend/mokio-logo.svg", alt:"Logo MOKIO"
+    .container-fluid
+      .loginContainer
+        = simple_form_for(resource, as: resource_name, url: password_path(resource_name), html: { method: :post }) do |f|
+          .form-row.row-fluid
+            = f.input :email, required: true, autofocus: true, :wrapper => :label_newline
+          %br
+          -# = link_to bt("sign_up"), new_registration_path(resource_name)
+          -#= f.button :submit, bt("sign_in"), class: 'btn btn-info', id: 'loginBtn'
+          = f.button :submit, bt("change_password"), id:"loginBtn", class: 'btn btn-info'
+
+      = render "devise/shared/links"

data/app/views/devise/sessions/new.html.haml

@@ -35,4 +35,4 @@
             %div
               =flash[:alert]
         %br
-        
+        = link_to t("devise.link.forgot_password"), new_password_path(resource_name)

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

@@ -3,6 +3,7 @@
 = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
 = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
 = f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :subtitle, disabled: !obj.display_editable_field?('subtitle'), :as => :string
 = 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, :format => :datepicker) if f.object.display_from) },  disabled: !obj.display_editable_field?('display_from')

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

@@ -1,51 +1,50 @@
-- cache :meta_buttons do
-  a data-toggle="modal" href=("#meta_g_modal" ) 
-    button.btn.btn-success.btn-mini.box-form3.right
-      span.icon16.icomoon-icon-google-plus.white
-      = bt("meta_google", Mokio::Meta)
+a data-toggle="modal" href=("#meta_g_modal" )
+  button.btn.btn-success.btn-mini.box-form3.right
+    span.icon16.icomoon-icon-google-plus.white
+    = bt("meta_google", Mokio::Meta)
 
-  a data-toggle="modal" href=("#meta_f_modal" ) 
-    button.btn.btn-primary.btn-mini.box-form2.right
-      span.icon16.icomoon-icon-facebook-2.white
-      = bt("meta_facebook", Mokio::Meta)
+a data-toggle="modal" href=("#meta_f_modal" )
+  button.btn.btn-primary.btn-mini.box-form2.right
+    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"
-    .modal-dialog
-      .modal-content
-        .modal-header
-          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)
+#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"
+          span.icon24.icomoon-icon-facebook-2
+          = bt("meta_facebook", Mokio::Meta)
+          small= bt("meta_facebook_desc", Mokio::Meta)
 
-        .modal-body
-          = f.fields_for :meta do |m|
-            = m.input :f_title
-            = m.input :f_type
-            = m.input :f_image
-            = m.input :f_url
-            = m.input :f_desc
+      .modal-body
+        = f.fields_for :meta do |m|
+          = m.input :f_title
+          = m.input :f_type
+          = m.input :f_image
+          = m.input :f_url
+          = m.input :f_desc
 
-        .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")

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

@@ -2,6 +2,7 @@
 = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
 = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
 = f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :subtitle, disabled: !obj.display_editable_field?('subtitle'), :as => :string
 = f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !obj.display_editable_field?('content')
 
 = f.input :recipient_emails, :as => :string, :input_html => { :class => "recipients span10" }, disabled: !obj.display_editable_field?('recipient_emails')

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

@@ -1,19 +1,22 @@
+= render :partial => "mokio/common/main_pic", locals: {f:f}
+= 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 :lang_id, :as => :hidden, :input_html => { :value => (@menu.lang_id.nil? ? 1 : @menu.lang_id)}, disabled: !@menu.display_editable_field?('lang_id')
+= f.input :active, :wrapper => :active_checkbox, disabled: !@menu.display_editable_field?('active')
+= f.input :visible, :wrapper => :active_checkbox, disabled: !@menu.display_editable_field?('visible')
 .row-fluid
   %label.form-label.span2
     = btc('slug', Mokio::Menu)
   .span10
     = text_field_tag '', (@menu.full_slug.nil?) ? bt('no_slug', Mokio::Menu) : "/" + @menu.full_slug.to_s, readonly: 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 :lang_id, :as => :hidden, :input_html => { :value => (@menu.lang_id.nil? ? 1 : @menu.lang_id)}, disabled: !@menu.display_editable_field?('lang_id')
-= f.input :active, :wrapper => :active_checkbox, disabled: !@menu.display_editable_field?('active')
-= f.input :visible, :wrapper => :active_checkbox, disabled: !@menu.display_editable_field?('visible')
 = f.input :name, disabled: !@menu.display_editable_field?('name')
+= f.input :subtitle, disabled: !@menu.display_editable_field?('subtitle'), :as => :string
 .row-fluid
   %label.form-label.span2
     = btc('type', Mokio::Menu)
   .span10
     = select_tag "menu_type", options_for_select([[btc("content",'Menu'), 'content'],[btc("external_link",'Menu'), 'external_link']], @menu.contents.empty? && !@menu.external_link.blank? ? "external_link" : "content") 
-
+= f.input :css_class, disabled: !@menu.display_editable_field?('css_class')
+= f.input :css_body_class, disabled: !@menu.display_editable_field?('css_body_class')
 .row-fluid#content_box{:style => "display: #{@menu.contents.empty? && !@menu.external_link.blank? ? 'none' : 'block'};"}
   = dual_select_box(@menu.available_contents, 'id', 'title', @menu.contents, 'id', 'title', btc('content', 'Menu'), '','menu[content_ids][]', true, false, false, @menu.display_editable_field?('contents'))
 #url_box{:style => "display: #{@menu.contents.empty? && !@menu.external_link.blank? ? 'block' : 'none'};"}

data/app/views/mokio/mov_galleries/_form_inputs.html.slim

@@ -3,6 +3,7 @@
 = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
 = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
 = f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :subtitle, disabled: !obj.display_editable_field?('subtitle'), :as => :string
 = f.input :intro, label: btc("intro", 'mov_gallery'),  :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 => 300} }, 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')

data/app/views/mokio/photos/photo.html.slim

@@ -1,18 +1,20 @@
 - cache [:photo_edit, photo] do
-  li.sortableli id=photo.id class=(photo.thumb_name ) 
-    .dragable
-      span.handler
-        span.icon16.brocco-icon-move.white
-    a title=photo.name rel="prettyPhoto[pp_gal]" href=(photo.data_file.url ) 
+  li.sortableli id=photo.id class=(photo.thumb_name )
+    .drag_wrapper
+      .dragable
+        .actionBtn
+          a title=photo.name rel="prettyPhoto[pp_gal]" href=(photo.data_file.url )
+            span.icon16.icomoon-icon-zoom-in.white
       - if photo.thumb.blank?
-        img alt=photo.name src=(photo.data_file.url(photo.thumb_name) ) 
+        img alt=photo.name src=(photo.data_file.url(photo.thumb_name) )
       - else
-        img alt=photo.name src=(photo.thumb.url ) 
-    .actionBtn
-      a.edit data-toggle="modal" href=("#modaledit_#{photo.id}" ) 
-        span.icon16.icomoon-icon-pencil-2.white
-      = link_to self.send("#{photo.class.to_s.demodulize.downcase}_path", photo), remote: true, method: :delete, class: "delete" do
-        span.icon16.icomoon-icon-remove.white
+        img alt=photo.name src=(photo.thumb.url )
+
+      .actionBtn
+        a.edit data-toggle="modal" href=("#modaledit_#{photo.id}" )
+          span.icon16.icomoon-icon-pencil-2.white
+        = link_to self.send("#{photo.class.to_s.demodulize.downcase}_path", photo), remote: true, method: :delete, class: "delete" do
+          span.icon16.icomoon-icon-remove.white
 
   /!
   /! edit form

data/app/views/mokio/pic_galleries/_form_inputs.html.slim

@@ -3,6 +3,7 @@
 = f.input :active, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('active')
 = f.input :home_page, :wrapper => :active_checkbox, disabled: !obj.display_editable_field?('home_page')
 = f.input :title, disabled: !obj.display_editable_field?('title')
+= f.input :subtitle, disabled: !obj.display_editable_field?('subtitle'), :as => :string
 = 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 => 300} }, disabled: !obj.display_editable_field?('content')
 

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

@@ -1,6 +1,7 @@
 = f.input :lang_id, collection: Mokio::Lang.all.collect{|lang| [bt(lang.name), lang.id]},  include_blank: bt('all'), disabled: !obj.display_editable_field?('lang_id')
 = f.input :active, :wrapper => :active_checkbox, disabled: !@static_module.display_editable_field?('active')
 = f.input :title, disabled: !@static_module.display_editable_field?('title')
+= f.input :subtitle, disabled: !@static_module.display_editable_field?('subtitle'), :as => :string
 = f.input :intro,   :wrapper => :ckeditor,  :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Mini', :height => 150} }, disabled: !@static_module.display_editable_field?('intro')
 = f.input :content, :wrapper => :ckeditor,  :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Medium', :height => 400} }, disabled: !@static_module.display_editable_field?('content')
 = f.association :module_positions, :wrapper => :checkbox, :as => :check_boxes, disabled: !@static_module.display_editable_field?('module_positions')

data/app/views/mokio/youtubes/youtube.html.slim

@@ -1,12 +1,13 @@
 - cache [:youtube_edit, youtube] do
   li.sortableli id=(youtube.id ) 
-    .dragable
-      span.handler
-        span.icon16.brocco-icon-move.white
-    = link_to preview_movie_youtube_path(youtube), remote: true, method: :get, title: youtube.name.html_safe do
+    .drag_wrapper
+      .dragable
+        .actionBtn
+          = link_to preview_movie_youtube_path(youtube), remote: true, method: :get, title: youtube.name.html_safe do
+            span.icon16.icomoon-icon-film.white
       img class="img-load" alt=youtube.name src=(youtube.thumb_url[-1,1] == "0" ? youtube.thumb_external_url : youtube.thumb.url(:thumb))
-    .actionBtn
-      a.edit data-toggle="modal" class="edit-youtube" data-href="#{mokio.root_path}/youtubes/#{youtube.friendly_id}/edit" target=("edit-youtube-form") 
-        span.icon16.icomoon-icon-pencil-2.white
-      = link_to youtube_path(youtube), remote: true, method: :delete, class: "delete" do
-        span.icon16.icomoon-icon-remove.white
+      .actionBtn
+        a.edit data-toggle="modal" class="edit-youtube" data-href="#{mokio.root_path}/youtubes/#{youtube.friendly_id}/edit" target=("edit-youtube-form")
+          span.icon16.icomoon-icon-pencil-2.white
+        = link_to youtube_path(youtube), remote: true, method: :delete, class: "delete" do
+          span.icon16.icomoon-icon-remove.white

data/config/locales/devise.en.yml

@@ -2,6 +2,8 @@
 
 en:
   devise:
+    link:
+      forgot_password: "Forgot your password?"
     confirmations:
       confirmed: "Your account was successfully confirmed."
       send_instructions: "You will receive an email with instructions about how to confirm your account in a few minutes."
@@ -17,6 +19,10 @@ en:
       unauthenticated: "You need to sign in or sign up before continuing."
       unconfirmed: "You have to confirm your account before continuing."
     mailer:
+      hello: "Hello"
+      reset_password_first_paragraph: "Someone has requested a link to change your password. You can do this through the link below."
+      reset_password_second_paragraph: "If you didn't request this, please ignore this email."
+      reset_password_third_paragraph: "Your password won't change until you access the link above and create a new one."
       confirmation_instructions:
         subject: "Confirmation instructions"
       reset_password_instructions:

data/config/locales/devise.pl.yml

@@ -1,5 +1,7 @@
 pl:
   devise:
+    link:
+      forgot_password: "Zapomniałeś hasła?"
     confirmations:
       confirmed: Konto zostało poprawnie aktywowane.
       send_instructions: Instrukcja jak aktywować konto zostanie niezwłocznie wysłana na podany adres e-mail.
@@ -15,6 +17,10 @@ pl:
       unauthenticated: Aby kontynuować zaloguj lub zarejestruj się.
       unconfirmed: Aby kontynuować aktywuj konto.
     mailer:
+      hello: "Witaj"
+      reset_password_first_paragraph: "Wysłano prośbę o zresetowanie hasła. Aby zresetować hasło kliknij w poniższy link."
+      reset_password_second_paragraph: "Jeśli nie Ty wysłałeś tę prośbę, prosimy o zignorowanie tego maila."
+      reset_password_third_paragraph: "Twoje hasło nie zmieni się dopóki nie ustawisz nowego."
       confirmation_instructions:
         subject: Instrukcja aktywacji konta
       reset_password_instructions:
@@ -26,7 +32,7 @@ pl:
       success: Logowanie przez konto %{kind} zakończyło się sukcesem.
     passwords:
       no_token: Do tej strony możesz dostać się tylko poprzez wiadomość e-mail resetującą hasło. Jeśli to z niej tu trafiłeś, upewnij się, że użyłeś pełnego adresu.
-      send_instructions: Instrukcja zmiany hasła zostanie niezwłocznie wysłana na podany adres e-mail.
+      send_instructions: Instrukcja zmiany hasła zostanie wysłana na podany adres e-mail.
       send_paranoid_instructions: Jeśli Twój adres e-mail istnieje w naszej bazie, otrzymasz zaraz wiadomość z instrukcjami odzyskiwania hasła.
       updated: Hasło zmienione poprawnie. Zostałeś automatycznie zalogowany.
       updated_not_active: Hasło zmienione poprawnie.

data/config/locales/en.yml

@@ -298,8 +298,8 @@ en:
     not_deleted: "Menu <strong>'%{title}'</strong> has NOT beed deleted"
     index_title: Menu management
     index_add_new: Add menu element
-    new_title: "New menu element"
     index_add_new_menu_position: Add menu position
+    new_title: "New menu element"
     edit_title: "Edit menu element"
     copy_title: "Copy menu element"
     save: Save
@@ -683,6 +683,7 @@ en:
         display_from: Displayed from
         display_to: Displayed to
         title: Title
+        subtitle: "Subtitle"
         type: Type
         updated_at: Updated at
         lang_id: Language
@@ -695,6 +696,7 @@ en:
         display_from: Displayed from
         display_to: Displayed to
         title: Title
+        subtitle: "Subtitle"
         type: Type
         updated_at: Updated at
         lang_id: Language
@@ -707,6 +709,7 @@ en:
         display_from: Displayed from
         display_to: Displayed to
         title: Title
+        subtitle: "Subtitle"
         type: Type
         updated_at: Updated at
         lang_id: Language
@@ -726,6 +729,7 @@ en:
         active: Active
         content: Content
         title: Title
+        subtitle: "Subtitle"
         type: Type
         updated_at: Updated at
         lang_id: Language
@@ -744,6 +748,7 @@ en:
         display_from: Displayed from
         display_to: Displayed to
         title: Title
+        subtitle: "Subtitle"
         module_positions: Positions
         always_displayed: Always displayed
         updated_at: Updated at
@@ -792,7 +797,11 @@ en:
       mokio/menu:
         lang_id: Language
         name: Name
+        subtitle: "Subtitle"
         external_link: Url
+        css_class: "Menu CSS class"
+        css_body_class: "Page CSS class"
+        main_pic: "thumbnail"
         active: Active
         visible: Visible
         description: Description

data/config/locales/pl.yml

@@ -658,6 +658,8 @@ pl:
               taken: Podany adres e-mail jest już zajęty
               blank: Proszę wpisać adres email
               invalid: Podano nieprawidłowy adres e-mail
+            reset_password_token:
+              invalid: "Niepoprawny token."
       editable:
         not_permitted: Edycja niedozwolona
       messages:
@@ -683,6 +685,7 @@ pl:
         display_from: Wyświetlany od
         display_to: Wyświetlany do
         title: Tytuł
+        subtitle: "Podtytuł"
         type: Typ
         updated_at: Ostatnio edytowany
         lang_id: Język
@@ -695,6 +698,7 @@ pl:
         display_from: Wyświetlany od
         display_to: Wyświetlany do
         title: Tytuł
+        subtitle: "Podtytuł"
         type: Typ
         updated_at: Ostatnio edytowany
         lang_id: Język
@@ -707,6 +711,7 @@ pl:
         display_from: Wyświetlany od
         display_to: Wyświetlany do
         title: Tytuł
+        subtitle: "Podtytuł"
         type: Typ
         updated_at: Ostatnio edytowany
         lang_id: Język
@@ -726,6 +731,7 @@ pl:
         active: Włączona
         content: Treść
         title: Tytuł
+        subtitle: "Podtytuł"
         type: Typ
         updated_at: Ostatnio edytowany
         lang_id: Język
@@ -744,6 +750,7 @@ pl:
         display_from: Wyświetlany od
         display_to: Wyświetlany do
         title: Tytuł
+        subtitle: "Podtytuł"
         module_positions: Pozycje bloku
         always_displayed: Wyświetlany zawsze
         updated_at: Ostatnio edytowany
@@ -792,7 +799,11 @@ pl:
       mokio/menu:
         lang_id: Język
         name: Nazwa
+        subtitle: "Podtytuł"
         external_link: Url
+        css_class: "Klasa CSS menu"
+        css_body_class: "Klasa CSS strony"
+        main_pic: "Miniaturka"
         active: Włączony
         visible: Widoczny
         description: Opis

data/config/routes.rb

@@ -1,7 +1,9 @@
 Mokio::Engine.routes.draw do
   root to: "dashboard#show"
-  devise_for :users, class_name: "Mokio::User", module: :devise
-  
+  devise_for :users, :controllers => { :passwords => "passwords" }, class_name: "Mokio::User", skip: [:sessions]
+  devise_for :users, class_name: "Mokio::User", module: :devise, skip: [:passwords]
+
+
       #
       # menus routes
       #

data/db/migrate/20150220071158_add_subtitle_to_contents.rb

@@ -0,0 +1,7 @@
+class AddSubtitleToContents < ActiveRecord::Migration
+  def change
+    add_column :mokio_contents, :subtitle, :text, :after => :title
+    add_column :mokio_menus, :subtitle, :text, :after => :name
+    add_column :mokio_static_modules, :subtitle, :text, :after => :title
+  end
+end

data/db/migrate/20150220091326_add_main_pic_to_mokio_menu.rb

@@ -0,0 +1,5 @@
+class AddMainPicToMokioMenu < ActiveRecord::Migration
+  def change
+    add_column :mokio_menus, :main_pic, :string
+  end
+end

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

@@ -22,7 +22,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def article_params #:doc:
-            params.require(:article).permit( extended_parameters, :title, :intro, :content, :article_type, :home_page, :tpl, :contact, :active, :seq, :lang_id,
+            params.require(:article).permit( extended_parameters, :title, :subtitle, :intro, :content, :article_type, :home_page, :tpl, :contact, :active, :seq, :lang_id,
               :gallery_type, :display_from, :display_to, :main_pic, :tag_list, :menu_ids => [], :data_files_attributes => [:data_file, :main_pic, :id, :remove_data_file]
             )
           end

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

@@ -28,7 +28,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def contact_params #:doc:
-            params.require(:contact).permit(extended_parameters, :title, :intro, :content, :article_type, :contact, :active,:home_page, :lang_id, :recipient_emails, :menu_ids => [], :contact_template_attributes => Mokio::ContactTemplate.contact_template_attributes)
+            params.require(:contact).permit(extended_parameters, :title, :subtitle, :intro, :content, :article_type, :contact, :active,:home_page, :lang_id, :recipient_emails, :menu_ids => [], :contact_template_attributes => Mokio::ContactTemplate.contact_template_attributes)
           end
       end
     end

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

@@ -169,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, :fake, :content_ids => [],:available_module_ids => [],
+            params[:menu].permit(:name, :subtitle, :seq, :target, :external_link, :css_class, :css_body_class, :main_pic, :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/controllers/mov_galleries.rb

@@ -39,7 +39,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def mov_gallery_params #:doc:
-            params.require(:mov_gallery).permit(:title, :type, :active, :home_page ,:intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [], 
+            params.require(:mov_gallery).permit(:title, :subtitle, :type, :active, :home_page ,:intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
               :meta_attributes => Mokio::Meta.meta_attributes)
           end
       end

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

@@ -39,7 +39,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def pic_gallery_params #:doc:
-            params.require(:pic_gallery).permit(:title, :type, :active,:home_page, :intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
+            params.require(:pic_gallery).permit(:title, :subtitle, :type, :active,:home_page, :intro, :content, :display_from, :display_to, :lang_id, :main_pic, :tag_list, :menu_ids => [], :data_file => [],
               :meta_attributes => Mokio::Meta.meta_attributes)
           end
       end

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

@@ -20,7 +20,7 @@ module Mokio
           # Never trust parameters from the scary internet, only allow the white list through.
           #
           def static_module_params #:doc:
-            params[:static_module].permit(:title, :content, :intro, :active, :always_displayed, :display_from, :display_to, :lang_id, { :module_position_ids => [] })
+            params[:static_module].permit(:title, :subtitle, :content, :intro, :active, :always_displayed, :display_from, :display_to, :lang_id, { :module_position_ids => [] })
           end
       end
     end

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

@@ -22,6 +22,8 @@ module Mokio
           belongs_to :lang
           belongs_to :meta, :dependent => :destroy
 
+          mount_uploader :main_pic, Mokio::MainPicUploader
+
           has_many :content_links,     -> {order('mokio_content_links.seq')}, :dependent => :destroy
           has_many :contents,          -> {order('mokio_content_links.seq')},    :through => :content_links
           has_many :selected_modules,  -> {order('mokio_selected_modules.seq')}

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

@@ -51,6 +51,13 @@ module Mokio
               text :email
             end
           end
+
+          # Overwrite devise-3.4.1/lib/devise/models/recoverable.rb to force check password is filled
+          def reset_password!(new_password, new_password_confirmation)
+            self.only_password=true
+            super
+          end
+
         end
 
         module ClassMethods

data/lib/mokio/version.rb

@@ -2,5 +2,5 @@ module Mokio
   #
   # Actual Mokio version
   #
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/controllers/mokio/photos_controller_spec.rb

@@ -156,7 +156,7 @@ module Mokio
         end
 
         it "assigns photo id to @id" do
-          assigns(:id).should eq(@photo.id.to_s)
+          assigns(:id).should eq(@photo.slug)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mokio
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - versoft
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-09 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -200,20 +200,14 @@ dependencies:
   name: jquery-fileupload-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.4'
-    - - ">="
+    - - '='
       - !ruby/object:Gem::Version
         version: 0.4.1
 - !ruby/object:Gem::Dependency
@@ -1260,6 +1254,7 @@ files:
 - app/controllers/mokio/static_modules_controller.rb
 - app/controllers/mokio/users_controller.rb
 - app/controllers/mokio/youtubes_controller.rb
+- app/controllers/passwords_controller.rb
 - app/datatables/commons_datatable.rb
 - app/helpers/mokio/backend/application_helper.rb
 - app/helpers/mokio/backend/backend_helper.rb
@@ -1300,8 +1295,11 @@ files:
 - app/uploaders/mokio/data_file_uploader.rb
 - app/uploaders/mokio/main_pic_uploader.rb
 - app/uploaders/mokio/thumb_uploader.rb
+- app/views/devise/mailer/reset_password_instructions.slim
 - app/views/devise/passwords/edit.html.erb
+- app/views/devise/passwords/edit.html.haml
 - app/views/devise/passwords/new.html.erb
+- app/views/devise/passwords/new.html.haml
 - app/views/devise/registrations/edit.html.erb
 - app/views/devise/registrations/new.html.haml
 - app/views/devise/sessions/new.html.haml
@@ -1463,6 +1461,8 @@ files:
 - 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
+- db/migrate/20150220071158_add_subtitle_to_contents.rb
+- db/migrate/20150220091326_add_main_pic_to_mokio_menu.rb
 - lib/generators/mokio/copy/assets_generator.rb
 - lib/generators/mokio/copy/views_generator.rb
 - lib/generators/mokio/ga_script_generator.rb