merbiful-release 0.0.1 → 0.0.2

data/Rakefile

@@ -6,7 +6,7 @@ require 'pathname'
 
 PLUGIN = "merbiful-release"
 NAME = "merbiful-release"
-GEM_VERSION = "0.0.1"
+GEM_VERSION = "0.0.2"
 AUTHOR = "Martin Kihlgren"
 EMAIL = "martin@wemind.se"
 HOMEPAGE = ""

data/lib/merbiful-release/admin.rb

@@ -22,7 +22,10 @@ module Merbiful
           end
         end
       else
-        @form_version = @form_layout.latest if @form_layout
+        if @form_layout
+          @form_version = Layout::Version.get(params[:version_id])
+          @form_version = @form_layout.latest unless @form_version
+        end
       end
       render_template_with_layout("layouts.html.haml")
     end
@@ -41,7 +44,10 @@ module Merbiful
           end
         end
       else
-        @form_version = @form_layout.latest if @form_layout
+        if @form_js
+          @form_version = Js::Version.get(params[:version_id])
+          @form_version = @form_js.latest unless @form_version
+        end
       end
       render_template_with_layout("js.html.haml")
     end
@@ -66,7 +72,10 @@ module Merbiful
           end
         end
       else
-        @form_version = @form_layout.latest if @form_layout
+        if @form_css
+          @form_version = Css::Version.get(params[:version_id])
+          @form_version = @form_css.latest unless @form_version
+        end
       end
       render_template_with_layout("css.html.haml")
     end
@@ -97,7 +106,10 @@ module Merbiful
           end
         end
       else
