deluxe_publisher 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/app/controllers/deluxe_publisher/page_types_controller.rb

@@ -9,7 +9,7 @@ class DeluxePublisher::PageTypesController < ApplicationController
   # GET /deluxe_publisher/page_types
   # GET /deluxe_publisher/page_types.xml
   def index
-    @deluxe_publisher_page_types = DeluxePublisher::PageType.all
+    @deluxe_publisher_page_types = DeluxePublisher::PageType.all(:order =>"position")
 
     respond_to do |format|
       format.html # index.html.erb

data/app/controllers/deluxe_publisher/presenter_controller.rb

@@ -40,11 +40,17 @@ class DeluxePublisher::PresenterController < ApplicationController
             @tags = DeluxePublisher::Page.tag_counts_on(:tags)
           end
 
+          if @page.alias?
+            layout_page = DeluxePublisher::Page.find(@page.alias_page_id)
+          else
+            layout_page = @page
+          end
+
 
-          if @page.page_type.layout.blank?
-            render :template => "/deluxe_publisher/templates/#{@page.page_type.template}", :layout => false
+          if layout_page.page_type.layout.blank?
+            render :template => "/deluxe_publisher/templates/#{layout_page.page_type.template}", :layout => false
           else
-            render :template => "/deluxe_publisher/templates/#{@page.page_type.template}", :layout => @page.page_type.layout
+            render :template => "/deluxe_publisher/templates/#{layout_page.page_type.template}", :layout => layout_page.page_type.layout
           end
         else
           page_not_found

data/app/helpers/deluxe_publisher/presenter_helper.rb

@@ -3,6 +3,14 @@ module DeluxePublisher::PresenterHelper
 
   include ActsAsTaggableOn::TagsHelper
 
+  def contents
+    if @page.alias?
+      DeluxePublisher::Page.find(@page.alias_page_id).contents
+    else
+      @page.contents
+    end
+  end
+
 
   def blog_archive_list(blog)
 
@@ -98,7 +106,17 @@ module DeluxePublisher::PresenterHelper
     state = @nav_ancestor_ids.include?(page.id) ? "on":"off"
     current = @nav_current_id == page.id ? "current_page":""
     @tree.li({:id => "#{@nav_id_prefix}_#{page.dom_id}", :class => "level_#{level} #{state} #{current}"}) do
-      @tree << link_to(page.menu_title, page.path)
+      if page.external_link?
+        href = page.external_url
+      else
+        href = page.path
+      end
+
+      if page.target_window.blank?
+        @tree << link_to(page.menu_title, href)
+      else
+        @tree << link_to(page.menu_title, href, :target =>page.target_window)
+      end
       unless page.leaf? || level >= @nav_depth
         @tree.ul(:class => "nav_directory") do
           pages.select{|i| i.parent_id == page.id}.sort_by{|p| [p.position, p.publish_at]}.each do |child_page|

data/app/models/deluxe_publisher/page.rb

@@ -20,10 +20,10 @@ class DeluxePublisher::Page < ActiveRecord::Base
   accepts_nested_attributes_for :contents
 
   validates_presence_of [:site_id, :parent_id, :footer_position, :page_type_id, :position,
-                        :browser_title, :page_title, :menu_title, :file_name], :unless => Proc.new {|page| page.menu_title == "ROOT"}
+                         :browser_title, :page_title, :menu_title, :file_name], :unless => Proc.new {|page| page.menu_title == "ROOT"}
 
 #  validates_format_of :file_name, :with => /\A[\w\-_\.]+\Z/
-  
+
   acts_as_nested_set
 
   def init_stash
@@ -50,7 +50,7 @@ class DeluxePublisher::Page < ActiveRecord::Base
     self.path[1..-1]
   end
   def save_the_children # to update their paths
-    # I believe the children are the future
+                        # I believe the children are the future
     self.children.each do |child|
       child.save #they will save their children in turn
     end
@@ -82,9 +82,21 @@ class DeluxePublisher::Page < ActiveRecord::Base
   end
 
   def alias?
-    false #TODO
+    if self.page_type.nil?
+      false #when parent is Root
+    else
+      self.page_type.function_as == "alias"
+    end
   end
-  
+
+  def external_link?
+    if self.page_type.nil?
+      false #when parent is Root
+    else
+      self.page_type.function_as == "external_link"
+    end
+  end
+
   def blog_stories(options = {})
 
     options = {:limit => 10}.merge(options)
@@ -105,10 +117,10 @@ class DeluxePublisher::Page < ActiveRecord::Base
         end_date = start_date + 1.year
       end
 
-      
+
       self.children.published.find(:all,
-                         :conditions => ["publish_at >= ? and publish_at < ?", start_date, end_date],
-                         :order => "publish_at desc")
+                                   :conditions => ["publish_at >= ? and publish_at < ?", start_date, end_date],
+                                   :order => "publish_at desc")
     end
   end
 
@@ -128,7 +140,7 @@ class DeluxePublisher::Page < ActiveRecord::Base
 
   def descriptor_for_position(position)
     unless self.page_type.nil?
-    descriptor = self.page_type.content_descriptors.first(:conditions => {:position => position})
+      descriptor = self.page_type.content_descriptors.first(:conditions => {:position => position})
     else
       descriptor = DeluxePublisher::ContentDescriptor.new({:title => "Content", :content_type => "text"})
     end
@@ -197,7 +209,7 @@ class DeluxePublisher::Page < ActiveRecord::Base
       end
     end
 
-    page 
+    page
   end
 
 

data/app/views/deluxe_publisher/page_types/_form.html.erb

@@ -33,6 +33,8 @@
         <%= f.radio_button :function_as, "web_page" %> <%= f.label :function_as_web_page, "Web Page"%>
         <%= f.radio_button :function_as, "blog_page" %> <%= f.label :function_as_blog_page, "Blog Page"%>
         <%= f.radio_button :function_as, "blog_story" %> <%= f.label :function_as_blog_story, "Blog Story"%>
+        <%= f.radio_button :function_as, "alias" %> <%= f.label :function_as_alias, "Alias"%>
+        <%= f.radio_button :function_as, "external_link" %> <%= f.label :function_as_external_link, "External Link"%>
       </div>
       <div class="field">
         <%= f.label :number_of_content_areas %><br />

data/app/views/deluxe_publisher/pages/_general.html.erb

@@ -47,12 +47,17 @@
       <%= f.label :page_type_id %>
       <%= f.select :page_type_id, (@page.child_of_a_blog? ? story_type_options : page_type_options) %>
     </div>
-    <% if @page.alias? %>
-        <div class="field">
-          <%= f.label :alias_page_id %>
-          <%= f.select :alias_page_id, sorted_nested_set_options(@root_page, sort_method) {|i, level| "#{'-' * level} #{limit_length(i.menu_title, 25, false)}" } %>
-        </div>
-    <% end %>
+
+    <div id= "alias_field" class="field" <%= "style='display:none;'" unless @page.alias? %> >
+      <%= f.label :alias_page_id %>
+      <%= f.select :alias_page_id, sorted_nested_set_options(@root_page, sort_method) {|i, level| "#{'-' * level} #{limit_length(i.menu_title, 25, false)}" } %>
+    </div>
+
+    <div id= "external_url_field" class="field" <%= "style='display:none;'" unless @page.external_link? %> >
+      <%= f.label :external_url %>
+      <%= f.text_field :external_url %>
+    </div>
+
     <% if @page.child_of_a_blog? %>
         <div class="field">
           <%= f.label :tag_list, "Tags: (separated by commas)" %>
@@ -79,6 +84,10 @@
       <%= f.label :publish_at %>
       <%= f.datetime_select :publish_at, :use_short_month => true, :order => [:month, :day, :year] %>
     </div>
+    <div class="field">
+      <%= f.label :target_window %>
+      <%= f.text_field :target_window %>
+    </div>
   </div>
   <div class="field">
     <div class="check_box_field">
@@ -95,14 +104,14 @@
 
 <!-- for future use -->
 <!--<fieldset><legend>Super Admin Tools</legend>-->
-  <!--<div class="field">-->
-    <!--<%= f.check_box :is_navigation_locked %>-->
-    <!--<%= f.label :is_navigation_locked, "Lock Navigation" %>-->
-  <!--</div>-->
+<!--<div class="field">-->
+<!--<%= f.check_box :is_navigation_locked %>-->
+<!--<%= f.label :is_navigation_locked, "Lock Navigation" %>-->
+<!--</div>-->
 
-  <!--<div class="field">-->
-    <!--<%= f.check_box :is_content_locked %>-->
-    <!--<%= f.label :is_content_locked, "Lock Content" %>-->
-  <!--</div>-->
+<!--<div class="field">-->
+<!--<%= f.check_box :is_content_locked %>-->
+<!--<%= f.label :is_content_locked, "Lock Content" %>-->
+<!--</div>-->
 
 </fieldset>

data/app/views/deluxe_publisher/pages/page_type_change.js.erb

@@ -1,3 +1,15 @@
 <%= fields_for @page do |f|%>
     $("#page_content").html("<%= escape_javascript( render(:partial => "page_content", :locals => {:f => f})) %>");
 <% end %>
+
+<% if @page.alias? %>
+    $("#alias_field").show();
+<% else %>
+    $("#alias_field").hide();
+<% end %>
+
+<% if @page.external_link? %>
+    $("#external_url_field").show();
+<% else %>
+    $("#external_url_field").hide();
+<% end %>

data/deluxe_publisher.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{deluxe_publisher}
-  s.version = "0.0.5"
+  s.version = "0.0.6"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Paul Raupach"]

data/lib/generators/deluxe_publisher/base/templates/templates/simple_page.html.erb

@@ -1,4 +1,4 @@
 
 <article class="page_content">
-  <%= raw @page.contents[0].html %>
+  <%= raw contents[0].html %>
 </article>

data/lib/generators/deluxe_publisher/migration/templates/migration.rb

@@ -58,6 +58,8 @@ class CreateDeluxePublisherTables < ActiveRecord::Migration
       t.string   "path"
       t.boolean  "is_shown_in_main_navigation",      :default => false
       t.boolean  "is_shown_in_secondary_navigation", :default => false
+      t.string   "target_window"
+      t.string   "external_url"
       t.boolean  "is_published",                     :default => false
       t.boolean  "is_landing_page",                  :default => false
       t.datetime "publish_at"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deluxe_publisher
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: false
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Paul Raupach