scms 4.2.5 → 4.2.6

Sign up to get free protection for your applications and to get access to all the features.
Files changed (9) hide show
  1. checksums.yaml +8 -8
  2. data/assets/blank-template/_layouts/layout.erb +1 -1
  3. data/assets/blank-template/cleanurl/index.html +80 -0
  4. data/lib/scms.rb +2 -3
  5. data/lib/scms/scms-pageoptions.rb +11 -2
  6. data/lib/scms/scms-parser.rb +1 -1
  7. data/lib/scms/scms-utils.rb +6 -1
  8. data/lib/scms/version.rb +1 -1
  9. metadata +4 -3
checksums.yaml CHANGED
@@ -1,15 +1,15 @@
1
1
  ---
2
2
  !binary "U0hBMQ==":
3
3
  metadata.gz: !binary |-
4
- MzQ5Mzk5NDlkOTllY2EzNThiOTRkN2RiMGVkYmI0ZGViMmUwYzQyNA==
4
+ MDYyNWM0MTM0MWYzZjE4MDE3N2RiMjhmMzY5MmQ5YjhmN2U4NGIxNg==
5
5
  data.tar.gz: !binary |-
6
- NTUwNWNlMDE5MjBjZmU4Zjk4NDExNzRhYzg0ZTAyZDI5YTY2OTY3Mg==
6
+ YTM2NjlkMTQ4YWI5NmY4ZTQ2OGJiMGEwN2ZiMDU5MDYzYmE1ZGZjMw==
7
7
  SHA512:
8
8
  metadata.gz: !binary |-
9
- MWE2YzE2NjFmNDI2NDA1Y2Y3YjRmMDc0NWZmODIzNjVmZDI3NzI5ODk4MTll
10
- ZmJjNGNhMGQ5N2MzOGViM2VlZDYxYzEzMWExNzQ0YmE5NjA0NzJjMjNkMmMz
11
- MGU2YjQ1YjMxYWIzNTUzNTI5OTgwNDc0ZWE4MzBmZTk2NWJiNDk=
9
+ Zjk5OWEyZTY2ZmU3YTViZmE5NGY1NWFjODMwYmJmYzZjOGQ0MTkxNDhjNWYw
10
+ MzdhZDJlZmE1Yjc1ODc0NjI5NmY2YmU4OTQzZDAxMzc2YTg2OWNhZDlmZDU5
11
+ MzMxYmEyYmNiYTg0OTg1N2E5OGZkNjQ0NmUzZWU2NjI1ZTI1MjA=
12
12
  data.tar.gz: !binary |-
13
- ZDc5YmE3NGFhMGI0MTE0NDU5NTRmMjU3ZTMzZWE3NGY2OGRmOGUwZGJlNmVi
14
- ZWM5ZjJjNjJkNjRiYjRjY2IzMzM2MTYyNDQzOGQ1MDNiN2U0M2NhMDc5MjE2
15
- YzJiYTllYThlYzc0Nzc3YzY3YmVmNGQwYWNiYjQzYzRmMGEzMzQ=
13
+ ZWIxNGFhYzMyYTU1OTIzMGM4YWVjODY1NmYwYWU2M2U3NTgxNWM3MWNlZDNj
14
+ ZjAzZTAyYzQ4ODliN2E4ODQwM2YzN2M4NTkwY2I4NGNhZjNjZmViZmI4NGJm
15
+ N2UyZTEyMTM2ZDg0MTc2ZDRmMWJiM2MxMmZkMzAwYTdlNTY1ZjE=
data/assets/blank-template/_layouts/layout.erb CHANGED
@@ -1 +1 @@
1
- <!DOCTYPE html>
2
1
  <head>
3
2
  <meta charset="utf-8">
4
3
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
5
4
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
6
5
  <meta name="description" content="">
7
6
  <meta name="author" content="">
8
7
  <title><%= page.title %></title>
9
8
  <!-- Bootstrap core CSS -->
10
9
  <link href="~/css/bootstrap.min.css" rel="stylesheet">
