mokio 0.0.13 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a79602440d253b63fdbecb64b2934f431ca4c90
-  data.tar.gz: c6eac19bc0b242e2f67bb35f962de4252d650f44
+  metadata.gz: 8a2f828a14284c71da74123472dba734e06d96d9
+  data.tar.gz: c5320526c39917236203aa006823e1c106646f22
 SHA512:
-  metadata.gz: 1aaa048e9c81f0428aed55617141c2dc4bb8261245ffc4ac21a3d1ba23894d16a73b36a856d98c9e4c4f7fa9b60f994165cc2c6f4b98cdf0d688c3df71811eb7
-  data.tar.gz: 2c5786798f82fb34b4b3515297e9212a4082f9bb5014c2915c824e1671ff2717b88da6e297e04930699958d9326ff109a7fdab06b57a2519662b87729c59900a
+  metadata.gz: 5805ad6e9465a121b0e910b2801ecdb30474bb3c1fb04536cdb7648b895ccbd6afe331d45e5e0a4f982669dae26a8c6c126a99e2ccd7faa775423e089abed654
+  data.tar.gz: edeefa6e2a66281dfa6b21d190c45d4d7faf1124f763020d6d0d4f2e838a0cac972d100c3a303097959c997326c04d5db1978253149523ae61053255ad3ac512

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

@@ -38,4 +38,6 @@
 @import "backend/supr-theme/jquery-ui-timepicker-addon";
 @import "backend/plugins/forms/select2/select2";
 
-@import "backend/bootstrap/joyride-2.1";
+@import "backend/bootstrap/joyride-2.1";
+
+@import "mokio/application";

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

@@ -1,8 +1,8 @@
 // ========================================
 //  scss variables
