caboose-cms 0.4.103 → 0.4.104

Sign up to get free protection for your applications and to get access to all the features.
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- NTdkZGRkMzc5ZmM3OTA4NDMxNWNkYzI0YzZkYTQ0N2Y1ZWE4N2NjMQ==
4
+ Mjg5OTQwZWJhMGVlZWIxYTJkZjk5MmQ4MmZmN2M2Nzc4N2E2NTEyNw==
5
5
  data.tar.gz: !binary |-
6
- YmYwMTA0ZWQ1Y2QwNDI1MjRjM2FlOWEzYTBjODQ1N2I4MDJkMjk1MA==
6
+ ZmJhN2YyNGMyNGI1NDgxNDY0NTU1YmE3ZTczZTZjZWIwMWVmM2VlNg==
7
7
  !binary "U0hBNTEy":
8
8
  metadata.gz: !binary |-
9
- ZDdlOTMzYTc3NDkyNWJhZWY3OGI0OTc4M2E2ZjI5MjVmNTlkZjYxM2YwMDFl
10
- MWMzODZhNWMyZWQzZTUwNzViNzhlM2JhM2VkZjhjZmJhZDdlMzJjOWYxMWU1
11
- NzQwYTE5N2E1ZDg3NGYzZmIwMGU4OGQ4MTU4NGQ1NDQ0MTViZmU=
9
+ ZmI5ODVjMGE4N2JhMDhjOGVhZjBkZjNmOTljNWM0YThlYTIzOTIwM2NhYzI4
10
+ MjljZDllNWFlYjgwMDBjZWI4ZTg4M2I4NWNkMWQxOWQ0ZTJjZjIzOGZhMzJi
11
+ MDBhOGZlNmUwMWZjMTZlN2E3ZWZmMzlmMDUwNWQ2YTA5MjU4Y2Y=
12
12
  data.tar.gz: !binary |-
13
- ZDlmNTRjY2I1MjI5MmYzNDI1MGU4NDY5YzBlOWY4ZjY5MmUyNmM3NDg4NGY1
14
- ODc5MWNlZjg0MDRlOWQwNDUwYTRmMTYyYzA1YTYxNjg0M2U5MmRlYmQ1NDdh
15
- YjRjMDczNGNhM2MxMzAxYWE1ZTg5MTI0N2I4ODhkMjBkNTU0N2Y=
13
+ ZjJlNzc5ZGMyNDc0OGMxYzVkNTVjOGJmNjdjZWMxZTNmZDRkOWQ3YjM1YzI3
14
+ N2EwMTc1YzFhODJhMWMwNTUxNmNlYzRjYWE4NWM1MDM4YmEyM2U0ZjkyOWVi
15
+ Zjc0ZTkzOGJmMjcwZGY1NGJjYTU1OTZhZDI1NTZkMjg3YTcyM2E=
@@ -341,5 +341,11 @@ class Caboose::Page < ActiveRecord::Base
341
341
  end
342
342
  return resources
343
343
  end
344
+
345
+ def head_title
346
+ str = ""
347
+ str << "#{page.title} | " if !page.title.nil? && page.title.strip.length > 0
348
+ str << page.site.description
349
+ end
344
350
 
345
351
  end
@@ -9,7 +9,7 @@ page = block.page
9
9
  <head>
10
10
  <meta charset="utf-8" />
11
11
  <meta http-equiv="X-UA-Compatible" content="IE=edge, chrome=1" />
12
- <title><%= !page.title.nil? && page.title.strip.length > 0 ? "#{page.title} | " : "" %><%= Caboose::website_name %></title>
12
+ <title><%= raw page.head_title %></title>
13
13
  <meta name="description" content="" />
14
14
  <meta name="viewport" content="width=device-width" />
15
15
  <%= raw css %>
@@ -1,3 +1,3 @@
1
1
  module Caboose
2
- VERSION = '0.4.103'
2
+ VERSION = '0.4.104'
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: caboose-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.4.103
4
+ version: 0.4.104
5
5
  platform: ruby
6
6
  authors:
7
7
  - William Barry
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-09-02 00:00:00.000000000 Z
11
+ date: 2014-09-07 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails