merbiful-release 0.0.1 → 0.0.2

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.
Files changed (8) hide show
  1. data/Rakefile +1 -1
  2. data/lib/merbiful-release/admin.rb +16 -4
  3. data/templates/admin.css +8 -0
  4. data/templates/css.html.haml +9 -6
  5. data/templates/js.html.haml +8 -5
  6. data/templates/layouts.html.haml +7 -4
  7. data/templates/page_form.html.haml +15 -12
  8. metadata +1 -1
data/Rakefile CHANGED
@@ -6,7 +6,7 @@ require 'pathname'
6
6
 
7
7
  PLUGIN = "merbiful-release"
8
8
  NAME = "merbiful-release"
9
- GEM_VERSION = "0.0.1"
9
+ GEM_VERSION = "0.0.2"
10
10
  AUTHOR = "Martin Kihlgren"
11
11
  EMAIL = "martin@wemind.se"
12
12
  HOMEPAGE = ""
data/lib/merbiful-release/admin.rb CHANGED
@@ -22,7 +22,10 @@ module Merbiful
22
22
  end
23
23
  end
24
24
  else
25
- @form_version = @form_layout.latest if @form_layout
25
+ if @form_layout
26
+ @form_version = Layout::Version.get(params[:version_id])
27
+ @form_version = @form_layout.latest unless @form_version
28
+ end
26
29
  end
27
30
  render_template_with_layout("layouts.html.haml")
28
31
  end
@@ -41,7 +44,10 @@ module Merbiful
41
44
  end
42
45
  end
43
46
  else
44
- @form_version = @form_layout.latest if @form_layout
47
+ if @form_js
48
+ @form_version = Js::Version.get(params[:version_id])
49
+ @form_version = @form_js.latest unless @form_version
50
+ end
45
51
  end
46
52
  render_template_with_layout("js.html.haml")
47
53
  end
@@ -66,7 +72,10 @@ module Merbiful
66
72
  end
67
73
  end
68
74
  else
69
- @form_version = @form_layout.latest if @form_layout
75
+ if @form_css
76
+ @form_version = Css::Version.get(params[:version_id])
77
+ @form_version = @form_css.latest unless @form_version
78
+ end
70
79
  end
71
80
  render_template_with_layout("css.html.haml")
72
81
  end
@@ -97,7 +106,10 @@ module Merbiful
97
106
  end
98
107
  end
99
108
  else
100
- @form_version = @form_page.latest if @form_page
109
+ if @form_page
110
+ @form_version = Page::Version.get(params[:version_id])
111
+ @form_version = @form_page.latest unless @form_version
112
+ end
101
113
  end
