knitkit 2.0.5 → 2.0.6

data/app/controllers/knitkit/erp_app/desktop/website_controller.rb

@@ -88,9 +88,6 @@ module Knitkit
               website.subtitle                  = params[:subtitle]
               website.title                     = params[:title]
               website.name                      = params[:name]
-              website.email                     = params[:email]
-              website.auto_activate_publication = params[:auto_activate_publication] == 'yes'
-              website.email_inquiries           = params[:email_inquiries] == 'yes'
 
               # create homepage
               website_section = WebsiteSection.new
@@ -129,12 +126,9 @@ module Knitkit
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability(model, 'edit', 'Website') do
-              @website.email                     = params[:email]
               @website.name                      = params[:name]
               @website.title                     = params[:title]
               @website.subtitle                  = params[:subtitle]
-              @website.auto_activate_publication = params[:auto_activate_publication] == 'yes'
-              @website.email_inquiries           = params[:email_inquiries] == 'yes'
 
               render :json => @website.save ? {:success => true} : {:success => false}
             end

data/app/controllers/knitkit/erp_app/desktop/website_section_controller.rb

@@ -94,7 +94,10 @@ module Knitkit
               @website_section.render_base_layout = params[:render_with_base_layout] == 'yes'
               @website_section.internal_identifier = params[:internal_identifier]
 
+              website = @website_section.website
               if @website_section.save
+                @website_section.publish(website, 'Auto Publish', @website_section.version, current_user) if website.publish_on_save?
+
                 render :json => {:success => true}
               else
                 render :json => {:success => false}
@@ -132,11 +135,13 @@ module Knitkit
           model = DesktopApplication.find_by_internal_identifier('knitkit')
           begin
             current_user.with_capability(model, 'edit', 'Layout') do
-		      result = Knitkit::SyntaxValidator.validate_content(:erb, params[:content])
-
+		          result = Knitkit::SyntaxValidator.validate_content(:erb, params[:content])
               unless result
+                website = @website_section.website
                 @website_section.layout = params[:content]
-                render :json => @website_section.save ? {:success => true} : {:success => false}
+                saved = @website_section.save
+                @website_section.publish(website, 'Auto Publish', @website_section.version, current_user) if saved and website.publish_on_save?
+                render :json => saved ? {:success => true} : {:success => false}
               else
                 render :json => {:success => false, :message => result}
               end
@@ -146,11 +151,42 @@ module Knitkit
           end
         end
 
+        def available_articles_filter
+          menu = []
+          websites = Website.all
+          all_articles = [{:name => 'All Articles', :id => 0}]
+          orphaned_articles = [{:name => 'Orphaned Articles Only', :id => -1}]
+          
+          websites_array = []
+          websites.each do |w| 
+            websites_array << { :name => "Website: #{w.name}", :id => w.id } 
+          end
+
+          menu = all_articles + orphaned_articles + websites_array
+
+          render :inline => "{\"websites\":#{menu.to_json(:only => [:name, :id])}}"
+        end
+
         def available_articles
-          current_articles = Article.joins("INNER JOIN website_section_contents ON website_section_contents.content_id = contents.id").where("website_section_id = #{params[:section_id]}").all
-          available_articles = Article.order('LOWER(internal_identifier) ASC').all - current_articles
+          website_id = params[:website_id]
+          current_articles = Article.joins(:website_section_contents).where("website_section_id = #{params[:section_id]}").all
+
+          # Defaults to retrieving all articles
+          available_articles = Article.order('LOWER(contents.internal_identifier) ASC')
+
+          # Orphaned Articles
+          if !website_id.blank? and website_id.to_i == -1
+            available_articles = available_articles.includes(:website_section_contents).where( :website_section_contents => { :content_id => nil } )     
+          end
+
+          # Website Articles
+          if !website_id.blank? and website_id.to_i > 0
+            available_articles = available_articles.joins(:website_sections).where("website_sections.website_id = #{website_id}")
+          end
+
+          available_articles = available_articles.all - current_articles
 
-          render :inline => "{\"articles\":#{available_articles.to_json(:only => [:internal_identifier, :id])}}"
+          render :inline => "{\"articles\":#{available_articles.to_json(:only => [:title, :internal_identifier, :id], :methods => [:combobox_display_value])}}"
         end
   
         def existing_sections

data/app/models/article.rb

@@ -10,5 +10,9 @@ class Article < Content
   def check_internal_indentifier
     self.internal_identifier = self.permalink if self.internal_identifier.blank?
   end
+
+  def combobox_display_value
+    "#{title} (#{internal_identifier})"
+  end
 end
 

data/app/models/content.rb

@@ -87,10 +87,6 @@ class Content < ActiveRecord::Base
     position
   end
 
-  def add_comment(options={})
-    self.comments.create(options)
-  end
-
   def get_comments(limit)
     self.comments.recent.limit(limit).all
   end

data/app/models/theme.rb

@@ -126,7 +126,7 @@ class Theme < ActiveRecord::Base
           self.summary = about['summary'] if about['summary']
         else
           name = entry.name.sub(/__MACOSX\//, '')
-          name = Theme.strip_path(entry.name, theme_root)
+          name = Theme.strip_path(name, theme_root)
           data = ''
           entry.get_input_stream { |io| data = io.read }
           data = StringIO.new(data) if data.present?
@@ -153,10 +153,10 @@ class Theme < ActiveRecord::Base
           relative_path = file.directory.sub("#{url}",'')
           path = FileUtils.mkdir_p(File.join(tmp_dir,relative_path))
           full_path = File.join(path,file.name)
-          File.open(full_path, 'w+:ASCII-8BIT') {|f| f.puts(contents) }
+          File.open(full_path, 'wb+') {|f| f.puts(contents) }
           zip.add(File.join(relative_path[1..relative_path.length],file.name), full_path) if ::File.exists?(full_path)
         }
-        ::File.open(tmp_dir + 'about.yml', 'w') { |f| f.puts(about.to_yaml) }
+        ::File.open(tmp_dir + 'about.yml', 'wb+') { |f| f.puts(about.to_yaml) }
         zip.add('about.yml', tmp_dir + 'about.yml')
       end
     end

data/app/models/website.rb

@@ -64,10 +64,21 @@ class Website < ActiveRecord::Base
     #ActiveRecord::Base.connection.execute("select path from website_sections where website_id = #{self.id}").collect{|row| row['path']}
   end
 
+  def config_value(config_item_type_iid)
+    primary_host_config_item_type = ConfigurationItemType.find_by_internal_identifier(config_item_type_iid)
+    self.configurations.first.get_configuration_item(primary_host_config_item_type).options.first.value
+  end
+
+  def email_inquiries?
+    config_value('email_inquiries') == 'yes'
+  end
+
   def self.find_by_host(host)
     website = nil
-    website_host = WebsiteHost.find_by_host(host)
-    website = website_host.website unless website_host.nil?
+    unless host.nil?
+      website_host = WebsiteHost.find_by_host(host)
+      website = website_host.website unless website_host.nil?
+    end
     website
   end
 
@@ -93,6 +104,24 @@ class Website < ActiveRecord::Base
     self.published_websites.where(:active => true).first
   end
 
+  def auto_activate_publication?
+    configuration_item = self.configurations.first.get_item(:auto_active_publications)
+    unless configuration_item.nil?
+      configuration_item.options.first.value == 'yes'
+    else
+      false
+    end
+  end
+
+  def publish_on_save?
+    configuration_item = self.configurations.first.get_item(:publish_on_save)
+    unless configuration_item.nil?
+      configuration_item.options.first.value == 'yes'
+    else
+      false
+    end
+  end
+
   def role
     Role.iid(website_role_iid)
   end
@@ -103,7 +132,6 @@ class Website < ActiveRecord::Base
     configuration = ::Configuration.find_template('default_website_configuration').clone(true)
     configuration.description = "Website #{self.name} Configuration"
     configuration.internal_identifier = configuration.description.underscore
-    configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('contact_us_email_address'), self.email)
     configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('login_url'), '/login')
     configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('homepage_url'), '/home')
     self.configurations << configuration
@@ -154,15 +182,14 @@ class Website < ActiveRecord::Base
       :title => title,
       :subtitle => subtitle,
       :internal_identifier => internal_identifier,
-      :email => email,
-      :auto_activate_publication => auto_activate_publication,
-      :email_inquiries => email_inquiries,
       :sections => [],
       :images => [],
       :files => [],
       :website_navs => []
     }
 
+    #TODO update to handle configurations
+
     setup_hash[:sections] = sections.positioned.collect do |website_section|
       website_section.build_section_hash
     end
@@ -209,32 +236,32 @@ class Website < ActiveRecord::Base
 
     sections.each do |website_section|
       unless website_section.layout.blank?
-        File.open(File.join(sections_path,"#{website_section.internal_identifier}.rhtml"), 'w+') {|f| f.puts(website_section.layout) }
+        File.open(File.join(sections_path,"#{website_section.internal_identifier}.rhtml"), 'wb+') {|f| f.puts(website_section.layout) }
       end
     end
 
     contents = sections.collect(&:contents).flatten.uniq
     contents.each do |content|
