ack_rocket_cms 0.7.7 → 0.7.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b5194b48049e084862a58f444e8e66f69600a335
-  data.tar.gz: 75dcd990fe46e246a0feca826400db4d3271e2fb
+  metadata.gz: f562bee2585c443d8d86188edf4930f31dcc9d1e
+  data.tar.gz: 29510850bf9dd6b7bd79bde2e653c37d9aeb6ed8
 SHA512:
-  metadata.gz: 32bbd4068cb4aa1635516aa9302d660c8e3dca1d6ea485d8c401b84d877136356c763f6a34177cfcbad1b4694ab4660661262283bbd90b416553b5c0ac526fcc
-  data.tar.gz: c95b294c7d82c475aaf5bcffc8de63d33772f28c71bf683707944a289aa337cd0e45185cd95405eece3119b194519fc85a851468570a98b75d9cfcea3949b115
+  metadata.gz: 48a915514b32c086f6e77ee06d4b614bbe7ee2ad317efd7ddb691702263b26efbd06ed06cc75e6fb42cb9119e83263062c6486ff6048923f4f4961c64fe21811
+  data.tar.gz: b4b15b2b11b2f39c611fa76d3447fcfa2cbf60740b017747b59504b8efaed1baf726b6036e15ec16b2154657afdd089a958230ff634e20757057e221fc732b59

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ack_rocket_cms (0.7.7)
+    ack_rocket_cms (0.7.7.1)
       ack_rails_admin_jcrop
       addressable
       ckeditor
@@ -72,7 +72,7 @@ GEM
     addressable (2.3.8)
     arel (6.0.0)
     bcrypt (3.1.10)
-    bson (3.0.4)
+    bson (3.1.0)
     builder (3.2.2)
     ckeditor (4.1.2)
       cocaine
@@ -100,7 +100,7 @@ GEM
     execjs (2.5.2)
     font-awesome-rails (4.3.0.0)
       railties (>= 3.2, < 5.0)
-    geocoder (1.2.8)
+    geocoder (1.2.9)
     glebtv-simple_captcha (0.6.7)
     globalid (0.3.5)
       activesupport (>= 4.1.0)
@@ -131,8 +131,8 @@ GEM
       moped (~> 2.0.0)
       origin (~> 2.1)
       tzinfo (>= 0.3.37)
-    moped (2.0.5)
-      bson (~> 3.0.4)
+    moped (2.0.6)
+      bson (~> 3.0)
       connection_pool (~> 2.0)
       optionable (~> 0.2.0)
     nested_form (0.3.2)
@@ -166,7 +166,7 @@ GEM
       rails-deprecated_sanitizer (>= 1.0.1)
     rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    rails_admin (0.6.7)
+    rails_admin (0.6.8)
       builder (~> 3.1)
       coffee-rails (~> 4.0)
       font-awesome-rails (>= 3.0, < 5)
@@ -246,3 +246,6 @@ DEPENDENCIES
   ack_rocket_cms!
   bundler
   rake
+
+BUNDLED WITH
+   1.10.2

data/app/views/blocks/_favicon.html.slim

@@ -0,0 +1,21 @@
+/ For third-generation iPad with high-resolution Retina display:
+/ Size should be 228 x 228 pixels
+= favicon_link_tag '/apple-touch-icon-228x228-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '228x228'
+/ For iPhone with high-resolution Retina display:
+/ Size should be 114 x 114 pixels
+= favicon_link_tag '/apple-touch-icon-114x114-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '114x114'
+/ For first- and second-generation iPad:
+/ Size should be 72 x 72 pixels
+= favicon_link_tag '/apple-touch-icon-72x72-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '72x72'
+/ For non-Retina iPhone, iPod Touch, and Android 2.1+ devices:
+/ Size should be 57 x 57 pixels
+= favicon_link_tag '/apple-touch-icon-57x57-precomposed.png', :rel => 'apple-touch-icon-precomposed', :type => 'image/png', :sizes => '57x57'
+/ For non-Retina iPhone, iPod Touch, and Android 2.1+ devices:
+/ Size should be 57 x 57 pixels
+= favicon_link_tag '/apple-touch-icon.png', :rel => 'apple-touch-icon', :type => 'image/png'
+/ For all other devices
+/ Size should be 32 x 32 pixels
+= favicon_link_tag '/favicon.ico', :rel => 'shortcut icon', :type => 'image/vnd.microsoft.icon'
+/ For all other devices
+/ Size should be 32 x 32 pixels
+= favicon_link_tag '/favicon.png', :rel => 'shortcut icon', :type => 'image/png'