102
114
  render_with_layout(Page.all(:parent_id => nil).collect do |page|
103
115
  "<ul class='root'>\n#{render_page(page)}\n</ul>"
data/templates/admin.css CHANGED
@@ -1,6 +1,14 @@
1
1
  ul.info {
2
2
  }
3
3
 
4
+ a {
5
+ text-decoration: none;
6
+ }
7
+
8
+ tr.version a.active {
9
+ background-color: red;
10
+ }
11
+
4
12
  ul.info li {
5
13
  list-style: none none inside;
6
14
  display: inline;
data/templates/css.html.haml CHANGED
@@ -10,20 +10,23 @@
10
10
  - if params[:css_id].to_s == css.id.to_s
11
11
  %table.css
12
12
  %form{:action => url(:merbiful_admin, :action => "css", :css_id => css.id), :method => "post"}
13
+ %tr{:class => "version"}
14
+ %td Viewing version
15
+ %td= @form_css.css_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "css", :css_id => @form_css.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
13
16
  %tr
14
- %td Name
17
+ %td Name (not versioned)
15
18
  %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
16
19
  %tr
17
20
  %td Body
18
- %td~ text_area(@form_css.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
21
+ %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
19
22
  %tr{:class => "filter"}
20
23
  %td Filter
21
- %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_css.latest.filter) + errors(@form_version, :filter)
24
+ %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
22
25
  %tr
23
- %td Media
26
+ %td Media (not versioned)
24
27
  %td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
25
28
  %tr{:class => "cached"}
26
- %td Cached
29
+ %td Cached (not versioned)
27
30
  %td= check_box(:name => "css[cached]", :checked => @form_css.cached) + errors(@form_css, :cached)
28
31
  %tr{:class => "submit"}
29
- %td{:colspan => "2"}= submit("Save")
32
+ %td{:colspan => "2"}= submit("Save as new version")
data/templates/js.html.haml CHANGED
@@ -10,17 +10,20 @@
10
10
  - if params[:js_id].to_s == js.id.to_s
11
11
  %table.js
12
12
  %form{:action => url(:merbiful_admin, :action => "js", :js_id => js.id), :method => "post"}
13
+ %tr{:class => "version"}
14
+ %td Viewing version
15
+ %td= @form_js.js_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "js", :js_id => @form_js.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
13
16
  %tr
14
- %td Name
17
+ %td Name (not versioned)
15
18
  %td= text_field(:name => "js[name]", :value => @form_js.name) + errors(@form_js, :name)
16
19
  %tr
17
20
  %td Body
18
- %td~ text_area(@form_js.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
21
+ %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
19
22
  %tr{:class => "filter"}
20
23
  %td Filter
21
- %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_js.latest.filter) + errors(@form_version, :filter)
24
+ %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
22
25
  %tr{:class => "cached"}
23
- %td Cached
26
+ %td Cached (not versioned)
24
27
  %td= check_box(:name => "js[cached]", :checked => @form_js.cached) + errors(@form_js, :cached)
25
28
  %tr{:class => "submit"}
26
- %td{:colspan => "2"}= submit("Save")
29
+ %td{:colspan => "2"}= submit("Save as new version")
data/templates/layouts.html.haml CHANGED
@@ -10,14 +10,17 @@
10
10
  - if params[:layout_id].to_s == layout.id.to_s
11
11
  %table.layout
12
12
  %form{:action => url(:merbiful_admin, :action => "layouts", :layout_id => layout.id), :method => "post"}
13
+ %tr{:class => "version"}
14
+ %td Viewing version
15
+ %td= @form_layout.layout_versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "layouts", :layout_id => @form_layout.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
13
16
  %tr
14
- %td Name
17
+ %td Name (not versioned)
15
18
  %td= text_field(:name => "layout[name]", :value => @form_layout.name) + errors(@form_layout, :name)
16
19
  %tr
17
20
  %td Body
18
- %td~ text_area(@form_layout.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
21
+ %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
19
22
  %tr{:class => "filter"}
20
23
  %td Filter
21
- %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_layout.latest.filter) + errors(@form_version, :filter)
24
+ %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
22
25
  %tr{:class => "submit"}
23
- %td{:colspan => "2"}= submit("Save")
26
+ %td{:colspan => "2"}= submit("Save as new version")
data/templates/page_form.html.haml CHANGED
@@ -1,41 +1,44 @@
1
1
  %table.page
2
2
  %form{:action => url(:merbiful_admin, :action => "pages", :page_id => @form_page.id), :method => "post"}
3
+ %tr{:class => "version"}
4
+ %td Viewing version
5
+ %td= @form_page.versions(:order => [:id.desc]).collect do |v| "<a class='#{v.id == @form_version.id ? 'active' : 'inactive'}' href='#{url(:merbiful_admin, :action => "pages", :page_id => @form_page.id, :version_id => v.id)}'>#{v.id}</a>" end.join(", ")
3
6
  %tr{:class => "path"}
4
- %td Path
7
+ %td Path (not versioned)
5
8
  %td= text_field(:name => "page[path]", :value => @form_page.path) + errors(@form_page, :path)
6
9
  %tr{:class => "title"}
7
10
  %td Title
8
- %td= text_field(:name => "version[title]", :value => @form_page.title) + errors(@form_version, :title)
11
+ %td= text_field(:name => "version[title]", :value => @form_version.title) + errors(@form_version, :title)
9
12
  %tr{:class => "keywords"}
10
13
  %td Keywords
11
- %td= text_field(:name => "version[keywords]", :value => @form_page.keywords) + errors(@form_version, :keywords)
14
+ %td= text_field(:name => "version[keywords]", :value => @form_version.keywords) + errors(@form_version, :keywords)
12
15
  %tr{:class => "body"}
13
16
  %td Body
14
- %td~ text_area(@form_page.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
17
+ %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
15
18
  %tr{:class => "filter"}
16
19
  %td Filter
17
- %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_page.latest.filter) + errors(@form_version, :filter)
20
+ %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
18
21
  %tr{:class => "layout"}
19
22
  %td Layout
20
- %td= select(:name => "version[layout_id]", :collection => Merbiful::Layout.all, :include_blank => true, :text_method => :name, :value_method => :id, :selected => @form_page.latest.layout_id) + errors(@form_version, :layout)
23
+ %td= select(:name => "version[layout_id]", :collection => Merbiful::Layout.all, :include_blank => true, :text_method => :name, :value_method => :id, :selected => @form_version.layout_id) + errors(@form_version, :layout)
21
24
  %tr{:class => "cached"}
22
- %td Cached
25
+ %td Cached (not versioned)
23
26
  %td= check_box(:name => "page[cached]", :checked => @form_page.cached) + errors(@form_page, :cached)
24
27
  - Merbiful::Css.all.each_with_index do |css, index|
25
28
  - if index == 0
26
29
  %tr{:class => "css"}
27
30
  %td{:rowspan => Merbiful::Css.count, :valign => "top"} Css
28
- %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_page.csses.include?(css)) + css.name
31
+ %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_version.csses.include?(css)) + css.name
29
32
  - else
30
33
  %tr{:class => "css"}
31
- %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_page.csses.include?(css)) + css.name
34
+ %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_version.csses.include?(css)) + css.name
32
35
  - Merbiful::Js.all.each_with_index do |js, index|
33
36
  - if index == 0
34
37
  %tr{:class => "js"}
35
38
  %td{:rowspan => Merbiful::Js.count, :valign => "top"} Js
36
- %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_page.jses.include?(js)) + js.name
39
+ %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_version.jses.include?(js)) + js.name
37
40
  - else
38
41
  %tr{:class => "js"}
39
- %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_page.jses.include?(js)) + js.name
42
+ %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_version.jses.include?(js)) + js.name
40
43
  %tr{:class => "submit"}
41
- %td{:colspan => 2}= submit("Save")
44
+ %td{:colspan => 2}= submit("Save as new version")
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: merbiful-release
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.1
4
+ version: 0.0.2
5
5
  platform: ruby
6
6
  authors:
7
7
  - Martin Kihlgren