fullstack-cms 0.3.20 → 0.3.21

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.
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.20
1
+ 0.3.21
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "fullstack-cms"
8
- s.version = "0.3.20"
8
+ s.version = "0.3.21"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["mcasimir"]
12
- s.date = "2013-01-05"
12
+ s.date = "2013-01-06"
13
13
  s.description = "CMS system built on fullstack"
14
14
  s.email = "maurizio.cas@gmail.com"
15
15
  s.extra_rdoc_files = [
@@ -1,5 +1,4 @@
1
1
  /*
2
- *= require site/lib/bootstrap.min
3
2
  *= require_tree .
4
3
  */
5
4
 
@@ -2,39 +2,29 @@
2
2
  <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
3
3
  <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
4
4
  <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
5
- <!--[if gt IE 8]><!--> <html class="no-js" lang="<%= I18n.locale %>"> <!--<![endif]-->
5
+ <!--[if gt IE 8]><!--> <html lang="<%= I18n.locale %>"> <!--<![endif]-->
6
6
  <%= render :partial => "site/head" %>
7
7
  <body<%= home_page? ? ' class="home"' : '' %>>
8
8
  <!--[if lt IE 7]><p class=chromeframe>Your browser is <em>ancient!</em> <a href="http://browsehappy.com/">Upgrade to a different browser</a> or <a href="http://www.google.com/chromeframe/?redirect=true">install Google Chrome Frame</a> to experience this site.</p><![endif]-->
9
9
  <div id="fb-root">
10
10
  </div>
11
11
 
12
-
13
12
  <%= render :partial => "site/nav" %>
14
13
 
15
14
  <header class="container header">
16
15
  <%= render :partial => "site/header" %>
17
16
  </header>
17
+
18
18
  <div class="container">
19
- <div class="main<%= home_page? ? ' home' : '' %>" role="main">
19
+ <div role="main">
20
20
  <%= yield %>
21
- </div>
22
-
23
- </div>
24
-
25
- <% if content_for? :prefooter %>
26
- <div class="prefooter-wrapper">
27
- <div class="container">
28
- <%= yield :prefooter %>
29
- </div>
21
+ </div>
30
22
  </div>
31
- <% end %>
32
-
23
+
33
24
  <div class="footer-wrapper">
34
- <div class="container">
25
+ <footer class="footer container">
35
26
  <%= render :partial => "site/footer" %>
36
- </div>
37
-
27
+ </footer>
38
28
  </div>
39
29
 
40
30
  <%= render :partial => "site/javascripts" %>
@@ -1,12 +1,7 @@
1
- <footer class="footer">
2
-
3
- <address>
4
- <strong><%= setting(:title).try(:titleize) %></strong>
5
- <p><%= simple_format setting("contacts/address") %></p>
6
- <p><%= link_to setting("contacts/email"), "mailto:#{setting("contacts/email")}"%><br/>
7
- <%= setting("contacts/phone") %>
8
- </p>
9
-
10
- </address>
11
-
12
- </footer>
1
+ <address>
2
+ <strong><%= setting(:title).try(:titleize) %></strong>
3
+ <p><%= simple_format setting("contacts/address") %></p>
4
+ <p><%= link_to setting("contacts/email"), "mailto:#{setting("contacts/email")}"%><br/>
5
+ <%= setting("contacts/phone") %>
6
+ </p>
7
+ </address>
@@ -1,50 +1,81 @@
1
1
  <head>
2
- <% if content_for?(:meta) %>
3
- <%= yield :meta %>
4
- <% else %>
2
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3
+
5
4
  <%
6
- site_title = get_setting(:title, Settings.app.title)
5
+ site_name = get_setting(:title, Settings.app.title)
7
6
  site_slogan = get_setting(:slogan, Settings.app.slogan)
7
+
8
+ site_title = "#{site_name} – #{site_slogan}"
8
9
  site_description = get_setting(:description, Settings.app.slogan)
9
- %>
10
-
11
- <% if home_page? %>
12
- <%= meta_tags(
13
- :title => "#{site_title} - #{site_slogan}",
10
+ site_keywords = get_setting(:keywords, Settings.app.keywords)
11
+ site_address = Settings.app.address
12
+ city = Settings.app.city
13
+ country = Settings.app.country
14
+ copyright = Settings.app.copyright
15
+ designer = Settings.app.designer
16
+ publisher = Settings.app.publisher
17
+
18
+ geo_region = Settings.app.geo.try(:region)
19
+ geo_placename = Settings.app.geo.try(:placename)
20
+ lat = Settings.app.geo.try(:lat)
21
+ lng = Settings.app.geo.try(:lng)
22
+ geo_position = lat && lng ? "#{lat};#{lng}" : nil
23
+ icmb = lat && lng ? "#{lat}, #{lng}" : nil
24
+
25
+
26
+ meta = {
27
+ :title => site_title,
14
28
  :description => site_description,
15
- :og => {:type => "website"}
16
- )
17
- %>
18
- <% elsif @object %>
19
- <%= meta_tags(
20
- :title => "#{meta_title || title_for(@object)} | #{site_title}",
21
- :description => meta_description || description_for(@object),
22
- :og => {:image => (meta_image || image_for(@object)), :type => (meta_type || "article")}
23
- )
24
- %>
29
+ :charset => nil,
30
+ :keywords => site_keywords,
31
+ :viewport => "width=device-width, initial-scale=1.0",
32
+ :og => {:type => "website"},
33
+ :Geography => site_address,
34
+ :Copyright => ,
35
+ :Designer => ,
36
+ :Publisher => ,
37
+ :distribution => "Global",
38
+ :city => ,
39
+ :country => ,
40
+ :"geo.region" => ,
41
+ :"geo.placename" => ,
42
+ :"geo.position" => geo_position,
43
+ :"ICBM" => icmb
44
+ }
45
+
46
+ if !home_page?
47
+ if @object
48
+ meta.merge!({
49
+ :title => "#{meta_title || title_for(@object)} « #{site_title}",
50
+ :description => meta_description || description_for(@object),
51
+ :og => {:image => (meta_image || image_for(@object).try(:url)), :type => (meta_type || "article")}
52
+ })
25
53
 
54
+ elsif current_page
55
+ meta.merge!({
56
+ :title => "#{meta_title || current_page.title} « #{site_title}",
57
+ :description => (meta_description || current_page.description) ? (meta_description || current_page.description) : nil,
58
+ :og => {:image => meta_image, :type => (meta_type || "article")}
59
+ })
60
+
61
+ elsif meta_title
62
+ meta.merge!({
63
+ :title => "#{meta_title} « #{site_title}",
64
+ :description => meta_description,
65
+ :og => {:image => meta_image, :type => (meta_type || "article")}
66
+ })
67
+
68
+ end
69
+ end
26
70
 
27
- <% elsif current_page %>
28
- <%= meta_tags(
29
- :title => "#{meta_title || current_page.title} | #{site_title}",
30
- :description => (meta_description || current_page.description) ? (meta_description || current_page.description) : nil,
31
- :og => {:image => meta_image, :type => (meta_type || "article")}
32
- )
33
- %>
34
-
35
- <% elsif meta_title %>
36
- <%= meta_tags(
37
- :title => "#{meta_title} | #{site_title}",
38
- :description => meta_description,
39
- :og => {:image => meta_image, :type => (meta_type || "article")}
40
- )
41
- %>
42
- <% end %>
43
- <% end %>
71
+ meta[:"DC.title"] = meta[:title]
72
+ %>
73
+
74
+ <%= meta_tags(meta) %>
75
+
76
+ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
77
+ <!-- <link rel="alternate" type="application/rss+xml" title="RSS" href="/feed" /> -->
44
78
 
45
- <link rel="shortcut icon" href="/favicon.ico?v=2" />
46
- <%= stylesheet_link_tag 'site/site' %>
79
+ <%= stylesheet_link_tag 'site/site', :media => "all" %>
47
80
  <%= yield :stylesheets %>
48
-
49
- <script src="/js/modernizr-2.5.3.min.js"></script>
50
81
  </head>
@@ -1,14 +1,11 @@
1
- <div class="row">
2
- <div class="span12">
1
+ <div class="logo">
2
+ <h1>
3
+ <a href="/" rel="home">
4
+ <%= get_setting(:title, Settings.app.title) %>
5
+ </a>
6
+ </h1>
7
+ </div>
3
8
 
4
- <div id="logo">
5
- <h1>
6
- <a href="/" rel="home" class="clearfix main-logo"><%= image_tag "/img/logo.png", :alt => get_setting(:title, Settings.app.title) %></a>
7
- </h1>
8
- </div>
9
- <div class="tagline">
10
- <%= get_setting(:slogan, Settings.app.slogan) %>
11
- </div>
12
-
13
- </div>
14
- </div>
9
+ <div class="tagline">
10
+ <%= get_setting(:slogan, Settings.app.slogan) %>
11
+ </div>
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: fullstack-cms
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.3.20
4
+ version: 0.3.21
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2013-01-05 00:00:00.000000000 Z
12
+ date: 2013-01-06 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: fullstack-admin
@@ -345,7 +345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
345
345
  version: '0'
346
346
  segments:
347
347
  - 0
348
- hash: 3448496456906016680
348
+ hash: -2840629209679978229
349
349
  required_rubygems_version: !ruby/object:Gem::Requirement
350
350
  none: false
351
351
  requirements: