refinerycms 0.9.5.22 → 0.9.5.23
Sign up to get free protection for your applications and to get access to all the features.
- data/README +1 -1
- data/VERSION +1 -1
- data/bin/refinery-update-core +1 -1
- data/vendor/plugins/refinery/app/views/shared/_content_page.html.erb +23 -6
- metadata +1 -1
data/README
CHANGED
|
@@ -50,7 +50,7 @@ You will be prompted to setup your first user.
|
|
|
50
50
|
|
|
51
51
|
== Environment required
|
|
52
52
|
|
|
53
|
-
Refinery runs using a number of gems which (as of Refinery version 0.9.5.
|
|
53
|
+
Refinery runs using a number of gems which (as of Refinery version 0.9.5.22) are outlined below:
|
|
54
54
|
|
|
55
55
|
- "rake", :version => ">= 0.8.3"
|
|
56
56
|
- "friendly_id", :version => ">= 2.2.2"
|
data/VERSION
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
0.9.5.
|
|
1
|
+
0.9.5.23
|
data/bin/refinery-update-core
CHANGED
|
@@ -8,7 +8,7 @@ unless RAILS_ROOT.nil? or RAILS_ROOT.length == 0
|
|
|
8
8
|
FileUtils::makedirs dirs.map {|dir| File.join(RAILS_ROOT, dir) }
|
|
9
9
|
|
|
10
10
|
# copy in the new assets.
|
|
11
|
-
assets = [%w(public stylesheets refinery), %w(public javascripts refinery)]
|
|
11
|
+
assets = [%w(public stylesheets refinery), %w(public javascripts refinery), %w(public javascripts wymeditor)]
|
|
12
12
|
assets.each do |asset|
|
|
13
13
|
FileUtils::rm_rf File.join(RAILS_ROOT, asset), :secure => true # ensure the destination is clear.
|
|
14
14
|
FileUtils::cp_r File.join(REFINERY_ROOT, asset), File.join(RAILS_ROOT, asset) # copy the new assets into the project.
|
|
@@ -1,15 +1,32 @@
|
|
|
1
|
+
<%
|
|
2
|
+
body_content_page_title = (title = yield :body_content_page_title).blank? ? page_title : title
|
|
3
|
+
body_content_left = (body_content_left = yield :body_content_left).blank? ? @page[:body] : body_content_left
|
|
4
|
+
body_content_right = (body_content_right = yield :body_content_right).blank? ? @page[:side_body] : body_content_right
|
|
5
|
+
extra_body_content_classes = []
|
|
6
|
+
extra_body_content_classes << "no_title" if body_content_page_title.blank?
|
|
7
|
+
extra_body_content_classes << "no_left" if body_content_left.blank?
|
|
8
|
+
extra_body_content_classes << "no_right" if body_content_right.blank?
|
|
9
|
+
-%>
|
|
1
10
|
<%= render :partial => "/shared/submenu" if (show_submenu ||= true) and RefinerySetting.find_or_set(:show_submenu_on_content_pages, true) %>
|
|
2
|
-
<div id='body_content' class='clearfix'>
|
|
3
|
-
|
|
11
|
+
<div id='body_content' class='clearfix<%= " #{extra_body_content_classes.join(" ")}" unless extra_body_content_classes.empty? %>'>
|
|
12
|
+
<% unless body_content_page_title.blank? and !(show_empty_sections ||= false) -%>
|
|
13
|
+
<h1 id='body_content_page_title'>
|
|
14
|
+
<%= body_content_page_title %>
|
|
15
|
+
</h1>
|
|
16
|
+
<% end -%>
|
|
17
|
+
<% unless body_content_left.blank? and !(show_empty_sections ||= false) -%>
|
|
4
18
|
<div id='body_content_left' class='clearfix'>
|
|
5
|
-
<%=
|
|
19
|
+
<%= body_content_left %>
|
|
6
20
|
</div>
|
|
21
|
+
<% end -%>
|
|
22
|
+
<% unless body_content_right.blank? and !(show_empty_sections ||= false) -%>
|
|
7
23
|
<div id='body_content_right' class='clearfix'>
|
|
8
|
-
<%=
|
|
24
|
+
<%= body_content_right %>
|
|
9
25
|
</div>
|
|
26
|
+
<% end -%>
|
|
10
27
|
</div>
|
|
11
|
-
<% unless @page.live?
|
|
28
|
+
<% unless @page.live? -%>
|
|
12
29
|
<div class='page_not_live'>
|
|
13
30
|
This page is NOT live for public viewing.
|
|
14
31
|
</div>
|
|
15
|
-
<% end
|
|
32
|
+
<% end -%>
|