data/app/views/blocks/_seo_block.html.slim

@@ -0,0 +1,18 @@
+- if @seo_page
+  - content_for :meta do
+    = render 'shared/meta', obj: @seo_page, alt_obj: @seo_parent_page
+
+    - og_title = (@seo_page.get_og_title.blank? and @seo_parent_page ? @seo_parent_page.get_og_title  : @seo_page.get_og_title)
+    - og_image = (@seo_page.og_image.blank?     and @seo_parent_page ? @seo_parent_page.og_image      : @seo_page.og_image)
+    = render 'shared/og', title: @seo_page.get_og_title, image: @seo_page.og_image
+- elsif @seo_parent_page
+  - content_for :meta do
+    = render 'shared/meta', obj: @seo_parent_page
+    = render 'shared/og', title: @seo_parent_page.get_og_title, image: @seo_parent_page.og_image
+
+- if @seo_page and @seo_page.title
+  - content_for :title do
+    title= @seo_page.title
+- elsif @seo_parent_page and @seo_parent_page.title
+  - content_for :title do
+    title= @seo_parent_page.title

data/app/views/blocks/_seo_block_with_obj.html.slim

@@ -0,0 +1,27 @@
+- obj ||= nil
+- if obj
+  - content_for :meta do
+    - seo_page = @seo_page || @seo_parent_page
+    = render 'shared/meta', obj: obj
+
+    - og_title = (obj.get_og_title.blank? and seo_page ? seo_page.get_og_title  : obj.get_og_title)
+    - og_image = (obj.og_image.blank?     and seo_page ? seo_page.og_image      : obj.og_image)
+    = render 'shared/og', title: obj.get_og_title, image: obj.og_image
+  - if obj.title
+    - content_for :title do
+      title= obj.title
+
+- elsif @seo_page
+  - content_for :meta do
+    = render 'shared/meta', obj: @seo_page
+    = render 'shared/og', title: @seo_page.get_og_title, image: @seo_page.og_image
+
+- if obj and obj.title
+  - content_for :title do
+    title= obj.title
+- elsif @seo_page and @seo_page.title
+  - content_for :title do
+    title= @seo_page.title
+- elsif @seo_parent_page and @seo_parent_page.title
+  - content_for :title do
+    title= @seo_parent_page.title

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

@@ -0,0 +1,23 @@
+main
+  h2 Вход на сайт
+  = form_for(resource, as: resource_name, url: session_path(resource_name)) do |f|
+    .field
+      = f.label :email, "E-mail"
+      br
+      = f.email_field :email, autofocus: true, title: "E-mail"
+    br
+    .field
+      = f.label :password, "Пароль"
+      br
+      = f.password_field :password, autocomplete: "off", title: "Пароль"
+    br
+      - if devise_mapping.rememberable?
+        .field
+          = f.check_box :remember_me, title: "Запомнить меня"
+          = f.label :remember_me, "Запомнить меня"
+
+    .actions
+      = f.submit "Войти"
+    br
+
+  = render "devise/shared/links"

data/app/views/devise/shared/_links.html.slim

