spud_core 0.8.2 → 0.8.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. data/app/helpers/spud/admin/application_helper.rb +9 -1
  2. data/lib/spud_core/version.rb +1 -1
  3. metadata +28 -28
data/app/helpers/spud/admin/application_helper.rb CHANGED
@@ -4,7 +4,7 @@ module Spud::Admin::ApplicationHelper
4
4
  return Time.now() - timedate > 604800 ? timedate.strftime("%B %d") + ' at ' + timedate.strftime("%I:%M %p") : time_ago_in_words(timedate) + ' ago'
5
5
  end
6
6
 
7
- def current_site_name
7
+ def current_admin_site_name
8
8
  return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled || session[:admin_site].blank?
9
9
 
10
10
  config = Spud::Core.multisite_config.select{|p| p[:site_id].to_i == session[:admin_site].to_i}
@@ -13,6 +13,14 @@ module Spud::Admin::ApplicationHelper
13
13
  return config[0][:site_name]
14
14
 
15
15
  end
16
+
17
+ def current_site_name
18
+ return Spud::Core.site_name if !Spud::Core.multisite_mode_enabled
19
+ config = Spud::Core.site_config_for_host(request.host_with_port)
20
+ return Spud::Core.site_name if config.blank?
21
+
22
+ return config[:site_name]
23
+ end
16
24
  def header_style
17
25
  if !Spud::Core.multisite_mode_enabled
18
26
  return ''
data/lib/spud_core/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  module Spud
2
2
  module Core
3
- VERSION = "0.8.2"
3
+ VERSION = "0.8.4"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: spud_core
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.8.2
4
+ version: 0.8.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-30 00:00:00.000000000 Z
12
+ date: 2012-04-03 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: rails
16
- requirement: &70323150663120 !ruby/object:Gem::Requirement
16
+ requirement: &70312460602760 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: 3.2.2
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *70323150663120
24
+ version_requirements: *70312460602760
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: authlogic
27
- requirement: &70323150662700 !ruby/object:Gem::Requirement
27
+ requirement: &70312460602340 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *70323150662700
35
+ version_requirements: *70312460602340
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: jquery-rails
38
- requirement: &70323150697040 !ruby/object:Gem::Requirement
38
+ requirement: &70312460601880 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *70323150697040
46
+ version_requirements: *70312460601880
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: breadcrumbs_on_rails
49
- requirement: &70323150695620 !ruby/object:Gem::Requirement
49
+ requirement: &70312460601460 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *70323150695620
57
+ version_requirements: *70312460601460
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: will_paginate
60
- requirement: &70323150693660 !ruby/object:Gem::Requirement
60
+ requirement: &70312460601040 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :runtime
67
67
  prerelease: false
68
- version_requirements: *70323150693660
68
+ version_requirements: *70312460601040
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: bootstrap-will_paginate
71
- requirement: &70323150721880 !ruby/object:Gem::Requirement
71
+ requirement: &70312460600560 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
76
76
  version: '0'
77
77
  type: :runtime
78
78
  prerelease: false
79
- version_requirements: *70323150721880
79
+ version_requirements: *70312460600560
80
80
  - !ruby/object:Gem::Dependency
81
81
  name: mysql2
82
- requirement: &70323150721040 !ruby/object:Gem::Requirement
82
+ requirement: &70312460616440 !ruby/object:Gem::Requirement
83
83
  none: false
84
84
  requirements:
85
85
  - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
87
87
  version: '0'
88
88
  type: :development
89
89
  prerelease: false
90
- version_requirements: *70323150721040
90
+ version_requirements: *70312460616440
91
91
  - !ruby/object:Gem::Dependency
92
92
  name: rspec
93
- requirement: &70323150720300 !ruby/object:Gem::Requirement
93
+ requirement: &70312460615880 !ruby/object:Gem::Requirement
94
94
  none: false
95
95
  requirements:
96
96
  - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
98
98
  version: '0'
99
99
  type: :development
100
100
  prerelease: false
101
- version_requirements: *70323150720300
101
+ version_requirements: *70312460615880
102
102
  - !ruby/object:Gem::Dependency
103
103
  name: rspec-rails
104
- requirement: &70323150719520 !ruby/object:Gem::Requirement
104
+ requirement: &70312460615260 !ruby/object:Gem::Requirement
105
105
  none: false
106
106
  requirements:
107
107
  - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
109
109
  version: '0'
110
110
  type: :development
111
111
  prerelease: false
112
- version_requirements: *70323150719520
112
+ version_requirements: *70312460615260
113
113
  - !ruby/object:Gem::Dependency
114
114
  name: factory_girl
115
- requirement: &70323150718640 !ruby/object:Gem::Requirement
115
+ requirement: &70312460614500 !ruby/object:Gem::Requirement
116
116
  none: false
117
117
  requirements:
118
118
  - - =
@@ -120,10 +120,10 @@ dependencies:
120
120
  version: 2.5.0
121
121
  type: :development
122
122
  prerelease: false
123
- version_requirements: *70323150718640
123
+ version_requirements: *70312460614500
124
124
  - !ruby/object:Gem::Dependency
125
125
  name: mocha
126
- requirement: &70323150717780 !ruby/object:Gem::Requirement
126
+ requirement: &70312460614000 !ruby/object:Gem::Requirement
127
127
  none: false
128
128
  requirements:
129
129
  - - =
@@ -131,10 +131,10 @@ dependencies:
131
131
  version: 0.10.3
132
132
  type: :development
133
133
  prerelease: false
134
- version_requirements: *70323150717780
134
+ version_requirements: *70312460614000
135
135
  - !ruby/object:Gem::Dependency
136
136
  name: database_cleaner
137
- requirement: &70323150715980 !ruby/object:Gem::Requirement
137
+ requirement: &70312460613500 !ruby/object:Gem::Requirement
138
138
  none: false
139
139
  requirements:
140
140
  - - =
@@ -142,7 +142,7 @@ dependencies:
142
142
  version: 0.7.1
143
143
  type: :development
144
144
  prerelease: false
145
- version_requirements: *70323150715980
145
+ version_requirements: *70312460613500
146
146
  description: Spud Core Engine
147
147
  email:
148
148
  - destes@redwindsw.com
@@ -548,7 +548,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
548
548
  version: '0'
549
549
  segments:
550
550
  - 0
551
- hash: -159433235533953728
551
+ hash: -1378594038769383874
552
552
  required_rubygems_version: !ruby/object:Gem::Requirement
553
553
  none: false
554
554
  requirements:
@@ -557,7 +557,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
557
557
  version: '0'
558
558
  segments:
559
559
  - 0
560
- hash: -159433235533953728
560
+ hash: -1378594038769383874
561
561
  requirements: []
562
562
  rubyforge_project:
563
563
  rubygems_version: 1.8.15