knitkit 2.1.15 → 3.0.0

data/app/widgets/search/views/show.html.erb

@@ -1,48 +1,33 @@
-<% unless @ajax_results %>
-<p>
-  <%=render :partial => '/search' %>
-</p>
-<% end %>
-
-<% @results.each do |r| %>
-<p>
-  <a href="<%=r[:link] %>"><%= r[:title] %></a><br />
-  <%= raw r[:content].body_html[0..100] unless r[:content].body_html.nil? %><br />
-</p>
-<% end %>
-
-<% if @ajax_results %>  
-<p>
-  <%= will_paginate @results, :class => 'pagination ajax', :params => { :widget_name => 'search',
-                                                                        :widget_action => 'new',
-                                                                        :uuid => @uuid,
-                                                                        :query => params[:query],
-                                                                        :content_type => params[:content_type],
-                                                                        :section_permalink => params[:section_permalink],
-                                                                        :per_page => params[:per_page],
-                                                                        :only_path => true,
-                                                                        :use_route => :widget,
-                                                                        :scope => erp_app
-                                                                      } %>
-</p>
+<% if @results.count == 0 %>
+    <h2>No Results</h2>
 <% else %>
-<p>
-   <%= will_paginate @results, :params => { :section_id => WebsiteSection.find_by_permalink(@results_permalink).id,                                            
-                                            :widget_action => 'new', 
-                                            :query => params[:query],
-                                            :content_type => params[:content_type],
-                                            :section_permalink => params[:section_permalink],
-                                            :per_page => params[:per_page],
-                                            :only_path => true,
-                                            :use_route => :page,
-                                            :scope => main_app                                    
-                                          } %>
-</p>
-<% end %>
-<% if @ajax_results %>  
-<script type="text/javascript">
-$(function(){
-  jQuery('.pagination a').attr('data-remote', 'true'); 
-});
-</script>
-<% end %>
+    <% @results.each do |r| %>
+        <p>
+          <a href="<%= r[:link] %>"><%= r[:title] %></a>
+          <br/>
+          <%= sanitize(r[:content].body_html[0..500], :tags => []) unless r[:content].body_html.nil? %>
+          <br/>
+        </p>
+    <% end %>
+    <%=
+        will_paginate @results,
+                      :renderer => Knitkit::Extensions::WillPaginate::LinkRenderer,
+                      :params => {
+                              :widget_name => 'search',
+                              :widget_action => 'search',
+                              :uuid => @uuid,
+                              :query => @query,
+                              :content_type => @content_type,
+                              :section_unique_name => @section_unique_name,
+                              :per_page => @per_page,
+                              :controller => 'erp_app/widget_proxy',
+                              :only_path => true,
+                              :scope => erp_app
+                      }
+    %>
+    <script type="text/javascript">
+        $(function () {
+            jQuery('.pagination a').attr('data-remote', 'true');
+        });
+    </script>
+<% end %>

data/app/widgets/signup/base.rb

@@ -36,7 +36,7 @@ module Widgets
           else
             render :update => {:id => "#{@uuid}_result", :view => :error}
           end
-        rescue Exception=>ex
+        rescue => ex
           logger.error ex.message
           logger.error ex.backtrace
           render :update => {:id => "#{@uuid}_result", :view => :error}

data/app/widgets/signup/javascript/signup.js

@@ -1,15 +1,13 @@
 Compass.ErpApp.Widgets.Signup = {
     template: new Ext.Template('<%= render_widget :signup, :params => {:login_url => "/login"}%>'),
-    addSignup:function(){
+    addSignup: function () {
         Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.Signup.template.apply());
     }
-}
+};
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
-    name:'Signup',
-    iconUrl:'/images/icons/user/user_48x48.png',
-    onClick:Compass.ErpApp.Widgets.Signup.addSignup,
-    about:'This widget allows new users of a website to sign up.'
-});
-
-
+    name: 'Signup',
+    iconUrl: '/images/icons/sign_up/sign_up_48x48.png',
+    onClick: Compass.ErpApp.Widgets.Signup.addSignup,
+    about: 'This widget allows users to sign up.'
+});

data/app/widgets/signup/views/_signup_form.html.erb

@@ -1,34 +1,39 @@
-<%= form_remote_tag build_widget_url(:new), :success => "call_success" do %>
+<%= form_remote_tag build_widget_url(:new), :class => "form-signin", :style => 'max-width: 500px;' do %>
     <div class="form_settings">
