cms-fortress 1.3.10 → 1.3.11

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 210ab50ba55e4fb3323595ed204652cb99306320
4
- data.tar.gz: 0d61541cf201d292748938220d113527f972e497
3
+ metadata.gz: 73db0f800362b34e8a830402d1088561e6d77179
4
+ data.tar.gz: 34cf552ad384681c74013e5e88a71f61ac0e2331
5
5
  SHA512:
6
- metadata.gz: a0eee42757e14f2de127f67fda37888bfc557e49c0abdcd26276537d74439485c18ad40caf4534b553bfbcc8f3c418f3d1131aae1597228a25856cccc8f52ada
7
- data.tar.gz: 4f1b0bfce4931990e93615908e846a33144c3f76505ac127e160d330535cc91195b91dcdfa900b443b718b5f92bf04a0578afe7247a5ae3963ea4c4bf40aad27
6
+ metadata.gz: 08e8b70757ce6cc9c09aa6eecec68ee0ec3800d63d46e3a3e05fcef1f549666c5ae9c3ad46a36bc96de14cefadb768b720e7c01747acfdc45f993afa397d7f70
7
+ data.tar.gz: 49dcab6fbead725b5e5a20e0b7b85d8ae4df03704694decb0332faa4a9fef8c3ad57d07ed4b7e68ca26d4e7b61d1e7076d16dc2a1841c121a3afafe048d61aed
@@ -1,7 +1,7 @@
1
1
  PATH
2
2
  remote: .
3
3
  specs:
4
- cms-fortress (1.3.10)
4
+ cms-fortress (1.3.11)
5
5
  aasm (~> 4.0)
6
6
  cancancan (~> 1.9)
7
7
  comfortable_mexican_sofa (~> 1.12, >= 1.12.5)
data/VERSION CHANGED
@@ -1 +1 @@
1
- 1.3.10
1
+ 1.3.11
@@ -10,7 +10,7 @@
10
10
  .form-group
11
11
  = f.label :password
12
12
  = f.password_field :password, :placeholder => t('cms.fortress.users.sessions.new.password'), :class => "form-control"
13
- .form-group
13
+ .form-group(class="#{ "hide" unless Comfy::Cms::Site.count > 1 && Cms::Fortress.configuration.login_site_selector }")
14
14
  = f.label :site
15
15
  = f.select :site_id, Comfy::Cms::Site.all.collect{ |s| [s.label, s.id] }, :class => "form-control"
16
16
 
@@ -2,7 +2,7 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "cms-fortress"
5
- s.version = "1.3.10"
5
+ s.version = "1.3.11"
6
6
 
7
7
  s.authors = ["Melvin Sembrano"]
8
8
  s.date = "2015-10-10"
@@ -2,6 +2,9 @@ Cms::Fortress.configure do |config|
2
2
  # comment the line below if you want to use the default layout
3
3
  config.theme = :wide
4
4
 
5
+ # Turn on site selector on login page
6
+ # config.login_site_selector = true
7
+
5
8
  # Turn off page workflow options
6
9
  # config.enable_page_workflow = false
7
10
  # Turn off page caching options
@@ -31,12 +31,14 @@ module Cms
31
31
  attr_accessor :enable_page_workflow
32
32
  attr_accessor :enable_page_caching
33
33
  attr_accessor :theme
34
+ attr_accessor :login_site_selector
34
35
 
35
36
  def initialize
36
37
  self.class.send(:include, Rails.application.routes.url_helpers)
37
38
  @theme = :default
38
39
  @enable_page_workflow = true
39
40
  @enable_page_caching = true
41
+ @login_site_selector = false
40
42
  @content_resources = [
41
43
  {:name => 'pages', :title => 'comfy.admin.cms.base.pages',
42
44
  :path => 'comfy_admin_cms_site_pages_path(@site) if @site && !@site.new_record?'},
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cms-fortress
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.3.10
4
+ version: 1.3.11
5
5
  platform: ruby
6
6
  authors:
7
7
  - Melvin Sembrano