@@ -0,0 +1,25 @@
+- if controller_name != 'sessions'
+  = link_to "Войти на сайт", new_session_path(resource_name)
+  br
+
+- if devise_mapping.registerable? && controller_name != 'registrations'
+  = link_to "Зарегистрироваться", new_registration_path(resource_name)
+  br
+
+- if devise_mapping.recoverable? && controller_name != 'passwords' && controller_name != 'registrations'
+  = link_to "Забыли пароль?", new_password_path(resource_name)
+  br
+
+
+- if devise_mapping.confirmable? && controller_name != 'confirmations'
+  = link_to "Не пришли инструкции по подтверждению аккаунта?", new_confirmation_path(resource_name)
+  br
+
+/- if devise_mapping.lockable? && resource_class.unlock_strategy_enabled?(:email) && controller_name != 'unlocks'
+/  = link_to "Не пришли инстуркции по разблокировке аккаунта?", new_unlock_path(resource_name)
+/  br
+
+- if devise_mapping.omniauthable?
+  - resource_class.omniauth_providers.each do |provider|
+    = link_to "Войти через #{provider.to_s.titleize}", omniauth_authorize_path(resource_name, provider)
+    br

data/app/views/layouts/application.html.slim

@@ -6,7 +6,7 @@ html lang="ru"
     title= page_title
     = yield :meta
     = csrf_meta_tags
-    = favicon_link_tag '/favicon.ico'
+    = render partial: "blocks/favicon"
     = stylesheet_link_tag "application", media: "all"
     = javascript_include_tag "application"
     /[if lt IE 9]
@@ -20,5 +20,4 @@ html lang="ru"
         = yield
       #root_footer
     #footer
-      = render 'blocks/footer'
-
+      = render 'blocks/footer'

data/lib/rocket_cms/version.rb

@@ -1,3 +1,3 @@
 module RocketCMS
-  VERSION = "0.7.7"
+  VERSION = "0.7.7.1"
 end

data/template.rb

@@ -221,11 +221,11 @@ inject_into_file 'app/models/user.rb', before: /^end/ do <<-TEXT
 
   AVAILABLE_ROLES.each do |r|
     class_eval <<-EVAL
-      def #{r}?
-        self.roles and self.roles.include?("#{r}")
+      def \#{r}?
+        self.roles and self.roles.include?("\#{r}")
       end
 
-      scope :#{r.pluralize}, -> { any_in(roles: "#{r}") }
+      scope :\#{r.pluralize}, -> { any_in(roles: "\#{r}") }
     EVAL
   end
 
@@ -481,6 +481,8 @@ end
 
 remove_file 'app/views/layouts/application.html.erb'
 
+gsub_file 'app/views/layouts/application.html.slim', "= favicon_link_tag '/favicon.ico'", "= render partial: 'blocks/favicon' #= favicon_link_tag '/favicon.ico'"
+
 
 remove_file 'config/application.rb'
 create_file 'config/application.rb' do <<-TEXT

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ack_rocket_cms
 version: !ruby/object:Gem::Version
-  version: 0.7.7
+  version: 0.7.7.1
 platform: ruby
 authors:
 - Alexander Kiseliev
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-08 00:00:00.000000000 Z
+date: 2015-06-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -433,11 +433,16 @@ files:
 - app/models/menu.rb
 - app/models/news.rb
 - app/models/page.rb
+- app/views/blocks/_favicon.html.slim
 - app/views/blocks/_footer.html.slim
+- app/views/blocks/_seo_block.html.slim
+- app/views/blocks/_seo_block_with_obj.html.slim
 - app/views/contact_mailer/new_message_email.html.slim
 - app/views/contacts/index.html.slim
 - app/views/contacts/new.html.slim
 - app/views/contacts/sent.html.slim
+- app/views/devise/sessions/new.html.slim
+- app/views/devise/shared/_links.html.slim
 - app/views/errors/_base.html.slim
 - app/views/errors/error_403.html.slim
 - app/views/errors/error_404.html.slim
@@ -551,7 +556,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.7
 signing_key: 
 specification_version: 4
 summary: Please DO NOT use this gem directly, use ack_rocket_cms_mongoid or ack_rocket_cms_activerecord