knitkit 3.0.0 → 3.2.0

data/app/models/published_website.rb

@@ -1,3 +1,19 @@
+# create_table :published_websites do |t|
+#   t.references :website
+#   t.text :comment
+#   t.decimal :version, :precision => 18, :scale => 6
+#   t.boolean :active
+#   t.integer :published_by_id
+#
+#   t.timestamps
+# end
+#
+# #indexes
+# add_index :published_websites, :website_id
+# add_index :published_websites, :version
+# add_index :published_websites, :active
+# add_index :published_websites, :published_by_id
+
 class PublishedWebsite < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 

data/app/models/theme.rb

@@ -4,15 +4,17 @@ require 'fileutils'
 class Theme < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
-  THEME_STRUCTURE = ['stylesheets', 'javascripts', 'images', 'templates']
+  THEME_STRUCTURE = ['stylesheets', 'javascripts', 'images', 'templates', 'fonts']
   class << self
     attr_accessor :base_layouts_views_path, :knitkit_website_stylesheets_path,
-                  :knitkit_website_images_path, :knitkit_website_javascripts_path
+                  :knitkit_website_images_path, :knitkit_website_javascripts_path,
+                  :knitkit_website_fonts_path
   end
   @base_layouts_views_path = "#{Knitkit::Engine.root.to_s}/app/views"
-  @knitkit_website_stylesheets_path = "#{Knitkit::Engine.root.to_s}/public/stylesheets/knitkit"
-  @knitkit_website_javascripts_path = "#{Knitkit::Engine.root.to_s}/public/javascripts/knitkit"
+  @knitkit_website_stylesheets_path = "#{Knitkit::Engine.root.to_s}/app/assets/stylesheets/knitkit"
+  @knitkit_website_javascripts_path = "#{Knitkit::Engine.root.to_s}/app/assets/javascripts/knitkit"
   @knitkit_website_images_path = "#{Knitkit::Engine.root.to_s}/public/images/knitkit"
+  @knitkit_website_fonts_path = "#{Knitkit::Engine.root.to_s}/app/assets/fonts/knitkit"
 
   protected_with_capabilities
   has_file_assets
@@ -39,12 +41,12 @@ class Theme < ActiveRecord::Base
           data = ''
           entry.get_input_stream { |io| data = io.read }
           data = StringIO.new(data) if data.present?
-          theme_file = self.files.where("name = ? and directory = ?", File.basename(name), File.join(self.url,File.dirname(name))).first
+          theme_file = self.files.where("name = ? and directory = ?", File.basename(name), File.join(self.url, File.dirname(name))).first
           unless theme_file.nil?
             theme_file.data = data
             theme_file.save
           else
-            self.add_file(data, File.join(file_support.root, self.url,name)) rescue next
+            self.add_file(data, File.join(file_support.root, self.url, name)) rescue next
           end
         end
       end
@@ -54,12 +56,12 @@ class Theme < ActiveRecord::Base
 
   class << self
     def import_download_item(tempfile, website)
-          name_and_id = tempfile.gsub(/(^.*(\\|\/))|(\.zip$)/, '')
-          theme_name = name_and_id.split('[').first
-          theme_id = name_and_id.split('[').last.gsub(']','')
-          Theme.create(:name => theme_name.sub(/-theme/, ''), :theme_id => theme_id, :website_id => website.id).tap do |theme|
-            theme.import_download_item_file(tempfile)
-          end
+      name_and_id = tempfile.gsub(/(^.*(\\|\/))|(\.zip$)/, '')
+      theme_name = name_and_id.split('[').first
+      theme_id = name_and_id.split('[').last.gsub(']', '')
+      Theme.create(:name => theme_name.sub(/-theme/, ''), :theme_id => theme_id, :website_id => website.id).tap do |theme|
+        theme.import_download_item_file(tempfile)
+      end
     end
 
 
@@ -77,7 +79,6 @@ class Theme < ActiveRecord::Base
     end
 
 
-
     def root_dir
       @@root_dir ||= "#{Rails.root}/public"
     end