11
10
  <!-- Layout extras -->
12
11
  <link href="~/css/layout.css" rel="stylesheet">
13
12
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
14
13
  <!--[if lt IE 9]>
15
14
  <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
16
15
  <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
17
16
  <![endif]-->
18
17
  <script src="~/js/jquery-1.10.2.min.js"></script>
19
18
  </head>
20
19
  <body>
21
20
  <a class="sr-only" href="#content">Skip to main content</a>
22
21
  <!-- Docs master nav -->
23
22
  <header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner">
24
23
  <div class="container">
25
24
  <div class="navbar-header">
26
25
  <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
27
26
  <span class="sr-only">Toggle navigation</span>
28
27
  <span class="icon-bar"></span>
29
28
  <span class="icon-bar"></span>
30
29
  <span class="icon-bar"></span>
31
30
  </button>
32
31
  <a href="~/" class="navbar-brand">Project name</a>
33
32
  </div>
34
33
  <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
35
34
  <ul class="nav navbar-nav">
36
35
  <li><a href="~/getting-started.html">Getting started</a></li>
37
36
  <li><a href="~/cleanurl/">Clean URLs</a></li>
38
37
  <li><a href="#contact">Contact</a></li>
39
38
  </ul>
40
39
  <ul class="nav navbar-nav navbar-right">
41
40
  <li class="active">
42
41
  <a href="http://courtenay.probert.me.uk/Static-CMS/">Help</a>
43
42
  </li>
44
43
  </ul>
45
44
  </nav>
46
45
  </div>
47
46
  </header>
48
47
  <!-- Docs page layout -->
49
48
  <div class="bs-header" id="content">
50
49
  <div class="container">
51
50
  <%= page.views["intro"] %>
52
51
  </div>
53
52
  </div>
54
53
  <!-- Callout for the old docs link -->
55
54
  <div class="bs-old-docs">
56
55
  <div class="container">
57
56
  <%= page.views["leadin"] %>
58
57
  </div>
59
58
  </div>
60
59
  <div class="container bs-docs-container">
61
60
  <div class="row">
62
61
  <div class="col-md-3">
63
62
  <div class="bs-sidebar hidden-print" role="complementary">
64
63
  <%= page.views["sidenav"] %>
65
64
  </div>
66
65
  </div>
67
66
  <div class="col-md-9" role="main">
68
67
  <%= page.views["main"] %>
69
68
  </div>
70
69
  </div>
71
70
  </div>
72
71
  <!-- Footer
73
72
  ================================================== -->
74
73
  <footer class="bs-footer" role="contentinfo">
75
74
  <div class="container">
76
75
  <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
77
76
  <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
78
77
  <ul class="footer-links">
79
78
  <li>Currently v3.0.1</li>
80
79
  <li class="muted">&middot;</li>
81
80
  <li><a href="../2.3.2/">Bootstrap 2.3.2 docs</a></li>
82
81
  <li class="muted">&middot;</li>
83
82
  <li><a href="http://blog.getbootstrap.com">Blog</a></li>
84
83
  <li class="muted">&middot;</li>
85
84
  <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li>
86
85
  <li class="muted">&middot;</li>
87
86
  <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li>
88
87
  </ul>
89
88
  </div>
90
89
  </footer>
91
90
  <!-- Bootstrap core JavaScript
92
91
  ================================================== -->
93
92
  <!-- Placed at the end of the document so the pages load faster -->
94
93
  <script src="~/js/bootstrap.min.js"></script>
95
94
  <script src="~/js/shims/holder.js"></script>
96
95
  <script src="~/js/application.js"></script>
97
96
  </body>
97
+ <!DOCTYPE html>
98
98
  <head>
99
99
  <meta charset="utf-8">
100
100
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
101
101
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
102
102
  <meta name="description" content="">
103
103
  <meta name="author" content="">
104
104
  <title><%= page.title %></title>
105
105
  <!-- Bootstrap core CSS -->
106
106
  <link href="~/css/bootstrap.min.css" rel="stylesheet">
107
107
  <!-- Layout extras -->
108
108
  <link href="~/css/layout.css" rel="stylesheet">
109
109
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
110
110
  <!--[if lt IE 9]>
111
111
  <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
112
112
  <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
113
113
  <![endif]-->
114
114
  <script src="~/js/jquery-1.10.2.min.js"></script>
115
115
  </head>
116
116
  <body>
117
117
  <a class="sr-only" href="#content">Skip to main content</a>
118
118
  <!-- Docs master nav -->
119
119
  <header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner">
120
120
  <div class="container">
121
121
  <div class="navbar-header">
122
122
  <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
123
123
  <span class="sr-only">Toggle navigation</span>
124
124
  <span class="icon-bar"></span>
125
125
  <span class="icon-bar"></span>
126
126
  <span class="icon-bar"></span>
127
127
  </button>
128
128
  <a href="~/" class="navbar-brand">Project name</a>
129
129
  </div>
130
130
  <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
131
131
  <ul class="nav navbar-nav">
132
132
  <li><a href="~/getting-started.html">Getting started</a></li>
133
133
  <li><a href="~/cleanurl/">Clean URLs</a></li>
134
134
  <li><a href="#contact">Contact</a></li>
135
135
  </ul>
136
136
  <ul class="nav navbar-nav navbar-right">
137
137
  <li class="active">
138
138
  <a href="http://courtenay.probert.me.uk/Static-CMS/">Help</a>
139
139
  </li>
140
140
  </ul>
141
141
  </nav>
142
142
  </div>
143
143
  </header>
144
144
  <!-- Docs page layout -->
145
145
  <div class="bs-header" id="content">
146
146
  <div class="container">
147
147
  <%= page.views["intro"] %>
148
148
  </div>
149
149
  </div>
150
150
  <!-- Callout for the old docs link -->
151
151
  <div class="bs-old-docs">
152
152
  <div class="container">
153
153
  <%= page.views["leadin"] %>
154
154
  </div>
155
155
  </div>
156
156
  <div class="container bs-docs-container">
157
157
  <div class="row">
158
158
  <div class="col-md-3">
159
159
  <div class="bs-sidebar hidden-print" role="complementary">
160
160
  <%= page.views["sidenav"] %>
161
161
  </div>
162
162
  </div>
163
163
  <div class="col-md-9" role="main">
164
164
  <%= page.views["main"] %>
165
165
  </div>
166
166
  </div>
167
167
  </div>
168
168
  <!-- Footer
169
169
  ================================================== -->
170
170
  <footer class="bs-footer" role="contentinfo">
171
171
  <div class="container">
172
172
  <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
173
173
  <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
174
174
  <ul class="footer-links">
175
175
  <li>Currently v3.0.1</li>
176
176
  <li class="muted">&middot;</li>
177
177
  <li><a href="../2.3.2/">Bootstrap 2.3.2 docs</a></li>
178
178
  <li class="muted">&middot;</li>
179
179
  <li><a href="http://blog.getbootstrap.com">Blog</a></li>
180
180
  <li class="muted">&middot;</li>
181
181
  <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li>
182
182
  <li class="muted">&middot;</li>
183
183
  <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li>
184
184
  </ul>
185
185
  </div>
186
186
  </footer>
187
187
  <!-- Bootstrap core JavaScript
188
188
  ================================================== -->
189
189
  <!-- Placed at the end of the document so the pages load faster -->
190
190
  <script src="~/js/bootstrap.min.js"></script>
191
191
  <script src="~/js/shims/holder.js"></script>
192
192
  <script src="~/js/application.js"></script>
193
193
  <%= page.monkeyhook %>
194
194
  <%= page.livereload %>
195
195
  </body>
data/assets/blank-template/cleanurl/index.html ADDED
@@ -0,0 +1,80 @@
1
+ <!DOCTYPE html>
2
  <head>
1
3
  <meta charset="utf-8">
2
4
  <meta http-equiv="X-UA-Compatible" content="IE=edge">
3
5
  <meta name="viewport" content="width=device-width, initial-scale=1.0">
4
6
  <meta name="description" content="">
5
7
  <meta name="author" content="">
6
8
  <title>cleanurl</title>
7
9
  <!-- Bootstrap core CSS -->
8
10
  <link href="/css/bootstrap.min.css" rel="stylesheet">
9
11
  <!-- Layout extras -->
10
12
  <link href="/css/layout.css" rel="stylesheet">
11
13
  <!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
12
14
  <!--[if lt IE 9]>
13
15
  <script src="//oss.maxcdn.com/libs/html5shiv/3.7.0/html5shiv.js"></script>
14
16
  <script src="//oss.maxcdn.com/libs/respond.js/1.3.0/respond.min.js"></script>
15
17
  <![endif]-->
16
18
  <script src="/js/jquery-1.10.2.min.js"></script>
17
19
  </head>
18
20
  <body>
19
21
  <a class="sr-only" href="#content">Skip to main content</a>
20
22
  <!-- Docs master nav -->
21
23
  <header class="navbar navbar-inverse navbar-fixed-top bs-docs-nav" role="banner">
22
24
  <div class="container">
23
25
  <div class="navbar-header">
24
26
  <button class="navbar-toggle" type="button" data-toggle="collapse" data-target=".bs-navbar-collapse">
25
27
  <span class="sr-only">Toggle navigation</span>
26
28
  <span class="icon-bar"></span>
27
29
  <span class="icon-bar"></span>
28
30
  <span class="icon-bar"></span>
29
31
  </button>
30
32
  <a href="/" class="navbar-brand">Project name</a>
31
33
  </div>
32
34
  <nav class="collapse navbar-collapse bs-navbar-collapse" role="navigation">
33
35
  <ul class="nav navbar-nav">
34
36
  <li><a href="/getting-started.html">Getting started</a></li>
35
37
  <li><a href="/cleanurl/">Clean URLs</a></li>
36
38
  <li><a href="#contact">Contact</a></li>
37
39
  </ul>
38
40
  <ul class="nav navbar-nav navbar-right">
39
41
  <li class="active">
40
42
  <a href="http://courtenay.probert.me.uk/Static-CMS/">Help</a>
41
43
  </li>
42
44
  </ul>
43
45
  </nav>
44
46
  </div>
45
47
  </header>
46
48
  <!-- Docs page layout -->
47
49
  <div class="bs-header" id="content">
48
50
  <div class="container">
49
51
 
52
+ <h1 id="about">About</h1>
53
+
54
+ <p>Learn about the history of Bootstrap, meet the core team, and check out the ever-growing community resources.</p>
55
+
50
56
  </div>
51
57
  </div>
52
58
  <!-- Callout for the old docs link -->
53
59
  <div class="bs-old-docs">
54
60
  <div class="container">
55
61
 
62
+ <p><strong>Looking for Bootstrap 2.3.2 docs?</strong> WeÔÇÖve moved it to a new home while we push forward with Bootstrap 3. <a href='http://blog.getbootstrap.com/'>Read the blog</a> for details.</p>
63
+
56
64
  </div>
57
65
  </div>
58
66
  <div class="container bs-docs-container">
59
67
  <div class="row">
60
68
  <div class="col-md-3">
61
69
  <div class="bs-sidebar hidden-print" role="complementary">
62
70
  <ul class="nav bs-sidenav">
71
+ <li><a href="#history">History</a></li>
72
+ <li><a href="#team">Core team</a></li>
73
+ <li><a href="#community">Community</a></li>
74
+ </ul>
63
75
  </div>
64
76
  </div>
65
77
  <div class="col-md-9" role="main">
66
78
  <!-- History
79
+ ================================================== -->
80
+ <div class="bs-docs-section">
81
+ <div class="page-header">
82
+ <h1 id="history">History</h1>
83
+ </div>
84
+ <p class="lead">Originally created by a designer and a developer at Twitter, Bootstrap has become one of the most popular front-end frameworks and open source projects in the world.</p>
85
+ <p>Bootstrap was created at Twitter in mid-2010 by <a href="https://twitter.com/mdo">@mdo</a> and <a href="https://twitter.com/fat">@fat</a>. Prior to being an open-sourced framework, Bootstrap was known as <em>Twitter Blueprint</em>. A few months into development, Twitter held its <a href="https://blog.twitter.com/2010/hack-week">first Hack Week</a> and the project exploded as developers of all skill levels jumped in without any external guidance. It served as the style guide for internal tools development at the company for over a year before its public release, and continues to do so today.</p>
86
+ <p>Originally <a href="https://dev.twitter.com/blog/bootstrap-twitter">released</a> on <a href="https://twitter.com/mdo/statuses/104620039650557952"><time datetime="2011-08-19 11:25">Friday, August 19, 2011</time></a>, we've since had over <a href="https://github.com/twbs/bootstrap/releases">twenty releases</a>, including two major rewrites with v2 and v3. With Bootstrap 2, we added responsive functionality to the entire framework as an optional stylesheet. Building on that with Bootstrap 3, we rewrote the library once more to make it responsive by default with a mobile first approach.</p>
87
+ </div>
88
+
89
+
90
+ <!-- Team
91
+ ================================================== -->
92
+ <div class="bs-docs-section">
93
+ <div class="page-header">
94
+ <h1 id="team">Core team</h1>
95
+ </div>
96
+ <p class="lead">Bootstrap is maintained by the founding team and a small group of invaluable core contributors, with the massive support and involvement of our community.</p>
97
+ <div class="list-group bs-team">
98
+ <div class="list-group-item">
99
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=mdo&amp;type=follow"></iframe>
100
+ <a class="team-member" href="https://github.com/mdo">
101
+ <img src="http://www.gravatar.com/avatar/bc4ab438f7a4ce1c406aadc688427f2c" alt="@mdo">
102
+ <strong>Mark Otto</strong> <small>@mdo</small>
103
+ </a>
104
+ </div>
105
+ <div class="list-group-item">
106
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=fat&amp;type=follow"></iframe>
107
+ <a class="team-member" href="https://github.com/fat">
108
+ <img src="http://www.gravatar.com/avatar/a98244cbdacaf1c0b55499466002f7a8" alt="@fat">
109
+ <strong>Jacob Thornton</strong> <small>@fat</small>
110
+ </a>
111
+ </div>
112
+ <div class="list-group-item">
113
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=cvrebert&amp;type=follow"></iframe>
114
+ <a class="team-member" href="https://github.com/cvrebert">
115
+ <img src="http://www.gravatar.com/avatar/edec428c425453955f770095a7d26c50" alt="@cvrebert">
116
+ <strong>Chris Rebert</strong> <small>@cvrebert</small>
117
+ </a>
118
+ </div>
119
+ <div class="list-group-item">
120
+ <iframe class="github-btn" src="http://ghbtns.com/github-btn.html?user=juthilo&amp;type=follow"></iframe>
121
+ <a class="team-member" href="https://github.com/juthilo">
122
+ <img src="http://www.gravatar.com/avatar/0f7dd3ce58a416be5685ea6194f82b11" alt="@juthilo">
123
+ <strong>Julian Thilo</strong> <small>@juthilo</small>
124
+ </a>
125
+ </div>
126
+ </div>
127
+ <p>Get involved with Bootstrap development by <a href="https://github.com/twbs/bootstrap/issues/new">opening an issue</a> or submitting a pull request. Read our <a href="https://github.com/twbs/bootstrap/blob/master/CONTRIBUTING.md">contributing guidelines</a> for information on how we develop.</p>
128
+ </div>
129
+
130
+
131
+ <!-- Community
132
+ ================================================== -->
133
+ <div class="bs-docs-section">
134
+ <div class="page-header">
135
+ <h1 id="community">Community</h1>
136
+ </div>
137
+ <p class="lead">Stay up to date on the development of Bootstrap and reach out to the community with these helpful resources.</p>
138
+ <ul>
139
+ <li>Read and subscribe to <a href="http://blog.getbootstrap.com/">The Official Bootstrap Blog</a>.</li>
140
+ <li>Have a question that's not a feature request or bug report? <a href="http://groups.google.com/group/twitter-bootstrap">Ask on the mailing list.</a></li>
141
+ <li>Chat with fellow Bootstrappers using IRC in the <code>irc.freenode.net</code> server, in the <a href="irc://irc.freenode.net/#twitter-bootstrap">##twitter-bootstrap channel</a>.</li>
142
+ <li>Find inspiring examples of people building with Bootstrap at the <a href="http://expo.getbootstrap.com">Bootstrap Expo</a>.</li>
143
+ </ul>
144
+ <p>You can also follow <a href="https://twitter.com/twbootstrap">@twbootstrap on Twitter</a> for the latest gossip and awesome music videos.</p>
145
+ </div>
146
+
147
+
67
148
  </div>
68
149
  </div>
69
150
  </div>
70
151
  <!-- Footer
71
152
  ================================================== -->
72
153
  <footer class="bs-footer" role="contentinfo">
73
154
  <div class="container">
74
155
  <p>Designed and built with all the love in the world by <a href="http://twitter.com/mdo" target="_blank">@mdo</a> and <a href="http://twitter.com/fat" target="_blank">@fat</a>.</p>
75
156
  <p>Code licensed under <a href="http://www.apache.org/licenses/LICENSE-2.0" target="_blank">Apache License v2.0</a>, documentation under <a href="http://creativecommons.org/licenses/by/3.0/">CC BY 3.0</a>.</p>
76
157
  <ul class="footer-links">
77
158
  <li>Currently v3.0.1</li>
78
159
  <li class="muted">&middot;</li>
79
160
  <li><a href="../2.3.2/">Bootstrap 2.3.2 docs</a></li>
80
161
  <li class="muted">&middot;</li>
81
162
  <li><a href="http://blog.getbootstrap.com">Blog</a></li>
82
163
  <li class="muted">&middot;</li>
83
164
  <li><a href="https://github.com/twbs/bootstrap/issues?state=open">Issues</a></li>
84
165
  <li class="muted">&middot;</li>
85
166
  <li><a href="https://github.com/twbs/bootstrap/releases">Releases</a></li>
86
167
  </ul>
87
168
  </div>
88
169
  </footer>
89
170
  <!-- Bootstrap core JavaScript
90
171
  ================================================== -->
91
172
  <!-- Placed at the end of the document so the pages load faster -->
92
173
  <script src="/js/bootstrap.min.js"></script>
93
174
  <script src="/js/shims/holder.js"></script>
94
175
  <script src="/js/application.js"></script>
95
176
 
96
177
 
97
178
  </body>
data/lib/scms.rb CHANGED
@@ -176,16 +176,15 @@ module Scms
176
176
  template = ScmsXmlHandler.transform(htmlsnipet)
177
177
  when ".md"
178
178
  begin
179
- htmlsnipet = htmlsnipet.encode('UTF-8', :invalid => :replace, :undef => :replace)
180
179
  doc = Maruku.new(htmlsnipet)
181
- template = doc.to_html
180
+ template = ScmsUtils.toUTF8(doc.to_html)
182
181
  rescue Exception => e
183
182
  template = htmlsnipet
184
183
  ScmsUtils.errLog(e.message)
185
184
  ScmsUtils.log(e.backtrace.inspect)
186
185
  end
187
186
  else
188
- template = htmlsnipet
187
+ template = ScmsUtils.toUTF8(htmlsnipet)
189
188
  end
190
189
 
191
190
  parser = ScmsParser.new(template, hash)
data/lib/scms/scms-pageoptions.rb CHANGED
@@ -63,13 +63,13 @@ module Scms
63
63
  @keywords = pageconfig["keywords"] if pageconfig["keywords"] != nil
64
64
  @description = pageconfig["description"] if pageconfig["description"] != nil
65
65
  @handler = pageconfig["handler"]
