mcms_pages 0.0.2 → 0.0.3

data/app/assets/stylesheets/mcms_pages/page_styles.css

@@ -149,7 +149,7 @@
 }
 
 #default-page-main-body, #one-column-main-body {
-	width: 100%;
+	width: 99%;
 	text-align: left;
 }
 #two-column-main-body {

data/app/controllers/admin/pages_controller.rb

@@ -173,9 +173,12 @@ class Admin::PagesController < AdminController
     respond_to do |format|
 
       if @page.update_attributes(params[:page]) #page updated successfully
+
         format.html { redirect_to admin_pages_path, notice: 'Page was successfully updated.' }
         format.json { head :no_content }
+
       else #page saving failed, re-renders edit template
+
         format.html { render action: "edit", :template => 'mcms_pages/admin/pages/edit' }
         format.json { render json: @page.errors, status: :unprocessable_entity }
 
@@ -194,6 +197,7 @@ class Admin::PagesController < AdminController
     # find the page with with
     @page = Page.find(params[:id])
 
+    # calling class method of PagePart model to delete page parts of a page
     PagePart.delete_page_parts(@page)
 
     #destroy the page
@@ -215,10 +219,9 @@ class Admin::PagesController < AdminController
   # @purpose : To find a child page
   def find_child
 
+    # find page based on path or slug
     @page = Page.find_by_slug(params[:path])
 
-    logger.debug @page
-
     #sends in data in different format to index action
     respond_to do |format|
 

data/app/controllers/pages_controller.rb

@@ -13,6 +13,7 @@
 
 class PagesController < ApplicationController
 
+  # define layout to be used by controller
   layout "mcms_pages/layouts/mcms_layout"
 
   #finding page based on url
@@ -24,6 +25,7 @@ class PagesController < ApplicationController
   # @purpose : To show the home page
   def home
 
+    # send data in different format
     respond_to do |format|
 
       format.html{ render :template => 'mcms_pages/pages/home'}# home.html.erb
@@ -116,27 +118,35 @@ class PagesController < ApplicationController
   # @purpose : To find a page if it exists or show the page not found error
   def get_page(page_not_found = true)
 
-    @menu_pages = Page.where("published = ? and show_in_menu = ?", true, true)
+    if params[:path] == "mcms" or params[:id] == "mcms"
+
+      redirect_to mcms_users_login_path
+
+    else
+
+      @menu_pages = Page.where("published = ? and show_in_menu = ?", true, true)
+
+      # case statement based on current action and assign the result to instance variable
+      case action_name
 
-    # case statement based on current action and assign the result to instance variable
-    case action_name
+        # when action is home
+        when "home"
 
-      # when action is home
-      when "home"
+          # find page bbased on link url
+          @page = Page.where(:link_url => '/').first
 
-        # find page bbased on link url
-        @page = Page.where(:link_url => '/').first
+        # when action is show or preview
+        when "show", "preview"
 
-      # when action is show or preview
-      when "show", "preview"
+          # find page using path or id of page
+          @page = Page.find_by_slug_or_id(params[:path], params[:id])
 
-        # find page using path or id of page
-        @page = Page.find_by_slug_or_id(params[:path], params[:id])
+      end # end case statement
 
-    end # end case statement
+      # return page or page not found error
+      @page || ( page_404_error if page_not_found)
 
-    # return page or page not found error
-    @page || ( page_404_error if page_not_found)
+    end
 
   end # end method
 

data/app/helpers/pages_helper.rb

@@ -87,7 +87,7 @@ module PagesHelper
     # create a PagePart object and assign it to a variable
     page = PagePartsPage.new
 
-    #make the page part form
+    #make the page part pages form
     builder = ActionView::Helpers::FormBuilder.new( "page[page_parts_pages_attributes][#{index}]", page, self, {}, proc {})
 
     #return form object

data/app/models/page.rb

@@ -39,13 +39,6 @@ class Page < ActiveRecord::Base
   # Nested pages, i.e. page underneath another page
   acts_as_nested_set :dependent => :destroy
 
