fullstack-cms 0.3.22 → 0.3.23

Sign up to get free protection for your applications and to get access to all the features.
Files changed (12) hide show
  1. data/VERSION +1 -1
  2. data/fullstack-cms.gemspec +1 -1
  3. data/lib/generators/fullstack/cms/install_generator.rb +5 -0
  4. data/lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/facebox.js +3 -3
  5. data/lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/lightbox.js +2 -2
  6. data/lib/generators/fullstack/cms/templates/rails/app/assets/stylesheets/site/src/global.css +7 -0
  7. data/lib/generators/fullstack/cms/templates/rails/app/views/layouts/application.html.erb +18 -16
  8. data/lib/generators/fullstack/cms/templates/rails/app/views/site/_footer.html.erb +1 -7
  9. data/lib/generators/fullstack/cms/templates/rails/app/views/site/_head.html.erb +67 -68
  10. data/lib/generators/fullstack/cms/templates/rails/app/views/site/_header.html.erb +2 -0
  11. data/lib/generators/fullstack/cms/templates/rails/app/views/site/_nav.html.erb +6 -17
  12. metadata +2 -2
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.3.22
1
+ 0.3.23
data/fullstack-cms.gemspec CHANGED
@@ -5,7 +5,7 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = "fullstack-cms"
8
- s.version = "0.3.22"
8
+ s.version = "0.3.23"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["mcasimir"]
data/lib/generators/fullstack/cms/install_generator.rb CHANGED
@@ -111,6 +111,11 @@ eos
111
111
  end
112
112
 
113
113
 
114
+ def install_settings
115
+ append_to_file "config/settings.yml", "\n copyright: \"#{Date.today.year} - #{title}\""
116
+
117
+ end
118
+
114
119
 
115
120
  protected
116
121
 
data/lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/facebox.js CHANGED
@@ -85,15 +85,15 @@
85
85
  settings: {
86
86
  opacity : 0.2,
87
87
  overlay : true,
88
- loadingImage : '/facebox/loading.gif',
89
- closeImage : '/facebox/closelabel.png',
88
+ loadingImage : '/img/facebox/loading.gif',
89
+ closeImage : '/img/facebox/closelabel.png',
90
90
  imageTypes : [ 'png', 'jpg', 'jpeg', 'gif' ],
91
91
  faceboxHtml : '\
92
92
  <div id="facebox" style="display:none;"> \
93
93
  <div class="popup"> \
94
94
  <div class="content"> \
95
95
  </div> \
96
- <a href="#" class="close"><img src="/facebox/closelabel.png" title="close" class="close_image" /></a> \
96
+ <a href="#" class="close"><img src="/img/facebox/closelabel.png" title="close" class="close_image" /></a> \
97
97
  </div> \
98
98
  </div>'
99
99
  },