66
- @resource = getResource(website, pageconfig["resource"])
66
+ @resource = getResource(website, pageconfig["resource"], pageconfig)
67
67
  @allowEdit = pageconfig["allowEdit"] if pageconfig["allowEdit"] != nil
68
68
  end
69
69
  end
70
70
 
71
71
 
72
- def getResource(website, resource)
72
+ def getResource(website, resource, config)
73
73
  ymlresource = Hash.new
74
74
  if resource != nil
75
75
  resourcepath = File.join(website, resource)
@@ -86,6 +86,15 @@ module Scms
86
86
  ScmsUtils.writelog("::Resource not found #{resource}", website)
87
87
  ScmsUtils.writelog("type NUL > #{resourcepath}", website)
88
88
  end
89
+ else
90
+ ymlresource = config
91
+ ymlresource.delete("view")
92
+ ymlresource.delete("views")
93
+ ymlresource.delete("resource")
94
+ ymlresource.delete("bundles")
95
+ ymlresource.delete("navigation")
96
+ ymlresource.delete("monkeyhook")
97
+ ymlresource.delete("livereload")
89
98
  end
90
99
  return ymlresource
91
100
  end
data/lib/scms/scms-parser.rb CHANGED
@@ -32,7 +32,7 @@ module Scms
32
32
  page = @model
33
33
  erb = ERB.new(@template)
34
34
  result = erb.result(page.instance_eval { binding })
35
- result = result.encode('UTF-8', :invalid => :replace, :undef => :replace)
35
+ result = ScmsUtils.toUTF8(result)
36
36
 
37
37
  # only do cms click edit on sub views not layout templates
38
38
  if page.view != nil
data/lib/scms/scms-utils.rb CHANGED
@@ -101,7 +101,7 @@ module ScmsUtils
101
101
 
102
102
  def ScmsUtils.txt_2_html(rawsnippet)
103
103
  if rawsnippet != nil
104
- rawsnippet = rawsnippet.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => "")
104
+ rawsnippet = ScmsUtils.toUTF8(rawsnippet)
105
105
  rawsnippet.gsub!(/(http:\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
106
106
  rawsnippet.gsub!(/(file:\/\/\/\S+)/, '<a href="\1" target="_blank" ref="external">\1</a>')
107
107
  rawsnippet.gsub!(/\n/, "<br />")
@@ -110,6 +110,11 @@ module ScmsUtils
110
110
  return rawsnippet
111
111
  end
112
112
 
113
+ def ScmsUtils.toUTF8(txt)
114
+ txt.force_encoding('binary')
115
+ return txt.encode('UTF-8', :invalid => :replace, :undef => :replace, :replace => "?")
116
+ end
117
+
113
118
  def ScmsUtils.uriEncode(uri)
114
119
  return uri.gsub(" ", "%20")
115
120
  end
data/lib/scms/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Scms
2
- VERSION = "4.2.5"
2
+ VERSION = "4.2.6"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: scms
3
3
  version: !ruby/object:Gem::Version
4
- version: 4.2.5
4
+ version: 4.2.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Courtenay Probert
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2013-11-08 00:00:00.000000000 Z
11
+ date: 2014-01-20 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cprobert-s3sync
@@ -197,6 +197,7 @@ files:
197
197
  - assets/blank-template/_pages/index/_config.yml
198
198
  - assets/blank-template/_pages/index/carousel.erb
199
199
  - assets/blank-template/_pages/index/main.erb
200
+ - assets/blank-template/cleanurl/index.html
200
201
  - assets/blank-template/css/bootstrap-theme.css
201
202
  - assets/blank-template/css/bootstrap-theme.min.css
202
203
  - assets/blank-template/css/bootstrap.css
@@ -256,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
256
257
  version: '0'
257
258
  requirements: []
258
259
  rubyforge_project:
259
- rubygems_version: 2.1.10
260
+ rubygems_version: 2.1.11
260
261
  signing_key:
261
262
  specification_version: 4
262
263
  summary: Create simple static websites, in a jiffy