-  #Associating table "mcms_pages" with table "mcms_page_parts" using has_many relation
-#  has_many :page_parts,
-#           :foreign_key => :page_id,
-#           :class_name => 'PagePart',
-#           :inverse_of => :page,
-#           :dependent => :destroy
-
   #defining has_many :through relationship
   has_many :page_parts_pages, :class_name => 'PagePartsPage'
 

data/app/views/mcms_pages/admin/layouts/index.html.erb

@@ -29,7 +29,8 @@
       </div>
       <div class="layout-image">
 
-        <%= image_tag("layouts/#{layout.name.tr(' ', '-')}.png", :size => "400x400", :alt => "#{layout.name}", :title => "click to view large") %>
+        <%= image_tag("layouts/#{layout.name.tr(' ', '-')}.png", :size => "400x400",
+                       :alt => "#{layout.name}", :title => "click to view large") %>
 
       </div>
       <div class="layout-link">
@@ -53,5 +54,6 @@
 
 </div>
 
+<!-- render partial _head.html.erb to include JS and CSS for specific page-->
 <%= render :partial => "mcms_pages/layouts/head" %>
 

data/app/views/mcms_pages/admin/pages/_action.html.erb

@@ -23,12 +23,17 @@
   <ul class="repo-list">
 
     <li class="public source">
+
       <a href="/" target="_blank">
+
         <span class="mini-icon"></span>
         <span class="owner">Switch to Website</span><span class="repo"></span>
         <span class="arrow"></span>
+        
       </a>
+
     </li>
+
   </ul>
 
   <div class="bottom-bar">

data/app/views/mcms_pages/admin/pages/_form.html.erb

@@ -14,7 +14,7 @@
 <!-- displaying form for creating pages -->
 <%= form_for [:admin, @page] do |f| %>
 
-  <!-- render partial for error messages -->
+  <!-- render partial for error messages with some locals -->
   <%= render :partial => "mcms_pages/admin/pages/error_messages",
              :locals => {
                :object => f.object,

data/app/views/mcms_pages/admin/pages/_page.html.erb

@@ -45,7 +45,7 @@
       <%= link_to image_tag("mcms_pages/icons/page_add.png", :title => "add a child page", :alt => "add a child"),
                              new_admin_page_path(:parent_id => page.id) %>
       <%= link_to image_tag("mcms_pages/icons/application_go.png", :title => "preview this page", :alt => "preview this page"),
-                             page_path(page), :target => "_blank" %>
+                             preview_page_path(page.nested_url), :target => "_blank" %>
 
     </span>
 

data/app/views/mcms_pages/admin/pages/_page_part_edit_form.html.erb

@@ -10,6 +10,7 @@
 
 -->
 
+<!-- calling helper method to arrange page part of a page -->
 <% page = arrange_page_part(@page) %>
 
 <div id='page-tabs' class="page-tabs clearfix ui-tabs ui-widget ui-widget-content ui-corner-all" >
@@ -91,14 +92,18 @@
                     :title => title[loop_index]
         %>
 
-        <%= p.hidden_field :id , :value => "#{page[title[loop_index]].page_parts_pages.where(:page_id => @page.id).first.id}" unless loop_index.nil? %>
+        <%= p.hidden_field :id , 
+                     :value => "#{page[title[loop_index]].page_parts_pages.where(:page_id => @page.id).first.id}" unless loop_index.nil?
+        %>
 
         <!-- increment loop_index by 1 -->
         <% loop_index += 1 %>
 
       <% else %>
 
-        <%= p.hidden_field :id , :value => "#{page[title[loop_index]].page_parts_pages.where(:page_id => @page.id).first.id}" unless loop_index.nil? %>
+        <%= p.hidden_field :id , 
+                     :value => "#{page[title[loop_index]].page_parts_pages.where(:page_id => @page.id).first.id}" unless loop_index.nil?
+        %>
 
         <!-- increment loop_index by 1 -->
         <% loop_index += 1 %>

data/app/views/mcms_pages/admin/pages/_page_part_form_field.html.erb

@@ -38,14 +38,14 @@
 
     <% unless title == "main body" %>
 
-        OR
+      OR
 
-        <%= link_to "Choose Existing #{title}",
-                  {:controller=>"pages", :action => 'add_page_part', :title => "#{title}", :index => "#{part_index}"},
-                  :remote => true, :id => "create-page-part-page-link-#{part_index}", :class => "create-page-part-page-link"
-        %>
+      <%= link_to "Choose Existing #{title}",
+                {:controller=>"pages", :action => 'add_page_part', :title => "#{title}", :index => "#{part_index}"},
+                :remote => true, :id => "create-page-part-page-link-#{part_index}", :class => "create-page-part-page-link"
+      %>
 
-      <% end %>
+    <% end %>
 
 </div>
 

data/app/views/mcms_pages/admin/pages/add_page_part.js.erb

@@ -19,7 +19,10 @@ $(document).ready(function(){
         builder = build_page_part(@index)
     %>
 
+    // remove html element with given id
     $("#page_page_parts_pages_attributes_<%= @index %>__destroy").remove();
+
+    // insert a hidden field for destroying the page part page with default value 1.
     $("#page-part-fields-<%= @index %>").after('<%= hidden_field_tag "page[page_parts_pages_attributes][#{@index}][_destroy]", "1" %>');
 
     var html = "<%= escape_javascript(render 'mcms_pages/admin/pages/page_part_form_field',
@@ -37,11 +40,13 @@ $(document).ready(function(){
     var html = "<%= escape_javascript(render 'mcms_pages/admin/pages/page_part_page_form_field',
                                       :part_index => @index, :f => builder, :title => @title, :fragment => fragment)  %>";
 
+    // reset the value in hidden field for destroying page part pages to 0.
     $("#page_page_parts_pages_attributes_<%= @index %>__destroy").val("0");
 
   <% end %>
 
+  // change the html content of div page-part-fields
   $("#page-part-fields-<%= @index %>").html(html);
 
-});
+}); // end ready function
 