-        @form_version = @form_page.latest if @form_page
+        if @form_page
+          @form_version = Page::Version.get(params[:version_id])
+          @form_version = @form_page.latest unless @form_version
+        end
       end
       render_with_layout(Page.all(:parent_id => nil).collect do |page|
                            "<ul class='root'>\n#{render_page(page)}\n</ul>"

data/templates/admin.css

@@ -1,6 +1,14 @@
 ul.info {
 }
 
+a {
+  text-decoration: none;
+}
+
+tr.version a.active {
+  background-color: red;
+}
+
 ul.info li {
   list-style: none none inside;
   display: inline;

data/templates/css.html.haml

@@ -10,20 +10,23 @@
       - if params[:css_id].to_s == css.id.to_s
         %table.css
           %form{:action => url(:merbiful_admin, :action => "css", :css_id => css.id), :method => "post"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %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(", ")
             %tr
-              %td Name
+              %td Name (not versioned)
               %td= text_field(:name => "css[name]", :value => @form_css.name) + errors(@form_css, :name)
             %tr
               %td Body
-              %td~ text_area(@form_css.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
+              %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
             %tr{:class => "filter"}
               %td Filter
-              %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_css.latest.filter) + errors(@form_version, :filter)
+              %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
             %tr
-              %td Media
+              %td Media (not versioned)
               %td= text_field(:name => "css[media]", :value => @form_css.media) + errors(@form_css, :media)
             %tr{:class => "cached"}
-              %td Cached
+              %td Cached (not versioned)
               %td= check_box(:name => "css[cached]", :checked => @form_css.cached) + errors(@form_css, :cached)
             %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save")
+              %td{:colspan => "2"}= submit("Save as new version")

data/templates/js.html.haml

@@ -10,17 +10,20 @@
       - if params[:js_id].to_s == js.id.to_s
         %table.js
           %form{:action => url(:merbiful_admin, :action => "js", :js_id => js.id), :method => "post"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %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(", ")
             %tr
-              %td Name
+              %td Name (not versioned)
               %td= text_field(:name => "js[name]", :value => @form_js.name) + errors(@form_js, :name)
             %tr
               %td Body
-              %td~ text_area(@form_js.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
+              %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
             %tr{:class => "filter"}
               %td Filter
-              %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_js.latest.filter) + errors(@form_version, :filter)
+              %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
             %tr{:class => "cached"}
-              %td Cached
+              %td Cached (not versioned)
               %td= check_box(:name => "js[cached]", :checked => @form_js.cached) + errors(@form_js, :cached)
             %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save")
+              %td{:colspan => "2"}= submit("Save as new version")

data/templates/layouts.html.haml

@@ -10,14 +10,17 @@
       - if params[:layout_id].to_s == layout.id.to_s
         %table.layout
           %form{:action => url(:merbiful_admin, :action => "layouts", :layout_id => layout.id), :method => "post"}
+            %tr{:class => "version"}
+              %td Viewing version
+              %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(", ")
             %tr
-              %td Name
+              %td Name (not versioned)
               %td= text_field(:name => "layout[name]", :value => @form_layout.name) + errors(@form_layout, :name)
             %tr
               %td Body
-              %td~ text_area(@form_layout.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
+              %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
             %tr{:class => "filter"}
               %td Filter
-              %td= select(:name => "version[filter]", :collection => Merbiful::filters, :selected => @form_layout.latest.filter) + errors(@form_version, :filter)
+              %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
             %tr{:class => "submit"}
-              %td{:colspan => "2"}= submit("Save")
+              %td{:colspan => "2"}= submit("Save as new version")

data/templates/page_form.html.haml

@@ -1,41 +1,44 @@
 %table.page
   %form{:action => url(:merbiful_admin, :action => "pages", :page_id => @form_page.id), :method => "post"}
+    %tr{:class => "version"}
+      %td Viewing version
+      %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(", ")
     %tr{:class => "path"}
-      %td Path
+      %td Path (not versioned)
       %td= text_field(:name => "page[path]", :value => @form_page.path) + errors(@form_page, :path)
     %tr{:class => "title"}
       %td Title
-      %td= text_field(:name => "version[title]", :value => @form_page.title) + errors(@form_version, :title)
+      %td= text_field(:name => "version[title]", :value => @form_version.title) + errors(@form_version, :title)
     %tr{:class => "keywords"}
       %td Keywords
-      %td= text_field(:name => "version[keywords]", :value => @form_page.keywords) + errors(@form_version, :keywords)
+      %td= text_field(:name => "version[keywords]", :value => @form_version.keywords) + errors(@form_version, :keywords)
     %tr{:class => "body"}
       %td Body
-      %td~ text_area(@form_page.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
+      %td~ text_area(@form_version.body, :name => "version[body]", :cols => 80, :rows => text_area_rows) + errors(@form_version, :body)
     %tr{:class => "filter"}
       %td Filter
-      %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_page.latest.filter) + errors(@form_version, :filter)
+      %td= select(:name => "version[filter]", :collection => Merbiful::Filter.filters, :selected => @form_version.filter) + errors(@form_version, :filter)
     %tr{:class => "layout"}
       %td Layout
-      %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)
+      %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)
     %tr{:class => "cached"}
-      %td Cached
+      %td Cached (not versioned)
       %td= check_box(:name => "page[cached]", :checked => @form_page.cached) + errors(@form_page, :cached)
     - Merbiful::Css.all.each_with_index do |css, index|
       - if index == 0
         %tr{:class => "css"}
           %td{:rowspan => Merbiful::Css.count, :valign => "top"} Css
-          %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_page.csses.include?(css)) + css.name 
+          %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_version.csses.include?(css)) + css.name 
       - else 
         %tr{:class => "css"}
-          %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_page.csses.include?(css)) + css.name
+          %td= check_box(:name => "version[css][]", :value => css.id, :checked => @form_version.csses.include?(css)) + css.name
     - Merbiful::Js.all.each_with_index do |js, index|
       - if index == 0
         %tr{:class => "js"}
           %td{:rowspan => Merbiful::Js.count, :valign => "top"} Js
-          %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_page.jses.include?(js)) + js.name 
+          %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_version.jses.include?(js)) + js.name 
       - else 
         %tr{:class => "js"}
-          %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_page.jses.include?(js)) + js.name
+          %td= check_box(:name => "version[js][]", :value => js.id, :checked => @form_version.jses.include?(js)) + js.name
     %tr{:class => "submit"}
-      %td{:colspan => 2}= submit("Save")
+      %td{:colspan => 2}= submit("Save as new version")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: merbiful-release
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Martin Kihlgren