knitkit 2.0.0 → 2.0.1

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

@@ -21,13 +21,13 @@
   <% end %>
 </div>
 <script type="text/javascript">
-$('#login_form').bind('ajaxComplete', function(e, xhr, settings){
+jQuery('#login_form').bind('ajaxComplete', function(e, xhr, settings){
   var response = jQuery.parseJSON(xhr.responseText);
   if(response.success){
-    window.location = '<%=@login_to%>';
+    window.location = response.login_to;
   }
   else{
-    $('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.errors.reason+'</div>');
+    jQuery('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.errors.reason+'</div>');
   }
 });
 </script>

data/app/widgets/login/views/reset_password.html.erb

@@ -15,9 +15,9 @@
   <% end %>
 </div>
 <script type="text/javascript">
-$('#login_form').bind('ajaxComplete', function(e, xhr, settings){
+jQuery('#login_form').bind('ajaxComplete', function(e, xhr, settings){
   var response = jQuery.parseJSON(xhr.responseText);
-  $('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.message+'</div>');
+  jQuery('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.message+'</div>');
 });
 </script>
 

data/app/widgets/manage_profile/base.rb

@@ -20,7 +20,7 @@ module Widgets
         @email_addresses = @user.party.find_all_contacts_by_contact_mechanism(EmailAddress)
         @phone_numbers = @user.party.find_all_contacts_by_contact_mechanism(PhoneNumber)
         @postal_addresses = @user.party.find_all_contacts_by_contact_mechanism(PostalAddress)
-    
+
         contact_purposes = ContactPurpose.all
         @purpose_hash={"Type" => "type"}
         contact_purposes.each do |p|
@@ -33,23 +33,23 @@ module Widgets
       	countries.each do |c|
       	  @countries_id << [c.name, c.id]
       	end
-	
+
       	states= GeoZone.all
       	@states_id=[]
       	@states_id << ["State", "default"]
       	states.each do |s|
       	  @states_id << [s.zone_name, s.id]
       	end
-    
+
         render
       end
-  
+
       def update_user_information
         #### Get appropriate models ####
-    
+
         @user=User.find(current_user)
         @individual= @user.party.business_party
-    
+
         #### Formating the date for sqlite. Will probably need diffrent formating for production ####
         if params[:date][:day].to_i < 10
           day="0#{params[:date][:day]}"
@@ -62,33 +62,16 @@ module Widgets
         else
           month= params[:date][:month]
         end
-    
+
         formated_date= "#{params[:date][:year]}-#{month}-#{day}"
-    
-    
-        #### Check if user made changes to info then update ####
-        if @individual.current_first_name != params[:first_name]
-          @user.first_name= params[:first_name]
-          @individual.current_first_name= params[:first_name]
-        end
-    
-        if @individual.current_last_name != params[:last_name]
-          @user.last_name= params[:last_name]
-          @individual.current_last_name= params[:last_name]
-        end
-    
-        if @individual.current_middle_name != params[:middle_name]
-          @individual.current_middle_name= params[:middle_name]
-        end
-    
-        if @individual.gender != params[:gender]
-          @individual.gender= params[:gender]
-        end
-    
-        if @individual.birth_date != formated_date
-          @individual.birth_date= formated_date
-        end
-    
+
+        @individual.current_first_name= params[:first_name]
+        @individual.current_last_name= params[:last_name]
+        @individual.current_middle_name= params[:middle_name]
+        @individual.gender= params[:gender]
+        @individual.birth_date= formated_date
+        @user.email = params[:email]
+
         #### check validation then save and render message ####
         if @user.changed? || @individual.changed?
           if @user.valid? && @individual.valid?
@@ -103,21 +86,21 @@ module Widgets
         end
 
       end
-  
+
 
       def update_password
         if @user = User.authenticate(current_user.username, params[:old_password])
           if !params[:new_password].blank? && !params[:password_confirmation].blank? && params[:new_password] == params[:password_confirmation]
-      		
+
             @user.password_confirmation= params[:password_confirmation]
-      
+
             if @user.change_password!(params[:new_password])
               render :update => {:id => "#{@uuid}_result", :view => :password_success}
             else
               #### validation failed ####
               render :update => {:id => "#{@uuid}_result", :view => :error}
             end
-        
+
           else
             #### password and password confirmation cant be blank or unequal ####
             render :update => {:id => "#{@uuid}_result", :view => :password_blank}
@@ -126,9 +109,9 @@ module Widgets
           #### old password wrong ####
           render :update => {:id => "#{@uuid}_result", :view => :password_invalid}
         end
-      
+
       end
-  
+
       def update_contact_information
         @user= User.find(current_user)
         @email_addresses= @user.party.find_all_contacts_by_contact_mechanism(EmailAddress)
@@ -137,7 +120,7 @@ module Widgets
         something_changed=false
         contact_type_in_use=false
         default_type_error=false
-    
+
         #### Updates email records ####
         @email_addresses.each_with_index do |e, i|
           email_address_args={}
@@ -149,7 +132,7 @@ module Widgets
             something_changed=true
           end
         end
-    
+
         #### Updates Phone Numbers ####
         @phone_numbers.each_with_index do |p, i|
           phone_number_args={}
@@ -161,37 +144,37 @@ module Widgets
             something_changed=true
           end
         end
-    
+
         #### Updates Postal Addresses
         @postal_addresses.each_with_index do |a, i|
           postal_address_args= {}
-      
+
           if a.address_line_1 != params[:postal_addresses][i.to_s][:address_line_1]
             postal_address_args[:address_line_1]= params[:postal_addresses][i.to_s][:address_line_1]
           end
-      
+
           if a.address_line_2 != params[:postal_addresses][i.to_s][:address_line_2]
             postal_address_args[:address_line_2]= params[:postal_addresses][i.to_s][:address_line_2]
           end
-      
+
           if a.city != params[:postal_addresses][i.to_s][:city]
             postal_address_args[:city]= params[:postal_addresses][i.to_s][:city]
           end
-      
+
           if a.geo_zone_id != params[:postal_addresses][i.to_s][:state_id].to_i
             postal_address_args[:geo_zone_id]= params[:postal_addresses][i.to_s][:state_id].to_i
             postal_address_args[:state]= GeoZone.find(params[:postal_addresses][i.to_s][:state_id]).zone_name
           end
-      
+
           if a.zip != params[:postal_addresses][i.to_s][:zip]
             postal_address_args[:zip]= params[:postal_addresses][i.to_s][:zip]
           end
-      
+
           if a.geo_country_id != params[:postal_addresses][i.to_s][:country_id].to_i
             postal_address_args[:geo_country_id]= params[:postal_addresses][i.to_s][:country_id].to_i
             postal_address_args[:country]= GeoCountry.find(params[:postal_addresses][i.to_s][:country_id]).name
           end
-      
+
           if !postal_address_args.empty?
             @user.party.update_or_add_contact_with_purpose(PostalAddress,
               ContactPurpose.find_by_internal_identifier(params[:postal_address_contact_purposes][i.to_s]),
@@ -199,7 +182,7 @@ module Widgets
             something_changed=true
           end
         end
-    
+
         #### Adds new email address ####
         if params[:new_email_address] != nil && params[:new_email_address] != ""
           if params[:new_email_address_contact_purpose] != "type"
@@ -217,7 +200,7 @@ module Widgets
             #render :view => :default_type_error
           end
         end
-    
+
         #### Adds new phone number ####
         if params[:new_phone_number] != nil && params[:new_phone_number] != ""
           if params[:new_phone_number_contact_purpose] != "type"
@@ -235,41 +218,41 @@ module Widgets
             #render :view => :default_type_error
           end
         end
-    
+
         #### Adds new postal address ####
         new_postal_address_args= {}
-      
+
         if params[:new_postal_address][:address_line_1] != "Address Line 1"
           new_postal_address_args[:address_line_1]= params[:new_postal_address][:address_line_1]
         end
-      
+
         if params[:new_postal_address][:address_line_2] != "Address Line 2"
           new_postal_address_args[:address_line_2]= params[:new_postal_address][:address_line_2]
         end
-      
+
         if params[:new_postal_address][:city] != "City"
           new_postal_address_args[:city]= params[:new_postal_address][:city]
         end
-      
+
         if params[:new_postal_address][:state_id] != "default"
           new_postal_address_args[:geo_zone_id]= params[:new_postal_address][:state_id].to_i
           new_postal_address_args[:state]= GeoZone.find(params[:new_postal_address][:state_id]).zone_name
         end
-      
+
         if params[:new_postal_address][:zip] != "Zipcode"
           new_postal_address_args[:zip]= params[:new_postal_address][:zip]
         end
-      
+
         if params[:new_postal_address][:country_id] != "default"
           new_postal_address_args[:geo_country_id]= params[:new_postal_address][:country_id].to_i
           new_postal_address_args[:country]= GeoCountry.find(params[:new_postal_address][:country_id]).name
         end
-      
+
         if !new_postal_address_args.empty?
           if params[:new_postal_address_contact_purpose] != "type"
             if !contact_purpose_in_use?(@postal_addresses, params[:new_postal_address_contact_purpose])
               @user.party.update_or_add_contact_with_purpose(PostalAddress,
-              	ContactPurpose.find_by_internal_identifier(params[:new_postal_address_contact_purpose]), 
+              	ContactPurpose.find_by_internal_identifier(params[:new_postal_address_contact_purpose]),
               	new_postal_address_args)
               something_changed=true
             else
@@ -281,7 +264,7 @@ module Widgets
             #render :view => :default_type_error
           end
         end
-    
+
         #### Renders proper error or success message ####
         if default_type_error
           render :update => {:id => "#{@uuid}_result", :view => :default_type_error}
@@ -290,7 +273,7 @@ module Widgets
         else
           render :update => {:id => "#{@uuid}_result", :view => :success}
         end
-    
+
       end
 
       #should not be modified
@@ -298,20 +281,16 @@ module Widgets
       def locate
         File.dirname(__FILE__)
       end
-        
+
       class << self
         def title
           "Manage Profile"
         end
 
-        def views_location
-          File.join(File.dirname(__FILE__),"/views")
-        end
-          
         def widget_name
           File.basename(File.dirname(__FILE__))
         end
-          
+
         def base_layout
           begin
             file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")

data/app/widgets/manage_profile/javascript/manage_profile.js

@@ -7,5 +7,6 @@ Compass.ErpApp.Widgets.ManageProfile = {
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Manage Profile',
     iconUrl:'/images/icons/document_edit/document_edit_48x48.png',
-    onClick:Compass.ErpApp.Widgets.ManageProfile.addManageProfile
+    onClick:Compass.ErpApp.Widgets.ManageProfile.addManageProfile,
+    about:'This widget allows users to manger thier user information, password and contact information.'
 });

data/app/widgets/manage_profile/views/_user_information_form.html.erb

@@ -1,5 +1,9 @@
   <%= form_tag build_widget_url(:update_user_information), :remote => true, :html => {:id => 'user_information_form'} do %>
     <div class="form_settings" style="margin-left: 20px;">
+      <p>
+        <span>Email Address</span>
+        <%= text_field_tag :email, @user.email %>
+      </p>
       <p>
         <span>First Name</span>
         <%= text_field_tag :first_name, @individual.current_first_name %>
@@ -15,7 +19,7 @@
       <p>
         <span>Date of Birth</span>
 		<!--find a better solution for styling this. this method cant be overridden easily by a template -->
-        <%= select_date(@individual.birth_date, {:start_year => Time.now.year - 100, :end_year => Time.now.year}, 
+        <%= select_date(@individual.birth_date, {:start_year => Time.now.year - 100, :end_year => Time.now.year},
 						{:style => 'width: auto;'}) %>
       </p>
       <p>

data/app/widgets/reset_password/base.rb

@@ -3,7 +3,9 @@ module Widgets
     class Base < ErpApp::Widgets::Base
 
       def index
+        @website   = Website.find_by_host(request.host_with_port)
         @login_url = params[:login_url]
+        @domain    = @website.configurations.first.get_item(ConfigurationItemType.find_by_internal_identifier('primary_host')).options.first.value
 
         render
       end
@@ -13,20 +15,16 @@ module Widgets
       def locate
         File.dirname(__FILE__)
       end
-        
+
       class << self
         def title
           "Reset Password"
         end
 
-        def views_location
-          File.join(File.dirname(__FILE__),"/views")
-        end
-          
         def widget_name
           File.basename(File.dirname(__FILE__))
         end
-          
+
         def base_layout
           begin
             file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")

data/app/widgets/reset_password/javascript/reset_password.js

@@ -7,7 +7,8 @@ Compass.ErpApp.Widgets.ResetPassword = {
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Reset Password',
     iconUrl:'/images/icons/edit/edit_48x48.png',
-    onClick:Compass.ErpApp.Widgets.ResetPassword.addResetPassword
+    onClick:Compass.ErpApp.Widgets.ResetPassword.addResetPassword,
+    about:"This widget creates a form to submit for a user's password to be reset."
 });
 
 

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

@@ -7,6 +7,7 @@
         <%= text_field_tag "login"%>
       </p>
       <input type="hidden" name="login_url" value="<%=@login_url%>" />
+      <input type="hidden" name="domain" value="<%=@domain%>" />
       <p style="padding-top: 15px">
         <span style="width:175px">&nbsp;</span>
         <%= submit_tag "Reset", :disable_with => "Please wait...", :class => "submit", :style => 'margin: 0 0 0 0px;'%>
@@ -15,13 +16,13 @@
   <% end %>
 </div>
 <script type="text/javascript">
-$('#reset_password_form').bind('ajaxComplete', function(e, xhr, settings){
+jQuery('#reset_password_form').bind('ajaxComplete', function(e, xhr, settings){
   var response = jQuery.parseJSON(xhr.responseText);
   if(response.success){
-    $('#<%=widget_result_id%>').html('<div class="sexynotice">'+response.message+'</div>');
+    jQuery('#<%=widget_result_id%>').html('<div class="sexynotice">'+response.message+'</div>');
   }
   else{
-    $('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.message+'</div>');
+    jQuery('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.message+'</div>');
   }
 });
 </script>

data/app/widgets/search/base.rb

@@ -55,11 +55,7 @@ module Widgets
         def title
           "Search"
         end
-
-        def views_location
-          File.join(File.dirname(__FILE__),"/views")
-        end
-          
+        
         def widget_name
           File.basename(File.dirname(__FILE__))
         end

data/app/widgets/search/javascript/search.js

@@ -27,5 +27,6 @@ Compass.ErpApp.Widgets.Search = {
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Search',
     iconUrl:'/images/icons/search/search_48x48.png',
-    onClick:Compass.ErpApp.Widgets.Search.addSearch
+    onClick:Compass.ErpApp.Widgets.Search.addSearch,
+    about:'This widget allows users to search for content in a website.'
 });

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

@@ -6,7 +6,7 @@
 
 <% @results.each do |r| %>
 <p>
-  <a href="/<%=r[:link] %>"><%= r[:title] %></a><br />
+  <a href="<%=r[:link] %>"><%= r[:title] %></a><br />
   <%= raw r[:content].body_html[0..100] unless r[:content].body_html.nil? %><br />
 </p>
 <% end %>
@@ -42,7 +42,7 @@
 <% if @ajax_results %>  
 <script type="text/javascript">
 $(function(){
-  $('.pagination a').attr('data-remote', 'true'); 
+  jQuery('.pagination a').attr('data-remote', 'true'); 
 });
 </script>
 <% end %>