-      File.open(File.join(articles_path,"#{content.internal_identifier}.html"), 'w+') {|f| f.puts(content.body_html) }
+      File.open(File.join(articles_path,"#{content.internal_identifier}.html"), 'wb+') {|f| f.puts(content.body_html) }
       unless content.excerpt_html.blank?
-        File.open(File.join(excerpts_path,"#{content.internal_identifier}.html"), 'w+') {|f| f.puts(content.excerpt_html) }
+        File.open(File.join(excerpts_path,"#{content.internal_identifier}.html"), 'wb+') {|f| f.puts(content.excerpt_html) }
       end
     end
 
     online_document_sections.each do |online_documented_section|
-      File.open(File.join(documented_contents_path,"#{online_documented_section.internal_identifier}.html"), 'w+') {|f| f.puts(online_documented_section.documented_item_published_content_html(active_publication)) }
+      File.open(File.join(documented_contents_path,"#{online_documented_section.internal_identifier}.html"), 'wb+') {|f| f.puts(online_documented_section.documented_item_published_content_html(active_publication)) }
     end
 
     self.files.where("directory like '%/sites/#{self.iid}/images%'").all.each do |image_asset|
       contents = file_support.get_contents(File.join(file_support.root,image_asset.directory,image_asset.name))
       FileUtils.mkdir_p(File.join(image_assets_path,image_asset.directory))
-      File.open(File.join(image_assets_path,image_asset.directory,image_asset.name), 'w+:ASCII-8BIT') {|f| f.puts(contents) }
+      File.open(File.join(image_assets_path,image_asset.directory,image_asset.name), 'wb+') {|f| f.puts(contents) }
     end
 
     self.files.where("directory like '%/#{Rails.application.config.erp_tech_svcs.file_assets_location}/sites/#{self.iid}%'").all.each do |file_asset|
       contents = file_support.get_contents(File.join(file_support.root,file_asset.directory,file_asset.name))
       FileUtils.mkdir_p(File.join(file_assets_path,file_asset.directory))
-      File.open(File.join(file_assets_path,file_asset.directory,file_asset.name), 'w+:ASCII-8BIT') {|f| f.puts(contents) }
+      File.open(File.join(file_assets_path,file_asset.directory,file_asset.name), 'wb+') {|f| f.puts(contents) }
     end
 
     files = []
@@ -246,7 +273,7 @@ class Website < ActiveRecord::Base
       files << {:path => path, :name => entry}
     end
 
-    File.open(tmp_dir + 'setup.yml', 'w') { |f| f.puts(export_setup.to_yaml) }
+    File.open(tmp_dir + 'setup.yml', 'wb+') { |f| f.puts(export_setup.to_yaml) }
 
     (tmp_dir + "#{name}.zip").tap do |file_name|
       file_name.unlink if file_name.exist?
@@ -313,11 +340,11 @@ class Website < ActiveRecord::Base
           :name => setup_hash[:name],
           :title => setup_hash[:title],
           :subtitle => setup_hash[:subtitle],
-          :internal_identifier => setup_hash[:internal_identifier],
-          :email => setup_hash[:email],
-          :email_inquiries => setup_hash[:email_inquiries],
-          :auto_activate_publication => setup_hash[:auto_activate_publication]
+          :internal_identifier => setup_hash[:internal_identifier]
         )
+
+        #TODO update to handle configurations
+
         website.save!
 
         #set default publication published by user

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

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

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

@@ -20,10 +20,14 @@
     <%= static_stylesheet_link_tag('datepicker.css') %>
     <%= static_stylesheet_link_tag('extjs/resources/css/knitkit_extjs_4.css') %>
     <%= static_stylesheet_link_tag('knitkit/style.css') %>