-// 
-  $layout-z-index: 1050;
-  $default-opacity: 0.8;
+//
+$layout-z-index: 1050;
+$default-opacity: 0.8;
 //
 // ========================================
 .content {
@@ -29,7 +29,7 @@
 
     .edit_view_img {
       border: 1px solid #CCCCCC;
-    }    
+    }
 
     .buttons {
       margin-top: 5px;
@@ -55,16 +55,16 @@ button.uploader {
   overflow: auto;
 
   li {
-//    width: 150px;
-//    height: 150px;
+    //    width: 150px;
+    //    height: 150px;
     margin-left: 2px !important;
     margin-right: -3px !important;
     vertical-align: top;
     padding: 5px;
 
     img {
-//      width: 140px;
-//      height: 140px;
+      //      width: 140px;
+      //      height: 140px;
     }
 
     .dragable {
@@ -108,16 +108,16 @@ button.uploader {
   overflow: auto;
 
   li {
-//    width: 318px;
-//    height: 189px;
+    //    width: 318px;
+    //    height: 189px;
     margin-left: 2px !important;
     margin-right: -3px !important;
     vertical-align: top;
     padding: 5px;
 
     img {
-//      width: 308px;
-//      height: 173px;
+      //      width: 308px;
+      //      height: 173px;
     }
 
     .dragable {
@@ -161,20 +161,21 @@ input.btn[type="submit"] {
 
 
 
-//.ui-state-highlight {
-//  background-color: #F5F5F5 !important;
-//  border: 1px solid #E5E5E5 !important;
-//  box-shadow: 0 1px 0 rgba(229, 229, 229, 0.1) !important;
-//}
+.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 {
+.drag_wrapper > .ui-state-highlight {
   min-width: 114px;
+  min-height: 94px;
   background-color: #F5F5F5 !important;
   border: 1px dashed #E5E5E5 !important;
   box-shadow: 0 1px 0 rgba(229,229,229,0.1) !important;
-  min-height: 94px;
-  
+
+
 }
 
 #FlashInfo {
@@ -299,7 +300,7 @@ input.btn[type="submit"] {
 
       img {
         height: 400px;
-        width: 450px; 
+        width: 450px;
       }
 
       h5 {
@@ -356,11 +357,11 @@ input.btn[type="submit"] {
 
       a { margin-bottom: 20px; }
       a:hover { text-decoration: none !important; }
-      
+
       span {
         margin-left: 35px;
         margin-top: 20px;
-        cursor: pointer; 
+        cursor: pointer;
       }
     }
   }
@@ -442,7 +443,7 @@ input.btn[type="submit"] {
     img { max-width: none; }
   }
 
-  .jcrop-holder { 
+  .jcrop-holder {
     border: 2px solid #FFFFFF;
     margin: 0 auto;
   }
@@ -529,22 +530,22 @@ input.btn[type="submit"] {
   .select2-container { width: 92%; }
 
   h3 small {
-      font-size: 12px;
+    font-size: 12px;
   }
 }
-.box-form2 { 
+.box-form2 {
   position: absolute;
   right: 45px;
   top: -55px;
 }
-.box-form3 { 
+.box-form3 {
   position: absolute;
   right: 195px;
   top: -55px;
   box-shadow: none;
 }
 
-.box-form-gmap { 
+.box-form-gmap {
   position: absolute;
   right: 318px;
   top: -55px;
@@ -554,8 +555,8 @@ input.btn[type="submit"] {
 #gmap_modal {
   .gmap_full_address { margin: 0 auto;}
   .hidden_elements { display: none !important;}
-  #map { 
-    width: 100%; 
+  #map {
+    width: 100%;
     height: 350px;
     img { max-width: none; height: auto; }
   }
@@ -675,4 +676,18 @@ select[multiple] {
   .drag_wrapper {
     min-height:100px;
   }
+}
+
+.delete-mainpic-button {
+  vertical-align: top;
+  margin-left: -35px;
+  margin-top: 5px;
+  background-color: rgba(0, 0, 0, 0.8);
+  padding: 1px 4px;
+  border-radius: 2px;
+  color: rgba(255, 255, 255, 0.9)
+}
+
+.delete-mainpic-button:hover {
+  color: rgba(255, 255, 255, 1)
 }

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

@@ -250,6 +250,13 @@ $inactive_color: #dddddd;
   font-weight: 700;
 }
 
+.no_content {
+  display: inline-block;
+  margin: 0 5px 0 0;
+  text-align: center;
+  width: 15px;
+}
+
 .displayed_false {
 //  color:$inactive_color ;
   text-decoration: line-through;

data/app/controllers/mokio/base_articles_controller.rb

@@ -0,0 +1,3 @@
+class Mokio::BaseArticlesController < Mokio::BaseContentsController
+  include Mokio::Concerns::Controllers::BaseArticles
+end

data/app/controllers/mokio/base_contacts_controller.rb

@@ -0,0 +1,5 @@
+
+class Mokio::BaseContactsController < Mokio::BaseContentsController
+  include Mokio::Concerns::Controllers::BaseContacts
+end
+

data/app/controllers/mokio/base_contents_controller.rb

@@ -0,0 +1,3 @@
+class Mokio::BaseContentsController < Mokio::CommonController
+  include Mokio::Concerns::Controllers::BaseContents
+end

data/app/controllers/mokio/base_mov_galleries_controller.rb

@@ -0,0 +1,3 @@
+class Mokio::BaseMovGalleriesController < Mokio::BaseContentsController
+  include Mokio::Concerns::Controllers::BaseMovGalleries
+end

data/app/controllers/mokio/base_pic_galleries_controller.rb

@@ -0,0 +1,4 @@
+
+class Mokio::BasePicGalleriesController < Mokio::BaseContentsController
+  include Mokio::Concerns::Controllers::BasePicGalleries
+end

data/app/controllers/mokio/support_controller.rb

@@ -0,0 +1,11 @@
+class Mokio::SupportController < Mokio::CommonController
+  layout "mokio/backend"
+  helper :application
+
+  def index
+
+  end
+
+
+end
+

data/app/controllers/passwords_controller.rb

@@ -1,4 +1,10 @@
 class PasswordsController < Devise::PasswordsController
+	before_filter :set_mailer_host
+
+  def set_mailer_host
+    ActionMailer::Base.default_url_options[:host] = request.host_with_port
+  end
+
   protected
   def after_sending_reset_password_instructions_path_for(resource_name)
     flash[:alert]=t("devise.passwords.send_instructions")

data/app/models/mokio/base_article.rb

@@ -0,0 +1,29 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id           :integer          not null, primary key
+#  title        :string(255)
+#  intro        :text
+#  content      :text
+#  type         :string(255)
+#  home_page    :boolean
+#  tpl          :string(255)
+#  contact      :boolean
+#  active       :boolean          default(TRUE)
+#  lang_id      :integer
+#  gallery_type :string(255)
+#  editable     :boolean          default(TRUE)
+#  deletable    :boolean          default(TRUE)
+#  display_from :date
+#  display_to   :date
+#  created_at   :datetime
+#  updated_at   :datetime
+#  meta_id      :integer
+#  gmap_id      :integer
+#
+module Mokio
+  class BaseArticle < BaseContent
+    include Mokio::Concerns::Models::BaseArticle
+  end
+end

data/app/models/mokio/base_contact.rb

@@ -0,0 +1,30 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id           :integer          not null, primary key
+#  title        :string(255)
+#  subtitle :text
+#  intro        :text
+#  content      :text
+#  type         :string(255)
+#  home_page    :boolean
+#  tpl          :string(255)
+#  contact      :boolean
+#  active       :boolean          default(TRUE)
+#  lang_id      :integer
+#  gallery_type :string(255)
+#  editable     :boolean          default(TRUE)
+#  deletable    :boolean          default(TRUE)
+#  display_from :date
+#  display_to   :date
+#  created_at   :datetime
+#  updated_at   :datetime
+#  meta_id      :integer
+#  gmap_id      :integer
+#
+module Mokio
+  class BaseContact < BaseContent
+    include Mokio::Concerns::Models::BaseContact
+  end
+end

data/app/models/mokio/base_content.rb

@@ -0,0 +1,5 @@
+module Mokio
+  class BaseContent < ActiveRecord::Base
+    include Mokio::Concerns::Models::BaseContent
+  end
+end

data/app/models/mokio/base_mov_gallery.rb

@@ -0,0 +1,30 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id           :integer          not null, primary key
+#  title        :string(255)
+#  subtitle :text
+#  intro        :text
+#  content      :text
+#  type         :string(255)
+#  home_page    :boolean
+#  tpl          :string(255)
+#  contact      :boolean
+#  active       :boolean          default(TRUE)
+#  lang_id      :integer
+#  gallery_type :string(255)
+#  editable     :boolean          default(TRUE)
+#  deletable    :boolean          default(TRUE)
+#  display_from :date
+#  display_to   :date
+#  created_at   :datetime
+#  updated_at   :datetime
+#  meta_id      :integer
+#  gmap_id      :integer
+#
+module Mokio
+  class BaseMovGallery < BaseContent
+    include Mokio::Concerns::Models::BaseMovGallery
+  end
+end

data/app/models/mokio/base_pic_gallery.rb

@@ -0,0 +1,30 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id           :integer          not null, primary key
+#  title        :string(255)
+#  subtitle :text
+#  intro        :text
+#  content      :text
+#  type         :string(255)
+#  home_page    :boolean
+#  tpl          :string(255)
+#  contact      :boolean
+#  active       :boolean          default(TRUE)
+#  lang_id      :integer
+#  gallery_type :string(255)
+#  editable     :boolean          default(TRUE)
+#  deletable    :boolean          default(TRUE)
+#  display_from :date
+#  display_to   :date
+#  created_at   :datetime
+#  updated_at   :datetime
+#  meta_id      :integer
+#  gmap_id      :integer
+#
+module Mokio
+  class BasePicGallery < BaseContent
+    include Mokio::Concerns::Models::BasePicGallery
+  end
+end

data/app/models/mokio/support.rb

@@ -0,0 +1,29 @@
+# == Schema Information
+#
+# Table name: contents
+#
+#  id           :integer          not null, primary key
+#  title        :string(255)
+#  intro        :text
+#  content      :text
+#  type         :string(255)
+#  home_page    :boolean
+#  tpl          :string(255)
+#  contact      :boolean
+#  active       :boolean          default(TRUE)
+#  lang_id      :integer
+#  gallery_type :string(255)
+#  editable     :boolean          default(TRUE)
+#  deletable    :boolean          default(TRUE)
+#  display_from :date
+#  display_to   :date
+#  created_at   :datetime
+#  updated_at   :datetime
+#  meta_id      :integer
+#  gmap_id      :integer
+#
+module Mokio
+  class Support < ActiveRecord::Base
+
+  end
+end

data/app/uploaders/ckeditor_attachment_file_uploader.rb

@@ -31,6 +31,6 @@ class CkeditorAttachmentFileUploader < CarrierWave::Uploader::Base
   # Add a white list of extensions which are allowed to be uploaded.
   # For images you might use something like this:
   def extension_white_list
-    Ckeditor.attachment_file_types
+    Ckeditor.attachment_file_types + Ckeditor.image_file_types
   end
 end

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

@@ -12,7 +12,6 @@
     = csrf_meta_tags
     = favicon_link_tag 'backend/favicon.ico'
 
-    %link{href: "images/favicon.ico", rel: "shortcut icon"}/
   %body.loginPage
     .container-fluid
       #header

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

@@ -1,11 +1,12 @@
 = render :partial => "mokio/common/main_pic", locals: {f:f}
+= render :partial => "mokio/contents/common", locals: {f:f}
 = 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: !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 :intro,    :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full', :height => 150, :language => I18n.locale} }, disabled: !obj.display_editable_field?('intro')
+= f.input :content,  :wrapper => :ckeditor, :as => :ckeditor, :input_html => { :ckeditor => {:toolbar => 'Full', :height => 400, :language => I18n.locale} }, 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')
 = 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