knitkit 2.0.0 → 2.0.1

data/app/models/website_inquiry.rb

@@ -5,7 +5,12 @@ class WebsiteInquiry < ActiveRecord::Base
   has_dynamic_forms
 	has_dynamic_data
 
-  def send_email
-    WebsiteInquiryMailer.inquiry(self).deliver
+  def send_email(subject='')
+    begin
+      WebsiteInquiryMailer.inquiry(self, subject).deliver
+    rescue Exception => e
+      system_user = Party.find_by_description('Compass AE')
+      AuditLog.custom_application_log_message(system_user, e)
+    end
   end
 end

data/app/models/website_inquiry_mailer.rb

@@ -1,10 +1,11 @@
 class WebsiteInquiryMailer < ActionMailer::Base
 
-  def inquiry(website_inquiry)
+  def inquiry(website_inquiry, subject='')
+    subject = "#{website_inquiry.website.title} Inquiry" if subject.blank?
     @website_inquiry = website_inquiry
-    mail( :to => website_inquiry.website.email,
+    mail( :to => website_inquiry.website.configurations.first.get_item(ConfigurationItemType.find_by_internal_identifier('contact_us_email_address')).options.first.value,
           :from => website_inquiry.data.dyn_email,
-          :subject => "#{website_inquiry.website.title} Inquiry",
+          :subject => subject,
           :content_type => 'text/plain'
          )
   end

data/app/models/website_party_role.rb

@@ -0,0 +1,5 @@
+class WebsitePartyRole < ActiveRecord::Base
+  belongs_to :party
+  belongs_to :website
+  belongs_to :role_type
+end

data/app/models/website_section.rb

@@ -1,5 +1,6 @@
 class WebsiteSection < ActiveRecord::Base
-  before_destroy :destroy_content # only destroy content that does not belong to another section, NOTE: this callback must be declared before the associations or it will not work
+  after_create :update_paths
+  before_save  :update_path, :check_internal_indentifier
 
   has_permalink :title, :url_attribute => :permalink, :sync_url => true, :only_when_blank => true, :scope => [:website_id, :parent_id]
   acts_as_nested_set
@@ -7,7 +8,7 @@ class WebsiteSection < ActiveRecord::Base
   acts_as_versioned :table_name => :website_section_versions, :non_versioned_columns => %w{parent_id lft rgt}
   can_be_published
   has_roles
-  
+
   belongs_to :website
   has_many :website_section_contents, :dependent => :destroy
   has_many :contents, :through => :website_section_contents
@@ -15,35 +16,40 @@ class WebsiteSection < ActiveRecord::Base
   validates :title, :presence => {:message => 'Title cannot be blank'}
   validates_uniqueness_of :permalink, :scope => [:website_id, :parent_id]
   validates_uniqueness_of :internal_identifier, :scope => :website_id
-  
-  after_create :update_paths
-  before_save  :update_path, :check_internal_indentifier
-  
+
   KNIT_KIT_ROOT = Knitkit::Engine.root.to_s
   WEBSITE_SECTIONS_TEMP_LAYOUT_PATH = "#{Knitkit::Engine.root.to_s}/app/views/knitkit/website_sections"
-  
+
   @@types = ['Page']
   cattr_reader :types
 
-  def articles 
-    Article.find_by_section_id(self.id)
-  end
-  
-  def website
-    website_id.nil? ? self.parent.website : Website.find(website_id)
-  end
-  
   class << self
     def register_type(type)
       @@types << type
       @@types.uniq!
     end
   end
-  
+
+  def iid
+    internal_identifier
+  end
+
+  def articles
+    Article.find_by_section_id(self.id)
+  end
+
+  def website
+    website_id.nil? ? self.parent.website : Website.find(website_id)
+  end
+
+  def render_base_layout?
+    render_base_layout
+  end
+
   def positioned_children
     children.sort_by{|child| [child.position]}
   end
-  
+
   def paths
     all_paths = [self.path]
     all_paths | self.descendants.collect(&:path)
@@ -52,10 +58,18 @@ class WebsiteSection < ActiveRecord::Base
   def child_by_path(path)
     self.descendants.detect{|child| child.path == path}
   end
-  
+
   def type
     read_attribute(:type) || 'Page'
   end
+  
+  def is_section?
+    ['Page', 'Blog'].include? type
+  end
+  
+  def is_document_section?
+    type == 'OnlineDocumentSection'
+  end
 
   def create_layout
     self.layout = IO.read(File.join(WEBSITE_SECTIONS_TEMP_LAYOUT_PATH,"index.html.erb"))
@@ -77,32 +91,21 @@ class WebsiteSection < ActiveRecord::Base
   def get_tags
     get_topics
   end
-  
+
   def get_topics
     # leaving this here for reference until we're sure the built in method tag_counts_on does what we need
-    # sql = "SELECT tags.*, taggings.tags_count AS count FROM \"tags\" 
-    #               JOIN (SELECT taggings.tag_id, COUNT(taggings.tag_id) AS tags_count FROM \"taggings\" 
-    #                     INNER JOIN contents ON contents.id = taggings.taggable_id AND contents.type = 'Article' 
-    #                     INNER JOIN website_section_contents ON contents.id=website_section_contents.content_id 
-    #                     WHERE (taggings.taggable_type = 'Content' AND taggings.context = 'tags') 
+    # sql = "SELECT tags.*, taggings.tags_count AS count FROM \"tags\"
+    #               JOIN (SELECT taggings.tag_id, COUNT(taggings.tag_id) AS tags_count FROM \"taggings\"
+    #                     INNER JOIN contents ON contents.id = taggings.taggable_id AND contents.type = 'Article'
+    #                     INNER JOIN website_section_contents ON contents.id=website_section_contents.content_id
+    #                     WHERE (taggings.taggable_type = 'Content' AND taggings.context = 'tags')
     #                     AND website_section_contents.website_section_id=#{self.id}
-    #                     GROUP BY taggings.tag_id HAVING COUNT(*) > 0 AND COUNT(taggings.tag_id) > 0) 
+    #                     GROUP BY taggings.tag_id HAVING COUNT(*) > 0 AND COUNT(taggings.tag_id) > 0)
     #                     AS taggings ON taggings.tag_id = tags.id
     #               ORDER BY tags.name ASC"
     # ActsAsTaggableOn::Tag.find_by_sql(sql)
 
-    self.contents.tag_counts_on(:tags).sort_by{|t| t.name } 
-  end
-  
-  # Before destroying a section look at content belonging to this section
-  # and destroy content that does NOT belong to any OTHER section
-  def destroy_content
-    self.contents.each do |c|
-      unless c.website_sections.count > 1
-        puts "destroying"
-        c.destroy 
-      end
-    end    
+    self.contents.tag_counts_on(:tags).sort_by{|t| t.name }
   end
 
   def update_path!
@@ -110,6 +113,39 @@ class WebsiteSection < ActiveRecord::Base
     self.path = new_path unless self.path == new_path
     self.save
   end
+  
+  def build_section_hash
+    section_hash = {
+      :name => self.title,
+      :has_layout => !self.layout.blank?,
+      :type => self.class.to_s,
+      :in_menu => self.in_menu,
+      :articles => [],
+      :roles => self.roles.collect{|role| role.internal_identifier},
+      :path => self.path,
+      :permalink => self.permalink,
+      :internal_identifier => self.internal_identifier,
+      :render_base_layout => self.render_base_layout,
+      :position => self.position,
+      :sections => self.children.each.map{|child| child.build_section_hash}
+    }
+
+    self.contents.each do |content|
+      content_area = content.content_area_by_website_section(self)
+      position = content.position_by_website_section(self)
+      section_hash[:articles] << {
+        :name => content.title,
+        :tag_list => content.tag_list.join(', '),
+        :content_area => content_area,
+        :position => position,
+        :display_title => content.display_title,
+        :internal_identifier => content.internal_identifier
+      }
+    end
+
+    section_hash
+  end
+  
 
   protected
 
@@ -134,6 +170,8 @@ class WebsiteSection < ActiveRecord::Base
   def check_internal_indentifier
     self.internal_identifier = self.permalink if self.internal_identifier.blank?
   end
+  
+  
 
   private
 
@@ -146,7 +184,7 @@ class WebsiteSection < ActiveRecord::Base
     end
     content_version
   end
-    
+
 end
 
 

data/app/views/document_mailer/email_document.html.erb

@@ -0,0 +1,12 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta content="text/html; charset=UTF-8" http-equiv="Content-Type" />
+  </head>
+  <body>
+    <h1>Document Requested</h1>
+    <p>
+      Attached is your requested document
+    </p>
+  </body>
+</html>

data/app/views/knitkit/blogs/_add_comment.html.erb

@@ -22,7 +22,7 @@
 </div>
 
 <script type="text/javascript">
-$('#add_comment_form').bind('ajaxComplete', function(e, xhr, settings){
-  $('#notice').html(xhr.responseText);
+jQuery('#add_comment_form').bind('ajaxComplete', function(e, xhr, settings){
+  jQuery('#notice').html(xhr.responseText);
 });
 </script>

data/app/views/knitkit/online_document_sections/index.html.erb

@@ -0,0 +1,149 @@
+<div id="document_content">
+</div>
+
+<script type="text/javascript" charset="utf-8">
+
+	Ext.onReady(function() {
+		var index = 0;
+		var currentItem;
+		
+		var tree = Ext.create('Ext.tree.Panel', {
+			region: 'west',
+			cls: 'tree_styles',
+    	store: new Ext.data.TreeStore({
+				proxy:{
+	     		type: 'ajax',
+			 		url: 'online_document_sections/build_tree',
+					extraParams:{ section_id: <%= params[:section_id] %> },
+					format: 'json'
+	     	},
+				root: {
+	      	text: '<%= @root.title %>',
+	        id: '0',
+	        expanded: true
+	      },
+				fields:[ { name:'id' }, { name:'title' }, { name:'documented_item_published_content_html' }, { name:'leaf' }]
+			}),
+			collapsible: true,
+			tbar: {
+				items: [
+					new Ext.form.TextField({
+									id:"search",
+									disabled: true,
+									cls: 'document_search',
+									emptyText: 'Search',
+									allowBlank:true,
+								})
+				]
+			},
+			header: false,
+			autoScroll: true,
+			bodyBorder: false,
+    	rootVisible: false,
+    	width: 170,
+			displayField: 'title',
+			valueField: 'id',
+    	title: '<%= @root.title %>',
+			listeners:{
+      	'itemclick':function(view, record, htmlItem, index, e){
+					var tab_panel = Ext.getCmp('tabs_root')
+					var tab = Ext.getCmp("tab_" + record.data['id'])
+					if (tab){
+						tab_panel.setActiveTab(tab.id);
+					}
+					else{
+						addTab(record);
+					}
+				}
+			}
+    });
+		
+		var tabs = Ext.createWidget('tabpanel', {
+				id: 'tabs_root',
+				region: 'center',
+				plain: true,
+				bodyBorder: true,
+        resizeTabs: true,
+        enableTabScroll: true,
+        width: 640,
+				collapsible: false,
+        defaults: {
+            autoScroll: true,
+						bodyPadding: 10,
+        },
+        items: [{
+						id: "tab_" + <%= @root.id.to_s %>,
+            title: '<%= @root.title %>',
+            html: "<%= raw @root_content.gsub(/\n/, '<br/>') %>",
+            closable: false,
+						autoScroll: true
+        }],
+        plugins: Ext.create('Ext.ux.TabCloseMenu', {
+            extraItemsTail: [
+                '-',
+                {
+                    text: 'Closable',
+                    checked: true,
+                    hideOnClick: true,
+                    handler: function (item) {
+                        currentItem.tab.setClosable(item.checked);
+                    }
+                }
+            ],
+            listeners: {
+                aftermenu: function () {
+                    currentItem = null;
+                },
+                beforemenu: function (menu, item) {
+                    var menuitem = menu.child('*[text="Closable"]');
+                    currentItem = item;
+                    menuitem.setChecked(item.closable);
+                }
+            }
+        })
+    });
+		
+		function addTab(record){
+			++index;
+      tabs.add({
+					id: "tab_" + record.data['id'],
+          title: record.data['title'],
+          html: record.data['documented_item_published_content_html'],
+          closable: true
+      }).show();
+		}
+		
+		var fitted_panel = Ext.createWidget('panel', {
+			id: 'fitted_panel',
+			layout: 'border',
+			header: false,
+			defaults: {
+			    collapsible: true,
+			    split: true,
+			},
+			renderTo: 'document_content',
+			autoScroll: true,
+			items: [
+				tree,
+				tabs
+			]
+		});
+		
+		resize_windows();
+			
+	});
+	
+	function resize_windows(){
+		window_height = Ext.getBody().getViewSize().height;
+		header_height = Ext.get("header").getHeight();
+		footer_height = Ext.get("footer").getHeight();
+		document_content_height = window_height - header_height - footer_height;
+		Ext.get("document_content").setHeight(document_content_height);
+		Ext.getCmp("fitted_panel").setHeight(document_content_height - 20);
+	}
+	
+	window.onresize = function(){
+		resize_windows();
+	}
+	
+</script>

data/app/views/knitkit/website_sections/index.html.erb

@@ -1,6 +1,5 @@
 <h2><%=h @website_section.title %></h2>
 
 <% @contents.each do |content| %>
-  <h3><%=h content.title %></h3>
   <%=raw content.body_html %>
 <% end %>

data/app/views/layouts/knitkit/base.html.erb

@@ -13,15 +13,17 @@
     <title><%= @website.title %></title>
     <%= javascript_include_tag :application %>
     <%= include_extjs %>
+    <%= static_javascript_include_tag('erp_app/utility.js') %>
+    <%= add_authenticity_token_to_extjs %>
     <%= static_javascript_include_tag('erp_app/jquery_support.js') %>
     <%= static_javascript_include_tag('datepicker.js') %>
     <%= static_stylesheet_link_tag('datepicker.css') %>
-    <%= static_javascript_include_tag('erp_app/utility.js') %>
     <%= static_stylesheet_link_tag('extjs/resources/css/knitkit_extjs_4.css') %>
     <%= static_stylesheet_link_tag('knitkit/style.css') %>
     <%= static_javascript_include_tag('erp_app/widgets.js') %>
-    <%= static_javascript_include_tag('erp_app/shared/ajax_pagination.js') %>
+    <%= static_javascript_include_tag('ajax_pagination.js') %>
     <%= static_javascript_include_tag('erp_app/shared/dynamic_forms/dynamic_forms_validation.js') %>
+    <%= static_javascript_include_tag('knitkit/helpers.js') %>
     <%= yield :head %>
   </head>
   <body>

data/app/views/layouts/knitkit/online_document_sections.html.erb

@@ -0,0 +1,59 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml2/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
+  <head>
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta name="generator" content="Knitkit - Compass AE Open source content management platform" />
+    
+    <meta name="description" content="" />
+    <meta name="keywords" content="" />
+    <meta name="copyright" content="&copy;" />
+    <meta name="robots" content="ALL" />
+    <meta name="language" content="English" />
+    
+    <title><%= @website.title %></title>
+    <%= javascript_include_tag :application %>
+    <%= include_extjs %>
+		<%= add_authenticity_token_to_extjs %>
+    <%= static_javascript_include_tag('erp_app/jquery_support.js') %>
+    <%= static_javascript_include_tag('datepicker.js') %>
+    <%= static_stylesheet_link_tag('datepicker.css') %>
+    <%= static_javascript_include_tag('erp_app/utility.js') %>
+    <%= static_stylesheet_link_tag('knitkit/style.css') %>
+    <%= static_javascript_include_tag('erp_app/widgets.js') %>
+    <%= static_javascript_include_tag('ajax_pagination.js') %>
+    <%= static_javascript_include_tag('erp_app/shared/dynamic_forms/dynamic_forms_validation.js') %>
+		<%= static_stylesheet_link_tag('knitkit/documentation.css') %>
+    <%= yield :head %>
+		<!--[if !IE 7]>
+			<style type="text/css">
+				#main {display:table;height:100%}
+			</style>
+		<![endif]-->
+  </head>
+  <body>
+    <div id="main">
+      <div id="header">
+        <div id="logo">
+          <%=render_version_viewing%>
+          <%= render_widget :login,
+                            :action => :login_header,
+                            :params => {:login_url => '/login',
+                            :signup_url => '/sign-up'}%>
+          <div id="logo_text">
+            <!-- class="logo_color", allows you to change the color of the text -->
+            <h1><a href="/"><%= @website.title %></a></h1>
+            <h2><%= @website.subtitle %></h2>
+          </div>
+        </div>
+        <%= content_for?(:menu) ? yield(:menu) : render_menu(@contents) %>
+        <%#=render_menu(@contents, :menu => 'main')%>
+      </div>
+      
+      <%= yield %>
+    </div>
+		<div id="content_footer"></div>
+    <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
+    <%= yield :foot %>
+  </body>
+</html>
+