data/app/views/mcms_pages/admin/pages/edit.html.erb

@@ -13,5 +13,6 @@
 <!-- render partial form.html.erb -->
 <%= render 'mcms_pages/admin/pages/form' %>
 
+<!-- render partial _head.html.erb to include JS and CSS for specific page-->
 <%= render :partial => "mcms_pages/layouts/head" %>
 

data/app/views/mcms_pages/admin/pages/index.html.erb

@@ -24,5 +24,6 @@
 <!-- render partial _action.html.erb -->
 <%= render 'mcms_pages/admin/pages/action' %>
 
+<!-- render partial _head.html.erb to include JS and CSS for specific page-->
 <%= render :partial => "mcms_pages/layouts/head" %>
 

data/app/views/mcms_pages/admin/pages/new.html.erb

@@ -13,5 +13,6 @@
 <!-- render partial form.html.erb -->
 <%= render 'mcms_pages/admin/pages/form'  %>
 
+<!-- render partial _head.html.erb to include JS and CSS for specific page-->
 <%= render :partial => "mcms_pages/layouts/head" %>
 

data/app/views/mcms_pages/pages/_menu.html.erb

@@ -14,7 +14,9 @@
   <ul class="pages-menu-ul">
 
     <!-- include menubar page for the application-->
-    <%= render :partial => 'mcms_pages/pages/menubar', :collection => @menu_pages.select{|p| p.parent_id.nil? and p.link_url != '/404'} %>
+    <%= 
+      render :partial => 'mcms_pages/pages/menubar', :collection => @menu_pages.select{|p| p.parent_id.nil? and p.link_url != '/404'}
+    %>
 
   </ul>
 

data/app/views/mcms_pages/pages/_menubar.html.erb

@@ -13,21 +13,25 @@
 
   <% if controller.action_name == "preview" %>
 
-    <%= link_to menubar.title, preview_page_path(menubar.slug) %>
+    <%= link_to menubar.title, preview_page_path(menubar.nested_url) %>
 
   <% else %>
 