+    <%= static_stylesheet_link_tag('knitkit/inline_editing.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_javascript_include_tag('knitkit/helpers.js') %>
+    <%= static_javascript_include_tag('knitkit/inline_editing.js') %>
+    <%= static_javascript_include_tag('erp_app/ckeditor/ckeditor.js') %>
+
     <%= yield :head %>
   </head>
   <body>
@@ -57,5 +61,7 @@
       <%= content_for?(:footer) ? yield(:footer) : (render :partial => 'shared/knitkit/footer') %>
       <%= yield :foot %>
     </div>
+    <%= setSessionTimeout %>
+    <%= setup_inline_editing %>
   </body>
 </html>

data/app/views/shared/knitkit/_footer.html.erb

@@ -1,3 +1,3 @@
 <div id="footer">
-Powered By Compass
-</div>
+Powered By <a href="http://development.compassagile.com">CompassAE</a>
+</div>

data/app/widgets/signup/base.rb

@@ -1,4 +1,3 @@
-
 module Widgets
   module Signup
     class Base < ErpApp::Widgets::Base
@@ -34,7 +33,6 @@ module Widgets
             @user.party = individual.party
             @user.save
             render :update => {:id => "#{@uuid}_result", :view => :success}
-            render :update => {:id => "#{@uuid}_result_form", :view => :success}
           else
             render :update => {:id => "#{@uuid}_result_form", :view => :error}
              

data/db/data_migrations/20120809020508_update_website_and_configuration.rb

@@ -0,0 +1,77 @@
+class UpdateWebsiteAndConfiguration < ActiveRecord::Migration
+  def self.up
+    content_work_flow_category = Category.create(:description => 'Content Workflow', :internal_identifier => 'content_workflow')
+
+    website_setup_category = Category.find_by_internal_identifier('website_setup')
+    configuration = ::Configuration.find_template('default_website_configuration')
+
+    yes_option = ConfigurationOption.find_by_internal_identifier('yes')
+    yes_option = ConfigurationOption.create(
+        :description => 'Yes',
+        :internal_identifier => 'yes',
+        :value => 'yes'
+    ) if yes_option.nil?
+
+    no_option = ConfigurationOption.find_by_internal_identifier('no')
+    no_option = ConfigurationOption.create(
+        :description => 'No',
+        :internal_identifier => 'no',
+        :value => 'no'
+    ) if no_option.nil?
+
+    #add email inquiries config
+    email_inquiries_config_item_type = ConfigurationItemType.create(
+        :description => 'Email inquiries',
+        :internal_identifier => 'email_inquiries'
+    )
+    email_inquiries_config_item_type.configuration_options << yes_option
+    email_inquiries_config_item_type.add_default_option(no_option)
+    CategoryClassification.create(:category => website_setup_category, :classification => email_inquiries_config_item_type)
+
+    configuration.configuration_item_types << email_inquiries_config_item_type
+
+    #add auto activate publications
+    auto_activate_config_item_type = ConfigurationItemType.create(
+        :description => 'Auto activate publications',
+        :internal_identifier => 'auto_active_publications'
+    )
+    auto_activate_config_item_type.configuration_options << no_option
+    auto_activate_config_item_type.add_default_option(yes_option)
+    CategoryClassification.create(:category => content_work_flow_category, :classification => auto_activate_config_item_type)
+
+    configuration.configuration_item_types << auto_activate_config_item_type
+
+    #add auto publish on save
+    publish_on_save_config_item_type = ConfigurationItemType.create(
+        :description => 'Publish on save',
+        :internal_identifier => 'publish_on_save'
+    )
+    publish_on_save_config_item_type.configuration_options << no_option
+    publish_on_save_config_item_type.add_default_option(yes_option)
+    CategoryClassification.create(:category => content_work_flow_category, :classification => publish_on_save_config_item_type)
+
+    configuration.configuration_item_types << publish_on_save_config_item_type
+
+    Website.all.each do |website|
+      website_config = website.configurations.first
+      #add types
+      website_config.configuration_item_types << email_inquiries_config_item_type
+      website_config.configuration_item_types << auto_activate_config_item_type
+      website_config.configuration_item_types << publish_on_save_config_item_type
+
+      website_config.add_configuration_item(email_inquiries_config_item_type, (website.email_inquiries ? :yes : :no))
+      website_config.add_configuration_item(auto_activate_config_item_type, (website.auto_activate_publication ? :yes : :no))
+      website_config.add_configuration_item(publish_on_save_config_item_type, (website.auto_activate_publication ? :no : :yes))
+
+      website_config.save
+    end
+
+    remove_column(:websites, :email) if columns(:websites).collect {|c| c.name}.include?('email')
+
+    remove_column(:websites, :auto_activate_publication) if columns(:websites).collect {|c| c.name}.include?('auto_activate_publication')
+    remove_column(:websites, :email_inquiries) if columns(:websites).collect {|c| c.name}.include?('email_inquiries')
+  end
+
+  def self.down
+  end
+end

data/lib/knitkit/engine.rb

@@ -24,6 +24,10 @@ module Knitkit
       include Knitkit::Extensions::ActionController::ThemeSupport::ActsAsThemedController
     end
 
+    ActiveSupport.on_load(:action_mailer) do
+      include Knitkit::Extensions::ActionMailer::ThemeSupport::ActsAsThemedMailer
+    end
+
     engine = self
     config.to_prepare do
       ErpBaseErpSvcs.register_compass_ae_engine(engine)

data/lib/knitkit/extensions.rb

@@ -2,7 +2,7 @@
 require 'knitkit/extensions/core/array'
 
 #railties
-require 'knitkit/extensions/railties/action_view'
+require 'knitkit/extensions/railties/action_view/base'
 require 'knitkit/extensions/railties/theme_support/asset_tag_helper'
 require 'knitkit/extensions/railties/theme_support/theme_file_resolver'
 
@@ -14,3 +14,6 @@ require 'knitkit/extensions/active_record/acts_as_document'
 
 #active_controller extensions
 require 'knitkit/extensions/action_controller/theme_support/acts_as_themed_controller'
+
+#action_mailer extensions
+require 'knitkit/extensions/action_mailer/theme_support/acts_as_themed_mailer'

data/lib/knitkit/extensions/action_controller/theme_support/acts_as_themed_controller.rb

@@ -23,17 +23,20 @@ module Knitkit
             end
 
             def acts_as_themed_controller?
-              included_modules.include?(Knitkit::Extensions::ActionController::ThemeSupport::ActsAsThemedController::InstanceMethods)
+              included_modules.include?(InstanceMethods)
             end
           end
 
           module InstanceMethods
             def current_themes
               @current_themes ||= case accessor = self.class.read_inheritable_attribute(:current_themes)
-              when Symbol then accessor == :current_themes ? raise("screwed") : send(accessor)
-              when Proc   then accessor.call(self)
-              else accessor
-              end
+                                    when Symbol then
+                                      accessor == :current_themes ? raise("screwed") : send(accessor)
+                                    when Proc then
+                                      accessor.call(self)
+                                    else
+                                      accessor
+                                  end
             end
 
             def add_theme_view_paths
@@ -41,34 +44,34 @@ module Knitkit
               if respond_to?(:current_theme_paths)
                 current_theme_paths.each do |theme|
                   resolver = case Rails.application.config.erp_tech_svcs.file_storage
-                  when :s3
-                    path = File.join(theme[:url], "templates") 
-                    cached_resolver = ThemeSupport::Cache.theme_resolvers.find{|cached_resolver| cached_resolver.to_path == path}
-                    if cached_resolver.nil?
-                      resolver = ActionView::S3Resolver.new(path)
-                      ThemeSupport::Cache.theme_resolvers << resolver
-                      resolver
-                    else
-                      cached_resolver
-                    end
-                  when :filesystem
-                    path = "#{theme[:path]}/templates"
-                    cached_resolver = ThemeSupport::Cache.theme_resolvers.find{|cached_resolver| cached_resolver.to_path == path}
-                    if cached_resolver.nil?
-                      resolver = ActionView::ThemeFileResolver.new(path)
-                      ThemeSupport::Cache.theme_resolvers << resolver
-                      resolver
-                    else
-                      cached_resolver
-                    end
-                  end
+                               when :s3
+                                 path = File.join(theme[:url], "templates")
+                                 cached_resolver = ThemeSupport::Cache.theme_resolvers.find { |cached_resolver| cached_resolver.to_path == path }
+                                 if cached_resolver.nil?
+                                   resolver = ActionView::S3Resolver.new(path)
+                                   ThemeSupport::Cache.theme_resolvers << resolver
+                                   resolver
+                                 else
+                                   cached_resolver
+                                 end
+                               when :filesystem
+                                 path = "#{theme[:path]}/templates"
+                                 cached_resolver = ThemeSupport::Cache.theme_resolvers.find { |cached_resolver| cached_resolver.to_path == path }
+                                 if cached_resolver.nil?
+                                   resolver = ActionView::ThemeFileResolver.new(path)
+                                   ThemeSupport::Cache.theme_resolvers << resolver
+                                   resolver
+                                 else
+                                   cached_resolver
+                                 end
+                             end
                   prepend_view_path(resolver)
                 end
               end
             end
 
             def current_theme_paths
-              current_themes ? current_themes.map { |theme| {:path => theme.path.to_s, :url => theme.url.to_s}} : []
+              current_themes ? current_themes.map { |theme| {:path => theme.path.to_s, :url => theme.url.to_s} } : []
             end
 
             def authorize_template_extension!(template, ext)
@@ -79,9 +82,9 @@ module Knitkit
             def allowed_template_type?(ext)
               force_template_types.blank? || force_template_types.include?(ext)
             end
-          end
-        end
-      end
-    end
-  end
-end
+          end #InstanceMethods
+        end #ActsAsThemedController
+      end #ThemeSupport
+    end #ActionController
+  end #Extensions
+end #Knitkit