-      <p>
-        <span> <%= label_tag :first_name,'First Name' %> </span>
-        <%= text_field_tag :first_name, params[:first_name] %>
-      </p>
-      <p>
-        <span> <%= label_tag :last_name, 'Last Name' %> </span>
-        <%= text_field_tag :last_name, params[:last_name] %>
-      </p>
-      <p>
-        <span> <%= label_tag :email, 'Email' %>  </span>
-        <%= text_field_tag :email, params[:email] %>
-      </p>
-      <p>
-        <span> <%= label_tag :username, 'Username' %> </span>
-        <%= text_field_tag :username, params[:username] %>
-      </p>
-      <p>
-        <span> <%= label_tag :password, 'Password'  %> </span>
-        <%= password_field_tag :password,  nil%>
-      </p>
-      <p>
-        <span> <%= label_tag :password_confirmation , 'Confirm Password' %>  </span>
-        <%= password_field_tag :password_confirmation, nil %>
-      </p>
-      <p style="padding-top: 15px">
-        <span>&nbsp;</span>
-        <%=  submit_tag "Sign Up", :disable_with => "Please wait...", :class => "submit", :style => 'margin: 0 0 0 0px;' %>
+
+      <div class="form-group">
+        <label for="first_name">Enter your name</label>
+        <%= text_field_tag :first_name, nil, :class => "form-control", :placeholder => "First Name", :required => true %>
+      </div>
+      <div class="form-group">
+
+        <%= text_field_tag :last_name, nil, :class => "form-control", :placeholder => "Last Name", :required => true %>
+      </div>
+
+      <div class="form-group">
+        <label for="email">Email</label>
+        <%= text_field_tag :email, params[:email], :class => "form-control", :placeholder => "Enter a valid email address", :required => true, :type => 'email' %>
+      </div>
+
+      <div class="form-group">
+        <label for="email">Create a user name to log on to the system</label>
+        <%= text_field_tag :username, params[:username], :class => "form-control", :placeholder => "Enter a username", :required => true %>
+      </div>
+
+      <div class="form-group">
+        <label for="password">Enter a password</label>
+        <%= password_field_tag :password, nil, :class => "form-control", :placeholder => "", :required => true %>
+      </div>
+
+      <div class="form-group">
+        <label for="password_confirmation">Confirm your password</label>
+        <%= password_field_tag :password_confirmation, nil, :class => "form-control", :placeholder => "", :required => true %>
+      </div>
+
+      <p class="text-center">
+        <%= submit_tag "Sign up", :disable_with => "Please wait...", :class => "btn btn-primary submit", :style => ''%>
       </p>
+
     </div>
     <input type="hidden" value="<%=@login_url%>" name="login_url" />
 <% end %>
- 

data/app/widgets/signup/views/error.html.erb

@@ -1,15 +1,15 @@
-<div class="sexyerror">
+<div class="alert alert-danger">
   <h2>There was an error.</h2>
-<%if !@user.errors.empty?%>
-  <h3>Please address the following issues</h3>
-<hr>
-  <ul>
-    <%  @user.errors.each do |attribute,error| %>
- 	<li class="error_text"><%=  attribute.to_s.capitalize %> : <%=  error %> </li>
-    <%end%>
-  </ul>
-<%end%>
+  <% if !@user.errors.empty? %>
+      <h3>Please address the following issues</h3>
+      <hr>
+      <ul>
+        <% @user.errors.each do |attribute, error| %>
+            <li class="error_text"><%= attribute.to_s.capitalize %> : <%= error %> </li>
+        <% end %>
+      </ul>
+  <% end %>
 </div>
-<br />
+<br/>
 <%= render "/signup_form" %>
 

data/app/widgets/signup/views/index.html.erb

@@ -1,3 +1,4 @@
-<div id="<%=widget_result_id%>">
+<div id="<%= widget_result_id %>">
   <%= render "/signup_form" %>
-</div>
+</div>
+

data/app/widgets/signup/views/layouts/base.html.erb

@@ -1,7 +1,10 @@
-<h2><%=h @website_section.title %></h2>
+<div style="margin-top:10px;" class="container">
+  <div class="row">
+    <div class="col-md-6 col-md-offset-3" style="margin: 0 auto;float:none;">
+      <h2><%= @website_section.title %></h2>
 
-<% @contents.each do |content| %>
-  <%=content.body_html %>
-<% end %>
+      <%= render_widget :signup, :params => {:login_url => "/login"} %>
 
-<%= render_widget :signup, :params => {:login_url => "/login"}%>
+    </div>
+  </div>
+</div>

data/app/widgets/signup/views/success.html.erb

@@ -1,4 +1,5 @@
-<div class="sexynotice">
-  <h1>Sign up Successful.</h1>
-  <p>You will receive an email at <%=@email%> to activate your account.</p>
-</div>
+<div class="alert alert-success">
+  <h2>Sign up Successful</h2>
+
+  <p>You will receive an email at <%= @email %> to activate your account</p>
+</div>

data/config/routes.rb

@@ -1,13 +1,14 @@
 Rails.application.routes.draw do
   filter :section_router
-  
-  get 'pages/:section_id' => 'knitkit/website_sections#index', :as => 'page'
+
+  get 'knitkit_mobile' => 'knitkit/mobile#index'
+  match 'pages/:section_id' => 'knitkit/website_sections#index', :as => 'page'
   get 'onlinedocumentsections/:section_id' => 'knitkit/online_document_sections#index', :as => 'document'
   #get 'onlinedocumentsections/:section_id/:id' => 'knitkit/online_document_sections#show', :as => 'document'
   get 'blogs/:section_id(.:format)' => 'knitkit/blogs#index', :as => 'blogs'
   get 'blogs/:section_id/:id' => 'knitkit/blogs#show', :as => 'blog_article'
   get 'blogs/:section_id/tag/:tag_id(.:format)' => 'knitkit/blogs#tag', :as => 'blog_tag'
-  
+
   match '/comments/add' => 'knitkit/comments#add', :as => 'comments'
   match '/unauthorized' => 'knitkit/unauthorized#index', :as => 'knitkit/unauthorized'
   match '/view_current_publication' => 'knitkit/base#view_current_publication'
@@ -17,29 +18,39 @@ end
 Knitkit::Engine.routes.draw do
   #Desktop Applications
   #knitkit
-  match '/erp_app/desktop/:action' => 'erp_app/desktop/app'
-  match '/erp_app/desktop/image_assets/:context/:action' => 'erp_app/desktop/image_assets'
-  match '/erp_app/desktop/file_assets/:context/:action' => 'erp_app/desktop/file_assets'
-  #article
-  match '/erp_app/desktop/articles/:action(/:section_id)' => 'erp_app/desktop/articles'
-  #content
-  match '/erp_app/desktop/content/:action' => 'erp_app/desktop/content'
-  #website
-  match '/erp_app/desktop/site(/:action)' => 'erp_app/desktop/website'
-  #section
-  match '/erp_app/desktop/section/:action' => 'erp_app/desktop/website_section'
-  #document
-  match '/erp_app/desktop/online_document_sections/:action' => 'erp_app/desktop/online_document_sections'
-  #theme
-  match '/erp_app/desktop/theme/:action' => 'erp_app/desktop/theme'
-  #versions
-  match '/erp_app/desktop/versions/:action' => 'erp_app/desktop/versions'
-  #comments
-  match '/erp_app/desktop/comments/:action(/:content_id)' => 'erp_app/desktop/comments'
-  #inquiries
-  match '/erp_app/desktop/inquiries/:action(/:website_id)' => 'erp_app/desktop/inquiries'
-  #website_nav
-  match '/erp_app/desktop/website_nav/:action' => 'erp_app/desktop/website_nav'
-  #position
-  match '/erp_app/desktop/position/:action' => 'erp_app/desktop/position'
+  namespace :erp_app do
+    namespace :desktop do
+
+      resources :inquiries
+      resources :website_nav
+      resources :website_nav_item do
+        member do
+          post :update_security
+        end
+      end
+      resources :website_host
+
+      match '/:action' => 'app'
+      match '/image_assets/:context/:action' => 'image_assets'
+      match '/file_assets/:context/:action' => 'file_assets'
+      #article
+      match '/articles/:action(/:section_id)' => 'articles'
+      #content
+      match '/content/:action' => 'content'
+      #websit
+      match '/site(/:action)' => 'website'
+      #section
+      match '/section/:action' => 'website_section'
+      #document
+      match '/online_document_sections/:action' => 'online_document_sections'
+      #theme
+      match '/theme/:action' => 'theme'
+      #version
+      match '/versions/:action' => 'versions'
+      #comment
+      match '/comments/:action(/:content_id)' => 'comments'
+      #position
+      match '/position/:action' => 'position'
+    end
+  end
 end

data/db/data_migrations/20120809020508_update_website_and_configuration.rb

@@ -71,6 +71,9 @@ class UpdateWebsiteAndConfiguration < ActiveRecord::Migration
 
       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')
+
+      # Added this to reload website columns into memory
+      Website.reset_column_information
     end
   end
 

data/db/migrate/20110211002317_setup_knitkit.rb

@@ -271,7 +271,6 @@ class SetupKnitkit < ActiveRecord::Migration
       t.string    :internal_identifier
       t.string    :description
       t.datetime  :document_date
-      t.text      :dynamic_attributes
 
       t.references :document_record, :polymorphic => true
       t.references :document_type

data/db/migrate/20131112013052_add_knitkit_missing_indexes.rb

@@ -0,0 +1,33 @@
+class AddKnitkitMissingIndexes < ActiveRecord::Migration
+  def up
+    if indexes(:websites).select { |index| index.name == 'websites_internal_identifier_idx' }.empty?
+      add_index :websites, :internal_identifier, :name => 'websites_internal_identifier_idx'
+      add_index :website_section_versions, :website_id, :name => 'website_section_versions_website_id_idx'
+      add_index :website_section_versions, :internal_identifier, :name => 'website_section_versions_internal_identifier_idx'
+      add_index :content_versions, :created_by_id, :name => 'content_versions_created_by_id_idx'
+      add_index :content_versions, :updated_by_id, :name => 'content_versions_updated_by_id_idx'
+      add_index :content_versions, :internal_identifier, :name => 'content_versions_internal_identifier_idx'
+      add_index :themes, :theme_id, :name => 'themes_theme_id_idx'
+      add_index :documented_items, :documented_content_id, :name => 'documented_items_documented_content_id_idx'
+      add_index :documented_items, :online_document_section_id, :name => 'documented_items_online_document_section_id_idx'
+      add_index :documents, :internal_identifier, :name => 'documents_internal_identifier_idx'
+      add_index :document_types, :internal_identifier, :name => 'document_types_internal_identifier_idx'
+    end
+  end
+
+  def down
+    unless indexes(:websites).select { |index| index.name == 'websites_internal_identifier_idx' }.empty?
+      remove_index :websites, :internal_identifier
+      remove_index :website_section_versions, :website_id
+      remove_index :website_section_versions, :internal_identifier
+      remove_index :content_versions, :created_by_id
+      remove_index :content_versions, :updated_by_id
+      remove_index :content_versions, :internal_identifier
+      remove_index :themes, :theme_id
+      remove_index :documented_items, :documented_content_id
+      remove_index :documented_items, :online_document_section_id
+      remove_index :documents, :internal_identifier
+      remove_index :document_types, :internal_identifier
+    end
+  end
+end

data/db/migrate/20140622212723_update_website_inquiries.rb

@@ -0,0 +1,22 @@
+class UpdateWebsiteInquiries < ActiveRecord::Migration
+  def up
+
+    add_column :website_inquiries, :first_name, :string
+    add_column :website_inquiries, :last_name, :string
+    add_column :website_inquiries, :email, :string
+    add_column :website_inquiries, :message, :text
+    add_column :website_inquiries, :created_by_id, :integer
+
+    add_index :website_inquiries, :created_by_id, :name => 'inquiry_created_by_idx'
+  end
+
+  def down
+
+    remove_column :website_inquiries, :first_name
+    remove_column :website_inquiries, :last_name
+    remove_column :website_inquiries, :email
+    remove_column :website_inquiries, :message
+    remove_column :website_inquiries, :created_by_id
+
+  end
+end

data/db/migrate/20140911185022_add_publishing_to_website.rb

@@ -0,0 +1,5 @@
+class AddPublishingToWebsite < ActiveRecord::Migration
+  def change
+    add_column :websites, :publishing, :boolean, :default => false
+  end
+end

data/db/migrate/20141013073349_add_custom_fields_to_documents.rb

@@ -0,0 +1,12 @@
+class AddCustomFieldsToDocuments < ActiveRecord::Migration
+  def change
+    if ::ActiveRecord::Base.connection.instance_values["config"][:adapter] == 'postgresql'
+      execute('CREATE EXTENSION IF NOT EXISTS hstore;')
+      
+      add_column :documents, :custom_fields, :hstore
+      add_hstore_index :documents, :custom_fields
+    else
+      add_column :documents, :custom_fields, :text
+    end
+  end
+end

data/db/migrate/20141016101936_upgrade_remove_dynamic_attributes.rb

@@ -0,0 +1,13 @@
+# This migration is for removing dynamic attributes column from documents table.
+class UpgradeRemoveDynamicAttributes < ActiveRecord::Migration
+  def up
+    if table_exists?(:documents)
+      if column_exists?(:documents, :dynamic_attributes)
+        remove_column :documents, :dynamic_attributes
+      end
+    end
+  end
+
+  def down
+  end
+end

data/lib/knitkit.rb

@@ -1,6 +1,5 @@
 #compass libraries
 require 'erp_app'
-require 'erp_forms'
 
 require 'routing_filter'
 require "knitkit/version"