data/lib/generators/fullstack/cms/templates/rails/app/assets/javascripts/site/lib/lightbox.js CHANGED
@@ -48,8 +48,8 @@ lightbox = new Lightbox options
48
48
  LightboxOptions = (function() {
49
49
 
50
50
  function LightboxOptions() {
51
- this.fileLoadingImage = 'images/loading.gif';
52
- this.fileCloseImage = 'images/close.png';
51
+ this.fileLoadingImage = '/img/lightbox/loading.gif';
52
+ this.fileCloseImage = '/img/lightbox/close.png';
53
53
  this.resizeDuration = 700;
54
54
  this.fadeDuration = 500;
55
55
  this.labelImage = "Image";
data/lib/generators/fullstack/cms/templates/rails/app/assets/stylesheets/site/src/global.css CHANGED
@@ -0,0 +1,7 @@
1
+ .page {
2
+ min-height: 700px;
3
+ }
4
+
5
+ .footer {
6
+ text-align: center;
7
+ }
data/lib/generators/fullstack/cms/templates/rails/app/views/layouts/application.html.erb CHANGED
@@ -1,26 +1,28 @@
1
1
  <!doctype html>
2
- <!--[if lt IE 7]> <html class="no-js lt-ie9 lt-ie8 lt-ie7" lang="en"> <![endif]-->
3
- <!--[if IE 7]> <html class="no-js lt-ie9 lt-ie8" lang="en"> <![endif]-->
4
- <!--[if IE 8]> <html class="no-js lt-ie9" lang="en"> <![endif]-->
5
- <!--[if gt IE 8]><!--> <html lang="<%= I18n.locale %>"> <!--<![endif]-->
6
- <%= render :partial => "site/head" %>
2
+ <html lang="<%= I18n.locale %>">
3
+ <head>
4
+ <%= render :partial => "site/head" %>
5
+ </head>
7
6
  <body<%= home_page? ? ' class="home"' : '' %>>
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]-->
7
+
9
8
  <div id="fb-root">
10
9
  </div>
11
10
 
12
- <%= render :partial => "site/nav" %>
13
-
14
- <header class="container header">
15
- <%= render :partial => "site/header" %>
16
- </header>
17
-
18
- <div class="container">
19
- <div role="main">
20
- <%= yield %>
21
- </div>
11
+ <div class="header-wrapper">
12
+ <header class="container header">
13
+ <%= render :partial => "site/header" %>
14
+ </header>
22
15
  </div>
23
16
 
17
+ <div class="page-wrapper">
18
+ <div class="container page">
19
+ <%= yield(:breadcrumbs) unless home_page? %>
20
+ <div role="main">
21
+ <%= yield %>
22
+ </div>
23
+ </div>
24
+ </div>
25
+
24
26
  <div class="footer-wrapper">
25
27
  <footer class="footer container">
26
28
  <%= render :partial => "site/footer" %>
data/lib/generators/fullstack/cms/templates/rails/app/views/site/_footer.html.erb CHANGED
@@ -1,7 +1 @@
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
+ &copy; - <%= Settings.app.copyright %>
data/lib/generators/fullstack/cms/templates/rails/app/views/site/_head.html.erb CHANGED
@@ -1,81 +1,80 @@
1
- <head>
2
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
1
+ <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
3
2
 
4
- <%
5
- site_name = get_setting(:title, Settings.app.title)
6
- site_slogan = get_setting(:slogan, Settings.app.slogan)
3
+ <%
4
+ site_name = get_setting(:title, Settings.app.title)
5
+ site_slogan = get_setting(:slogan, Settings.app.slogan)
7
6
 
8
- site_title = "#{site_name} – #{site_slogan}"
9
- site_description = get_setting(:description, Settings.app.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
7
+ site_title = "#{site_name} – #{site_slogan}"
8
+ site_description = get_setting(:description, Settings.app.slogan)
9
+ site_keywords = get_setting(:keywords, Settings.app.keywords)
10
+ site_address = Settings.app.address
11
+ city = Settings.app.city
12
+ country = Settings.app.country
13
+ copyright = Settings.app.copyright
14
+ designer = Settings.app.designer
15
+ publisher = Settings.app.publisher
17
16
 
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
17
+ geo_region = Settings.app.geo.try(:region)
18
+ geo_placename = Settings.app.geo.try(:placename)
19
+ lat = Settings.app.geo.try(:lat)
20
+ lng = Settings.app.geo.try(:lng)
21
+ geo_position = lat && lng ? "#{lat};#{lng}" : nil
22
+ icmb = lat && lng ? "#{lat}, #{lng}" : nil
24
23
 
25
24
 
26
- meta = {
27
- :title => site_title,
28
- :description => site_description,
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 => copyright,
35
- :Designer => designer,
36
- :Publisher => publisher,
37
- :distribution => "Global",
38
- :city => city,
39
- :country => country,
40
- :"geo.region" => geo_region,
41
- :"geo.placename" => geo_placename,
42
- :"geo.position" => geo_position,
43
- :"ICBM" => icmb
44
- }
25
+ meta = {
26
+ :title => site_title,
27
+ :description => site_description,
28
+ :charset => nil,
29
+ :keywords => site_keywords,
30
+ :viewport => "width=device-width, initial-scale=1.0",
31
+ :og => {:type => "website"},
32
+ :Geography => site_address,
33
+ :Copyright => copyright,
34
+ :Designer => designer,
35
+ :Publisher => publisher,
36
+ :distribution => "Global",
37
+ :city => city,
38
+ :country => country,
39
+ :"geo.region" => geo_region,
40
+ :"geo.placename" => geo_placename,
41
+ :"geo.position" => geo_position,
42
+ :"ICBM" => icmb
43
+ }
45
44
 
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
- })
45
+ if !home_page?
46
+ if @object
47
+ meta.merge!({
48
+ :title => "#{meta_title || title_for(@object)} « #{site_title}",
49
+ :description => meta_description || description_for(@object),
50
+ :og => {:image => (meta_image || image_for(@object).try(:url)), :type => (meta_type || "article")}
51
+ })
53
52
 
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
- })
53
+ elsif current_page
54
+ meta.merge!({
55
+ :title => "#{meta_title || current_page.title} « #{site_title}",
56
+ :description => (meta_description || current_page.description) ? (meta_description || current_page.description) : nil,
57
+ :og => {:image => meta_image, :type => (meta_type || "article")}
58
+ })
60
59
 
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
- })
60
+ elsif meta_title
61
+ meta.merge!({
62
+ :title => "#{meta_title} « #{site_title}",
63
+ :description => meta_description,
64
+ :og => {:image => meta_image, :type => (meta_type || "article")}
65
+ })
67
66
 