-    <%= link_to menubar.title, menubar.slug %>
+    <%= link_to menubar.title, show_page_path(menubar.nested_url) %>
 
   <% end %>
 
   <% if menubar.children.present? and menubar.link_url != "/" %>
-  <ul class="pages-nested-menu-ul">
-    <!-- render partial _menubar.html.erb if pages have children -->
+
+    <ul class="pages-nested-menu-ul">
+
+      <!-- render partial _menubar.html.erb if pages have children -->
       <%=
         render(:partial => 'mcms_pages/pages/menubar', :collection => menubar.children.select{|p| p.show_in_menu? and p.published?})
       %>
-  </ul>
+
+    </ul>
+
   <% end %>
 
 </li>

data/app/views/mcms_pages/pages/home.html.erb

@@ -8,7 +8,7 @@
   @Purpose                   : To show the home page to the user.
 
 -->
-
+<!-- calling helper method to arrange page part of a page -->
 <% page = arrange_page_part(@page) %>
 
 <!-- render notice/alert -->

data/app/views/mcms_pages/pages/show.html.erb

@@ -9,6 +9,7 @@
 
 -->
 
+<!-- calling helper method to arrange page part of a page -->
 <% page = arrange_page_part(@page) %>
 
 <% if @page.layout.name == "default" %>

data/config/routes.rb

@@ -14,7 +14,7 @@ Rails.application.routes.draw do
 
   mount Ckeditor::Engine => '/ckeditor'
 
-  resources :pages
+  #resources :pages
 
   # defining root path for the application
   #root :to => "pages#home"
@@ -25,8 +25,6 @@ Rails.application.routes.draw do
   # match pages/**/preview to action preview of pages controller
   match 'pages/*path/preview' => 'pages#preview', :as => :preview_page,  :via => [:get, :put]
 
-  match '/:path', :to=> 'pages#show'
-
   # define route for namespace admin for different resources to have
   # path prefixed with "mcms"
   namespace :admin, :path => "mcms" do
@@ -53,5 +51,9 @@ Rails.application.routes.draw do
 
   end # end namespace
 
+  match '/:path' => "pages#show"
+
+  match '*path', :to=> 'pages#show', :as => :show_page unless Gem.available?("mcms")
+
 end
 

data/lib/generators/mcms_pages/assets_generator.rb

@@ -30,7 +30,7 @@ module McmsPages
       # @Purpose    : To copy stylesheets
       def copy_assets
 
-        view_directory :mcms_pages
+        asset_directory :mcms_pages
 
       end # end method
 
@@ -39,7 +39,7 @@ module McmsPages
       # @Params     : None
       # @Returns    : None
       # @Purpose    : To define the source path to copy views
-      def view_directory(name, _target_path = nil)
+      def asset_directory(name, _target_path = nil)
 
         directory name.to_s, _target_path || "#{target_path}/#{name}"
 

data/lib/generators/mcms_pages/views_generator.rb

@@ -6,7 +6,8 @@
 	@Date Created                         : 2012-07-09
   @Date Modified                        :
   @Last Modification Details            :
-  @Purpose                              : This file is responsible to install assets and views for mcms_pages module in other application/module
+  @Purpose                              : This file is responsible to install assets and views for mcms_pages
+                                          module in other application/module
 
 =end
 
@@ -30,7 +31,7 @@ module McmsPages
       # @Purpose    : To copy views
       def copy_views
 
-        view_directory :mcms_pages
+        view_directory "mcms_pages/pages"
 
       end # end method
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mcms_pages
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -27,22 +27,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: jquery-rails
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: ckeditor
   requirement: !ruby/object:Gem::Requirement
@@ -292,7 +276,6 @@ files:
 - db/migrate/20120614125619_create_layouts.rb
 - db/migrate/20120606150656_add_title_position_to_page_parts.rb
 - db/seeds.rb
-- lib/tasks/mcms_pages_tasks.rake
 - lib/mcms_pages.rb
 - lib/mcms_pages/engine.rb
 - lib/mcms_pages/version.rb

data/lib/tasks/mcms_pages_tasks.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :mcms_pages do
-#   # Task goes here
-# end