@@ -89,11 +90,13 @@ class Theme < ActiveRecord::Base
     def import(file, website)
       name_and_id = file.original_filename.to_s.gsub(/(^.*(\\|\/))|(\.zip$)/, '')
       theme_name = name_and_id.split('[').first
-      theme_id = name_and_id.split('[').last.gsub(']','')
+      theme_id = name_and_id.split('[').last.gsub(']', '')
       return false unless valid_theme?(file)
-      Theme.create(:name => theme_name, :theme_id => theme_id, :website => website).tap do |theme|
+      theme = Theme.create(:name => theme_name, :theme_id => theme_id, :website => website).tap do |theme|
         theme.import(file)
       end
+
+      theme
     end
 
     def make_tmp_dir
@@ -119,6 +122,7 @@ class Theme < ActiveRecord::Base
 
   extend FriendlyId
   friendly_id :name, :use => [:slugged, :scoped], :slug_column => :theme_id, :scope => [:website_id]
+
   def should_generate_new_friendly_id?
     new_record?
   end
@@ -147,18 +151,18 @@ class Theme < ActiveRecord::Base
   def themed_widgets
     Rails.application.config.erp_app.widgets.select do |widget_hash|
       !(self.files.where("directory like '#{File.join(self.url, 'widgets', widget_hash[:name])}%'").all.empty?)
-    end.collect{|item| item[:name]}
+    end.collect { |item| item[:name] }
   end
 
   def non_themed_widgets
     already_themed_widgets = self.themed_widgets
     Rails.application.config.erp_app.widgets.select do |widget_hash|
       !already_themed_widgets.include?(widget_hash[:name])
-    end.collect{|item| item[:name]}
+    end.collect { |item| item[:name] }
   end
 
   def create_layouts_for_widget(widget)
-    widget_hash = Rails.application.config.erp_app.widgets.find{|item| item[:name] == widget}
+    widget_hash = Rails.application.config.erp_app.widgets.find { |item| item[:name] == widget }
     widget_hash[:view_files].each do |view_file|
       save_theme_file(view_file[:path], :widgets, {:path_to_replace => view_file[:path].split('/views')[0], :widget_name => widget})
     end
@@ -193,17 +197,19 @@ class Theme < ActiveRecord::Base
           self.homepage = about['homepage'] if about['homepage']
           self.summary = about['summary'] if about['summary']
         else
-          name = entry.name.sub(/__MACOSX\//, '')
-          name = Theme.strip_path(name, theme_root)
-          data = ''
-          entry.get_input_stream { |io| data = io.read }
-          data = StringIO.new(data) if data.present?
-          theme_file = self.files.where("name = ? and directory = ?", File.basename(name), File.join(self.url,File.dirname(name))).first
-          unless theme_file.nil?
-            theme_file.data = data
-            theme_file.save
-          else
-            self.add_file(data, File.join(file_support.root, self.url,name)) rescue next
+          if entry.file?
+            name = entry.name.sub(/__MACOSX\//, '')
+            name = Theme.strip_path(name, theme_root)
+            data = ''
+            entry.get_input_stream { |io| data = io.read }
+            data = StringIO.new(data) if data.present?
+            theme_file = self.files.where("name = ? and directory = ?", File.basename(name), File.join(self.url, File.dirname(name))).first
+            unless theme_file.nil?
+              theme_file.data = data
+              theme_file.save
+            else
+              self.add_file(data, File.join(file_support.root, self.url, name)) rescue next
+            end
           end
         end
       end
@@ -217,13 +223,13 @@ class Theme < ActiveRecord::Base
     (tmp_dir + "#{name}[#{theme_id}].zip").tap do |file_name|
       file_name.unlink if file_name.exist?
       Zip::ZipFile.open(file_name.to_s, Zip::ZipFile::CREATE) do |zip|
-        files.each {|file|
-          contents = file_support.get_contents(File.join(file_support.root,file.directory,file.name))
-          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, 'wb+') {|f| f.puts(contents) }
-          zip.add(File.join(relative_path[1..relative_path.length],file.name), full_path) if ::File.exists?(full_path)
+        files.each { |file|
+          contents = file_support.get_contents(File.join(file_support.root, file.directory, file.name))
+          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, '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', 'wb+') { |f| f.puts(about.to_yaml) }
         zip.add('about.yml', tmp_dir + 'about.yml')
@@ -232,7 +238,7 @@ class Theme < ActiveRecord::Base
   end
 
   def has_template?(directory, name)
-    self.templates.find{|item| item.directory == File.join(path,directory).gsub(Rails.root.to_s, '') and item.name == name}
+    self.templates.find { |item| item.directory == File.join(path, directory).gsub(Rails.root.to_s, '') and item.name == name }
   end
 
   class << self
@@ -269,7 +275,7 @@ class Theme < ActiveRecord::Base
 
   def delete_theme_files!
     file_support = ErpTechSvcs::FileSupport::Base.new(:storage => ErpTechSvcs::Config.file_storage)
-    file_support.delete_file(File.join(file_support.root,self.url), :force => true)
+    file_support.delete_file(File.join(file_support.root, self.url), :force => true)
   end
 
   def create_theme_files!
@@ -278,40 +284,40 @@ class Theme < ActiveRecord::Base
     create_theme_files_for_directory_node(file_support.build_tree(Theme.knitkit_website_stylesheets_path, :preload => true), :stylesheets, :path_to_replace => Theme.knitkit_website_stylesheets_path)
     create_theme_files_for_directory_node(file_support.build_tree(Theme.knitkit_website_javascripts_path, :preload => true), :javascripts, :path_to_replace => Theme.knitkit_website_javascripts_path)
     create_theme_files_for_directory_node(file_support.build_tree(Theme.knitkit_website_images_path, :preload => true), :images, :path_to_replace => Theme.knitkit_website_images_path)
+    create_theme_files_for_directory_node(file_support.build_tree(Theme.knitkit_website_fonts_path, :preload => true), :fonts, :path_to_replace => Theme.knitkit_website_fonts_path)
   end
 
   private
 
   def create_theme_files_for_directory_node(node, type, options={})
-    node[:children].each do |child_node|
-      child_node[:leaf] ? save_theme_file(child_node[:id], type, options) : create_theme_files_for_directory_node(child_node, type, options)
+    if node
+      node[:children].each do |child_node|
+        child_node[:leaf] ? save_theme_file(child_node[:id], type, options) : create_theme_files_for_directory_node(child_node, type, options)
+      end
     end
   end
 
   def save_theme_file(path, type, options)
     ignored_css = [
         'bootstrap.min.css',
-        'bootstrap-responsive.min.css',
-        'datepicker.css',
         'inline_editing.css',
     ]
 
     ignored_js = [
+        'additional-methods.min',
         'bootstrap.min.js',
-        'bootstrap-datepicker.js',
         'confirm-bootstrap.js',
         'inline_editing.js',
         'jquery.maskedinput.min.js',
-        'Main.js',
-        'View.js'
+        'jquery.validate.min.js'
     ]
 
     ignored_files = (ignored_css | ignored_js).flatten
 
     unless ignored_files.any? { |w| path =~ /#{w}/ }
       contents = IO.read(path)
-      contents.gsub!("<%= static_stylesheet_link_tag 'knitkit/custom.css' %>","<%= theme_stylesheet_link_tag '#{self.theme_id}','custom.css' %>") unless path.scan('base.html.erb').empty?
-      contents.gsub!("<%= static_javascript_include_tag 'knitkit/theme.js' %>","<%= theme_javascript_include_tag '#{self.theme_id}','theme.js' %>") unless path.scan('base.html.erb').empty?
+      contents.gsub!("<%= stylesheet_link_tag 'knitkit/custom' %>", "<%= theme_stylesheet_link_tag '#{self.theme_id}','custom.css' %>") unless path.scan('base.html.erb').empty?
+      contents.gsub!("<%= javascript_include_tag 'knitkit/theme' %>", "<%= theme_javascript_include_tag '#{self.theme_id}','theme.js' %>") unless path.scan('base.html.erb').empty?
 
       path = case type
                when :widgets

data/app/models/website.rb

@@ -1,8 +1,20 @@
+# create_table :websites do |t|
+#   t.string :name
+#   t.string :title
+#   t.string :subtitle
+#   t.string :internal_identifier
+#   t.boolean :publishing, :default => false
+#
+#   t.timestamps
+# end
+#
+# add_index :websites, :internal_identifier, :name => 'websites_internal_identifier_idx'
+
 class Website < ActiveRecord::Base
   attr_protected :created_at, :updated_at
 
   after_destroy :remove_sites_directory, :remove_website_role
-  before_destroy :destroy_sections
+  before_destroy :destroy_sections, :destroy_website_security_role, :destroy_website_party_roles
   after_create :setup_website
 
   protected_with_capabilities
@@ -67,6 +79,18 @@ class Website < ActiveRecord::Base
     parents.each { |parent| parent.destroy }
   end
 
+  def destroy_website_security_role
+    ActiveRecord::Base.connection.execute("delete from parties_security_roles where security_role_id = #{self.role.id}")
+  end
+
+  def destroy_website_party_roles
+    ActiveRecord::Base.connection.execute("delete from website_party_roles where website_id = #{self.id}")
+  end
+
+  def dba_organization
+    self.website_party_roles.where(role_type_id: RoleType.iid('dba_org')).first.party
+  end
+
   def publishing?
     self.publishing
   end
@@ -98,15 +122,6 @@ class Website < ActiveRecord::Base
     config_value('email_inquiries') == 'yes'
   end
 
-  def self.find_by_host(host)
-    website = nil
-    unless host.nil?
-      website_host = WebsiteHost.find_by_host(host)
-      website = website_host.website unless website_host.nil?
-    end
-    website
-  end
-
   def deactivate_themes!
     themes.each do |theme|
       theme.deactivate!
@@ -153,7 +168,12 @@ class Website < ActiveRecord::Base
 
   def setup_website
     PublishedWebsite.create(:website => self, :version => 0, :active => true, :comment => 'New Site Created')
-    SecurityRole.create(:description => "Website #{self.title}", :internal_identifier => website_role_iid) if self.role.nil?
+
+    if self.role.nil?
+      website_role = SecurityRole.create(:description => "Website #{self.title}", :internal_identifier => website_role_iid)
+      website_role.move_to_child_of(SecurityRole.iid('website_builder'))
+    end
+
     configuration = ::Configuration.find_template('default_website_configuration').clone(true, "Website #{self.title} Configuration", "Website #{self.title} Configuration".underscore)
     configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('login_url'), '/login')
     configuration.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('homepage_url'), '/home')
@@ -187,9 +207,18 @@ class Website < ActiveRecord::Base
     profile_page = nil
     widget_classes.each do |widget_class|
       website_section = WebsiteSection.new
-      website_section.title = widget_class.title
-      website_section.in_menu = true unless ["Login", "Sign Up", "Reset Password"].include?(widget_class.title)
-      website_section.layout = widget_class.base_layout
+
+      # AE-194: Inline Search is active, so no need for search page, take search layout
+      # but change section name for the Search Results page 
+      # and change layout so render widget to calls search action
+      website_section.in_menu = true unless ["Login", "Sign Up", "Reset Password", "Search"].include?(widget_class.title)
+      if widget_class.title == 'Search'
+        website_section.title = 'Search Results'
+        website_section.layout = widget_class.base_layout.gsub(":search", ":search, :action => 'search'")
+      else
+        website_section.title = widget_class.title
+        website_section.layout = widget_class.base_layout
+      end
       website_section.save
 
       profile_page = website_section if widget_class.title == 'Manage Profile'
@@ -211,7 +240,8 @@ class Website < ActiveRecord::Base
         :sections => [],
         :images => [],
         :files => [],
-        :website_navs => []
+        :website_navs => [],
+        :members => []
     }
 
     #TODO update to handle configurations
@@ -235,6 +265,13 @@ class Website < ActiveRecord::Base
       setup_hash[:files] << {:path => file_asset.directory, :name => file_asset.name, :roles => file_asset.roles.uniq.collect { |r| r.internal_identifier }}
     end
 
+    # get all members of the website
+    self.website_party_roles.where('role_type_id = ?', RoleType.find_by_ancestor_iids(['website', 'member'])).each do |website_party_role|
+      party = website_party_role.party
+
+      setup_hash[:members] << party.user.username
+    end
+
     setup_hash
   end
 
@@ -329,9 +366,9 @@ class Website < ActiveRecord::Base
 
   def export_template
     tmp_dir = Website.make_tmp_dir
-    template_zip_path = export
+    website_zip_path = export
 
-    if !themes.active.first.is_a?(Theme)
+    unless themes.active.first.is_a?(Theme)
       return false
     end
 
@@ -340,36 +377,75 @@ class Website < ActiveRecord::Base
     zip_file_name = File.join(tmp_dir, self.iid + '-composite.zip')
 
     Zip::ZipFile.open(zip_file_name, Zip::ZipFile::CREATE) do |zip_file|
-      zip_file.add(File.basename(template_zip_path, '.zip') + '-template.zip', template_zip_path)
+      zip_file.add(File.basename(website_zip_path, '.zip') + '-website.zip', website_zip_path)
       zip_file.add(File.basename(theme_zip_path, '.zip') + '-theme.zip', theme_zip_path)
     end
 
     File.join(tmp_dir, self.iid + '-composite.zip')
   end
 
+  def website_role_iid
+    "website_#{self.iid}_access"
+  end
+
+  def to_data_hash
+    to_hash(only: [:id, :name, :title, :subtitle,
+                   :internal_identifier, :created_at, :updated_at])
+  end
+
   class << self
+
+    # Scope websites by passed dba_organization(s)
+    #
+    # @param dba_organization [Party, Array] Either a single dba_organization to scope by
+    # or an array of dba_organizations to scope by
+    # @return [ActiveRecord::Relation] Websites scope by ba_organization(s)
+    def scope_by_dba_organization(dba_organization)
+      joins(website_party_roles: [:party, :role_type])
+          .where(role_types: {internal_identifier: 'dba_org'})
+          .where(parties: {id: dba_organization})
+    end
+
+    def find_by_host(host)
+      website = nil
+      unless host.nil?
+        website_host = WebsiteHost.find_by_host(host)
+        website = website_host.website unless website_host.nil?
+      end
+      website
+    end
+
     def make_tmp_dir
       Pathname.new(File.join(Rails.root, "/tmp/website_export/tmp_#{Time.now.to_i.to_s}")).tap do |dir|
         FileUtils.mkdir_p(dir) unless dir.exist?
       end
     end
 
-    def import(file, current_user)
+    def import(file_path, current_user)
       file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
       message = ''
       website = nil
 
-      file = ActionController::UploadedTempfile.new("uploaded-theme").tap do |f|
-        f.puts file.read
-        f.original_filename = file.original_filename
-        f.read # no idea why we need this here, otherwise the zip can't be opened
-      end unless file.path
+      # if the path to the file is passed just use it else get the path from
+      # the File object that was passed
+      unless file_path.is_a?(String)
+        if file_path.path
+          file_path = file_path.path
+        else
+          file = ActionController::UploadedTempfile.new("uploaded-website").tap do |f|
+            f.puts file_path.read
+            f.original_filename = file_path.original_filename
+            f.read # no idea why we need this here, otherwise the zip can't be opened
+          end
+          file_path = file.path
+        end
+      end
 
       entries = []
       setup_hash = nil
 
       tmp_dir = Website.make_tmp_dir
-      Zip::ZipFile.open(file.path) do |zip|
+      Zip::ZipFile.open(file_path) do |zip|
         zip.each do |entry|
           f_path = File.join(tmp_dir.to_s, entry.name)
           FileUtils.mkdir_p(File.dirname(f_path))
@@ -417,13 +493,6 @@ class Website < ActiveRecord::Base
 
         begin
           #handle images
-          # entries.each do |entry|
-          #   puts "entry type '#{entry[:type]}'"
-          #   puts "entry name '#{entry[:name]}'"
-          #   puts "entry path '#{entry[:path]}'"
-          #   puts "entry data #{!entry[:data].blank?}"
-          # end
-          # puts "------------------"
           setup_hash[:images].each do |image_asset|
             filename = 'images' + image_asset[:path] + '/' + image_asset[:name]
             #puts "image_asset '#{filename}'"
@@ -433,10 +502,29 @@ class Website < ActiveRecord::Base
             end
           end
 
+          if setup_hash[:members]
+            #handle members
+            website_role_type_parent = RoleType.find_or_create('website', 'Website')
+            website_member_role = RoleType.find_or_create('member', 'Member', website_role_type_parent)
+
+            setup_hash[:members].each do |member|
+              user = User.find_by_username(member)
+
+              if user
+                # add website security role to user
+                user.add_role(website.role)
+
+                # create website_party_role for this user as a member of the site
+                WebsitePartyRole.create(party: user.party, website: website, role_type: website_member_role)
+
+                user.save
+              end
+            end
+          end
+
           #handle files
           setup_hash[:files].each do |file_asset|
             filename = 'files' + file_asset[:path] + '/' + file_asset[:name]
-            #puts "file_asset '#{filename}'"
             content = entries.find { |entry| entry[:type] == 'files' and entry[:path] == filename }
             unless content.nil?
               file = website.add_file(content[:data], File.join(file_support.root, file_asset[:path], file_asset[:name]))
@@ -488,6 +576,11 @@ class Website < ActiveRecord::Base
         end
 
         website.save
+
+        # set the currents users dba_org as the dba_org for this website
+        WebsitePartyRole.create(website: website,
+                                party: current_user.party.dba_organization,
+                                role_type: RoleType.iid('dba_org'))
       else
         message = 'Website already exists with that internal_identifier'
       end
@@ -495,177 +588,64 @@ class Website < ActiveRecord::Base
       return website, message
     end
 
-    def import_template_director(file, current_user)
-      file_object = file.tempfile
-      file_path = file_object.path
+    def import_template(file, current_user)
+      file = ActionController::UploadedTempfile.new("uploaded-template").tap do |f|
+        f.puts file.read
+        f.original_filename = file.original_filename
+        f.read # no idea why we need this here, otherwise the zip can't be opened
+      end unless file.path
+
+      result = {website: nil, theme: nil, success: false}
 
       entries = []
       begin
-        Zip::ZipFile.open(file_path) { |zip_file|
-          zip_file.each { |f|
-            f_path=File.join('public/waste', f.name)
+        Zip::ZipFile.open(file.path) do |zip_file|
+          zip_file.each do |f|
+            f_path = File.join('tmp/template_import', f.name)
             FileUtils.mkdir_p(File.dirname(f_path))
             zip_file.extract(f, f_path) unless File.exist?(f_path)
-            entries << f.name
-          }
-        }
-
-        entries.each do |entry|
-          if entry.match(/-template.zip/)
-            @website_result = import_template('public/waste/' + entry, current_user)
+            entries << {name: f.name, path: f_path}
           end
         end
+
         entries.each do |entry|
-          if entry.match(/-theme.zip/)
-            Theme.import_download_item('public/waste/' + entry, @website_result[0])
+          if entry[:name].match(/-website.zip/)
+            result[:website], result[:message] = import(entry[:path], current_user)
           end
         end
-        return @website_result[0], @website_result[1]
-      rescue Exception => e
-        return false, "Error"
-      end
-    end
 
-    def import_template(file, current_user)
-      file_support = ErpTechSvcs::FileSupport::Base.new(:storage => Rails.application.config.erp_tech_svcs.file_storage)
-      message = ''
-      website = nil
-
-      entries = []
-      setup_hash = nil
-
-      tmp_dir = Website.make_tmp_dir
-
-      Zip::ZipFile.open(file) do |zip|#passing in a file
-        #Zip::ZipFile.open(file.path) do |zip|
-        zip.each do |entry|
-          f_path = File.join(tmp_dir.to_s, entry.name)
-          FileUtils.mkdir_p(File.dirname(f_path))
-          zip.extract(entry, f_path) unless File.exist?(f_path)
-
-          next if entry.name =~ /__MACOSX\//
-          if entry.name =~ /setup.yml/
-            data = ''
-            entry.get_input_stream { |io| data = io.read }
-            data = StringIO.new(data) if data.present?
-            setup_hash = YAML.load(data)
-          else
-            type = entry.name.split('/')[0]
-            name = entry.name.split('/').last
-            next if name.nil?
-
-            if File.exist?(f_path) and !File.directory?(f_path)
-              entry_hash = {:type => type, :name => name, :path => entry.name}
-              entries << entry_hash unless name == 'sections' || name == 'articles' || name == 'excerpts' || name == 'documented contents'
-              entry_hash[:data] = File.open(f_path, "rb") { |io| io.read }
+        if result[:website]
+          entries.each do |entry|
+            if entry[:name].match(/-theme.zip/)
+              result[:theme] = Theme.import(entry[:path], result[:website], true)
             end
           end
-
+        else
+          raise result[:message]
         end
-      end
-      entries.uniq!
-      FileUtils.rm_rf(tmp_dir.to_s)
 
-      if Website.find_by_internal_identifier(setup_hash[:internal_identifier]).nil?
-        website = Website.new(
-            :name => setup_hash[:name],
-            :title => setup_hash[:title],
-            :subtitle => setup_hash[:subtitle],
-            :internal_identifier => setup_hash[:internal_identifier]
-        )
-
-        #TODO update to handle configurations
-
-        website.save!
-
-        #set default publication published by user
-        first_publication = website.published_websites.first
-        first_publication.published_by = current_user
-        first_publication.save
-
-        begin
-          #handle images
-          # entries.each do |entry|
-          #   puts "entry type '#{entry[:type]}'"
-          #   puts "entry name '#{entry[:name]}'"
-          #   puts "entry path '#{entry[:path]}'"
-          #   puts "entry data #{!entry[:data].blank?}"
-          # end
-          # puts "------------------"
-          setup_hash[:images].each do |image_asset|
-            filename = 'images' + image_asset[:path] + '/' + image_asset[:name]
-            #puts "image_asset '#{filename}'"
-            content = entries.find { |entry| entry[:type] == 'images' and entry[:path] == filename }
-            unless content.nil?
-              website.add_file(content[:data], File.join(file_support.root, image_asset[:path], image_asset[:name]))
-            end
-          end
-
-          #handle files
-          setup_hash[:files].each do |file_asset|
-            filename = 'files' + file_asset[:path] + '/' + file_asset[:name]
-            #puts "file_asset '#{filename}'"
-            content = entries.find { |entry| entry[:type] == 'files' and entry[:path] == filename }
-            unless content.nil?
-              file = website.add_file(content[:data], File.join(file_support.root, file_asset[:path], file_asset[:name]))
-
-              #handle security
-              unless file_asset[:roles].empty?
-                capability = file.add_capability(:download)
-                file_asset[:roles].each do |role_iid|
-                  role = SecurityRole.find_by_internal_identifier(role_iid)
-                  role.add_capability(capability)
-                end
-              end
-            end
-          end
-
-          #handle hosts
-          if WebsiteHost.last
-          setup_hash.merge(:hosts => 'localhost:3000')
-          end
+        FileUtils.rm_rf('tmp/template_import')
 
-          if !setup_hash[:hosts].blank? and !setup_hash[:hosts].empty?
-            #set first host as primary host in configuration
-            website.configurations.first.update_configuration_item(ConfigurationItemType.find_by_internal_identifier('primary_host'), 'localhost:3000')
-            website.save
-          end
-
-          #handle sections
-          setup_hash[:sections].each do |section_hash|
-            build_section(section_hash, entries, website, current_user)
-          end
-          website.website_sections.update_paths!
-
-          #handle website_navs
-          setup_hash[:website_navs].each do |website_nav_hash|
-            website_nav = WebsiteNav.new(:name => website_nav_hash[:name])
-            website_nav_hash[:items].each do |item|
-              website_nav.website_nav_items << build_menu_item(item)
-            end
-            website.website_navs << website_nav
-          end
-
-          website.publish("Website Imported", current_user)
+        result[:success] = true
+      rescue Exception => e
+        Rails.logger.error(e.message)
+        Rails.logger.error(e.backtrace.join("\n"))
 
-        rescue Exception => ex
-          Rails.logger.error "#{ex.inspect} #{ex.backtrace}"
-          website.destroy unless website.nil?
-          raise ex
+        if result[:website]
+          result[:website].destroy
+          result[:website] = nil
         end
 
-        website.save
-      else
-        message = 'Website already exists with that internal_identifier'
+        result[:message] = 'Error importing theme'
+        result[:success] = false
       end
 
-      return website, message
+      result
     end
 
-
     def find_site_entry_in_zip(file)
       zf = Zip::ZipFile.open(file)
-      zf.each_with_index {  |entry, index|
+      zf.each_with_index { |entry, index|
         if entry.name.match(/-template.zip/) && !entry.name.match(/_./)
           return entry
         end
@@ -675,7 +655,7 @@ class Website < ActiveRecord::Base
     def find_theme_entries_in_zip(file)
       entries = []
       zf = Zip::ZipFile.new(file)
-      zf.each_with_index {  |entry, index|
+      zf.each_with_index { |entry, index|
         if entry.name.match(/-theme.zip/) && !entry.name.match(/_./)
           entries << entry
         end
@@ -683,10 +663,8 @@ class Website < ActiveRecord::Base
       entries
     end
 
-
     protected
 
-
     def build_menu_item(hash)
       website_item = WebsiteNavItem.new(
           :title => hash[:title],
@@ -718,17 +696,20 @@ class Website < ActiveRecord::Base
       klass = hash[:type].constantize
       section = klass.new(:title => hash[:name],
                           :in_menu => hash[:in_menu],
-                          :render_base_layout => hash[:render_base_layout],
                           :position => hash[:position],
                           :render_base_layout => hash[:render_base_layout])
       section.internal_identifier = hash[:internal_identifier]
-      section.permalink = hash[:permalink]
-      section.path = hash[:path]
       content = entries.find do |entry|
         entry[:type] == 'sections' and entry[:name] == "#{hash[:permalink]}.rhtml" and entry[:path].split('.')[0] == "sections#{hash[:path]}"
       end
 
       section.layout = content[:data] unless content.nil?
+      section.save
+
+      # force the update of permalink and path
+      section.permalink = hash[:permalink]
+      section.path = hash[:path]
+      section.save
 
       hash[:articles].each do |article_hash|
         article = Article.find_by_internal_identifier(article_hash[:internal_identifier])
@@ -741,13 +722,17 @@ class Website < ActiveRecord::Base
           unless content.nil?
             article.excerpt_html = content[:data]
           end
+
+          # set the currents users dba_org as the dba_org for this content
+          article.add_party_with_role(current_user.party.dba_organization,
+                                      RoleType.iid('dba_org'))
         end
         section.contents << article
-        section.save
         article.update_content_area_and_position_by_section(section, article_hash[:content_area], article_hash[:position])
       end
       website.website_sections << section
-      section.save
+      website.save
+
       if hash[:sections]
         hash[:sections].each do |section_hash|
           child_section = build_section(section_hash, entries, website, current_user)
@@ -793,10 +778,6 @@ class Website < ActiveRecord::Base
       section
     end
 
-
   end
 
-  def website_role_iid
-    "website_#{self.iid}_access"
-  end
 end