68
- end
69
- end
67
+ end
68
+ end
70
69
 
71
- meta[:"DC.title"] = meta[:title]
72
- %>
70
+ meta[:"DC.title"] = meta[:title]
71
+ %>
73
72
 
74
- <%= meta_tags(meta) %>
73
+ <%= meta_tags(meta) %>
75
74
 
76
- <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
77
- <!-- <link rel="alternate" type="application/rss+xml" title="RSS" href="/feed" /> -->
75
+ <link rel="shortcut icon" href="/favicon.ico" type="image/x-icon"/>
76
+ <!-- <link rel="alternate" type="application/rss+xml" title="RSS" href="/feed" /> -->
78
77
 
79
- <%= stylesheet_link_tag 'site/site', :media => "all" %>
80
- <%= yield :stylesheets %>
81
- </head>
78
+ <%= stylesheet_link_tag 'site/site', :media => "all" %>
79
+ <%= yield :stylesheets %>
80
+
data/lib/generators/fullstack/cms/templates/rails/app/views/site/_header.html.erb CHANGED
@@ -9,3 +9,5 @@
9
9
  <div class="tagline">
10
10
  <%= get_setting(:slogan, Settings.app.slogan) %>
11
11
  </div>
12
+
13
+ <%= render :partial => "site/nav" %>
data/lib/generators/fullstack/cms/templates/rails/app/views/site/_nav.html.erb CHANGED
@@ -1,17 +1,6 @@
1
- <div class="navbar navbar-centered">
2
- <div class="navbar-inner">
3
- <div class="container">
4
-
5
- <nav class=" main-menu">
6
- <ul class="nav nav-top nav-pills">
7
- <%= nav_item t("site.home", :default => "Home"), (Fullstack::Cms.localized? ? [:site, :home, I18n.locale] : "/") %>
8
- <%= menu("main", :wrap => false) %>
9
- </ul>
10
- </nav>
11
-
12
- </div>
13
- </div>
14
- </div>
15
-
16
-
17
-
1
+ <nav class=" main-menu">
2
+ <ul class="nav nav-top nav-pills">
3
+ <%= nav_item t("site.home", :default => "Home"), (Fullstack::Cms.localized? ? [:site, :home, I18n.locale] : "/") %>
4
+ <%= menu("main", :wrap => false) %>
5
+ </ul>
6
+ </nav>
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.22
4
+ version: 0.3.23
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -345,7 +345,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
345
345
  version: '0'
346
346
  segments:
347
347
  - 0
348
- hash: 3292868043360910414
348
+ hash: 1028969823530157224
349
349
  required_rubygems_version: !ruby/object:Gem::Requirement
350
350
  none: false
351
351
  requirements: