knitkit 3.0.0 → 3.2.0

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

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

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

@@ -6,7 +6,7 @@
     <div class="form-group">
       <label for="new_password">New Password</label>
       <%= password_field_tag :new_password, '', :class => 'form-control', :required => true %>
-      <span>Password must be at least 8 characters long and start and end with a letter</span>
+      <span>Password must be between 8 and 20 characters with no spaces</span>
     </div>
     <div class="form-group">
       <label for="password_confirmation">Confirm Password</label>

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

@@ -15,36 +15,7 @@
       <label for="middle_name">Middle Name</label>
       <%= text_field_tag :middle_name, @individual.current_middle_name, :class => 'form-control' %>
     </div>
-    <div class="form-group">
-      <label for="birth_date">Date of Birth</label>
-      <%= text_field_tag :birth_date,
-                         (@individual.birth_date.nil? ? Date.today.strftime('%m/%d/%Y') : @individual.birth_date.strftime('%m/%d/%Y')),
-                         :class => 'form-control',
-                         :required => true %>
-    </div>
-    <div class="form-group">
-      <label>Gender</label>
-      <br/>
-      <div class="radio-inline">
-        <label>
-          <input type="radio" name="gender" id="male" <%= if @individual.gender == 'm' then 'checked=true' end %> value="m">
-          Male
-        </label>
-      </div>
-      <div class="radio-inline">
-        <label>
-          <input type="radio" name="gender" id="female" <%= if @individual.gender == 'f' then 'checked=true' end %> value="f">
-          Female
-        </label>
-      </div>
-    </div>
     <div class="form-group">
       <%= submit_tag "Submit", :disable_with => "Please wait...", :class => "btn btn-lg btn-primary btn-block" %>
     </div>
-<% end %>
-
-<script type="text/javascript">
-    jQuery('#birth_date').datepicker({
-        format: 'mm/dd/yyyy'
-    });
-</script>
+<% end %>

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

@@ -1,51 +1,53 @@
-<div id="<%= widget_result_id %>">
-  <% if @message %>
+<div class="manage-profile-widget">
+  <div id="<%= widget_result_id %>">
+    <% if @message %>
       <div class="alert alert-success">
         <%= @message %>
       </div>
-  <% end %>
-</div>
+    <% end %>
+  </div>
 
-<div class="panel-group" id="accordion">
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion" href="#userInformation">
-          User Information
-        </a>
-      </h4>
-    </div>
-    <div id="userInformation" class="panel-collapse collapse in">
-      <div class="panel-body">
-        <%= render :partial => '/user_information_form' %>
+  <div class="panel-group" id="accordion">
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a data-toggle="collapse" data-parent="#accordion" href="#userInformation">
+            <img style="padding-right:10px;" src="/assets/widgets/manage_profile/user_information.png"><span>User Information</span>
+          </a>
+        </h4>
       </div>
-    </div>
-  </div>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion" href="#password">
-          Password
-        </a>
-      </h4>
-    </div>
-    <div id="password" class="panel-collapse collapse">
-      <div class="panel-body">
-        <%= render :partial => '/password_form' %>
+      <div id="userInformation" class="panel-collapse collapse in">
+        <div class="panel-body">
+          <%= render :partial => '/user_information_form' %>
+        </div>
       </div>
     </div>
-  </div>
-  <div class="panel panel-default">
-    <div class="panel-heading">
-      <h4 class="panel-title">
-        <a data-toggle="collapse" data-parent="#accordion" href="#contactInformation">
-          Contact Information
-        </a>
-      </h4>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a data-toggle="collapse" data-parent="#accordion" href="#password">
+            <img style="padding-right:10px;" src="/assets/widgets/manage_profile/password.png"><span>Password</span>
+          </a>
+        </h4>
+      </div>
+      <div id="password" class="panel-collapse collapse">
+        <div class="panel-body">
+          <%= render :partial => '/password_form' %>
+        </div>
+      </div>
     </div>
-    <div id="contactInformation" class="panel-collapse collapse">
-      <div class="panel-body">
-        <%= render :partial => '/contact_information_form' %>
+    <div class="panel panel-default">
+      <div class="panel-heading">
+        <h4 class="panel-title">
+          <a data-toggle="collapse" data-parent="#accordion" href="#contactInformation">
+            <img style="padding-right:10px;" src="/assets/widgets/manage_profile/contact_information.png"><span>Contact Information</span>
+          </a>
+        </h4>
+      </div>
+      <div id="contactInformation" class="panel-collapse collapse">
+        <div class="panel-body">
+          <%= render :partial => '/contact_information_form' %>
+        </div>
       </div>
     </div>
   </div>

data/app/widgets/reset_password/base.rb

@@ -3,11 +3,41 @@ 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
+        @website = Website.find_by_host(request.host_with_port)
+        @reset_password_url = params[:reset_password_url] || '/reset-password'
+        @domain = @website.configurations.first.get_item(ConfigurationItemType.find_by_internal_identifier('primary_host')).options.first.value
 
-        render
+        if params[:token].present?
+          @token = params[:token].strip
+          @user = User.load_from_reset_password_token(params[:token])
+
+          if @user.blank?
+            render view: :invalid_reset_token
+          else
+            render view: :reset_password
+          end
+        else
+          render
+        end
+      end
+
+      def update_password
+        @login_url = params[:login_url].blank? ? '/login' : params[:login_url]
+        @token = params[:token].present? ? params[:token].strip : nil
+        @user = User.load_from_reset_password_token(@token)
+
+        if @user.blank?
+          render :update => {:id => "#{@uuid}_result", :view => :invalid_reset_token}
+        else
+          # the next line makes the password confirmation validation work
+          @user.password_confirmation = params[:password_confirmation].strip
+          # the next line clears the temporary token and updates the password
+          if @user.change_password!(params[:password].strip)
+            render :update => {:id => "#{@uuid}_result", :view => :reset_success}
+          else
+            render :update => {:id => "#{@uuid}_result", :view => :reset_password}
+          end
+        end
       end
 
       #should not be modified
@@ -27,14 +57,15 @@ module Widgets
 
         def base_layout
           begin
-            file = File.join(File.dirname(__FILE__),"/views/layouts/base.html.erb")
+            file = File.join(File.dirname(__FILE__), "/views/layouts/base.html.erb")
             IO.read(file)
           rescue
             return nil
           end
         end
       end
-    end
-  end
-end
+
+    end # Base
+  end # ResetPassword
+end # Widgets
 

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

@@ -8,7 +8,7 @@ Compass.ErpApp.Widgets.ResetPassword = {
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Reset Password',
-    iconUrl:'/images/icons/edit/edit_48x48.png',
+    iconUrl:'/assets/icons/reset_password/reset_password_48x48.png',
     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

@@ -1,5 +1,5 @@
-<div style="width:500px;" id="<%= widget_result_id %>"></div>
-<%= form_tag '/users/reset_password', :remote => true, :id => 'reset_password_form', :class => "form-signin", :style => 'max-width: 500px;' do %>
+<div id="<%= widget_result_id %>"></div>
+<%= form_tag '/users/reset_password', :remote => true, :id => 'reset_password_form', :class => "form-signin" do %>
     <input name="login" type="text" class="form-control" placeholder="Username / Email Address" required autofocus>
     <br/>
 
@@ -7,7 +7,7 @@
       <button class="btn btn-lg btn-primary btn-block" type="submit">Submit</button>
       <%= link_to 'Cancel', 'home' %>
     </p>
-    <input type="hidden" name="login_url" value="<%= @login_url %>"/>
+    <input type="hidden" name="reset_password_url" value="<%= @reset_password_url %>"/>
     <input type="hidden" name="domain" value="<%= @domain %>"/>
 <% end %>
 

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

@@ -0,0 +1,7 @@
+<div class="alert alert-danger">
+  <strong>Could not reset Password</strong>
+</div>
+
+<p>
+  Your password reset request looks invalid. Please try again.
+</p>

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

@@ -3,7 +3,7 @@
     <div class="col-md-6 col-md-offset-3" style="margin: 0 auto;float:none;">
       <h2><%= @website_section.title %></h2>
 
-      <%= render_widget :reset_password, :params => {:login_url => "/login"} %>
+      <%= render_widget :reset_password, :params => {:login_url => "/login", :reset_password_url => '/reset-password'} %>
 
     </div>
   </div>

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

@@ -0,0 +1,39 @@
+<% if @user && !@user.errors.empty? %>
+  <div class="alert alert-danger">
+    <h2>There was an error.</h2>
+
+    <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>
+  </div>
+<% end %>
+
+<div id="<%= widget_result_id %>">
+  <%= form_remote_tag build_widget_url(:update_password), :class => "form-update_password" do %>
+    <div class="form_settings">
+
+      <div class="form-group">
+        <label for="password">Enter a password</label>
+        <%= password_field_tag :password, nil, :class => "form-control", :placeholder => "", :required => true %>
+        <span>Password must be between 8 and 20 characters with no spaces</span>
+      </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 "Update Password", :disable_with => "Please wait...", :class => "btn btn-primary submit", :style => '' %>
+      </p>
+
+      <input type="hidden" value="<%= @token %>" name="token"/>
+      <input type="hidden" value="<%= @login_url %>" name="login_url"/>
+
+    </div>
+  <% end %>
+</div>

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

@@ -0,0 +1,5 @@
+
+  <div class="alert alert-success">
+    <h3>Success</h3>
+  </div>
+  <p>Your password has successfully been reset. Please <a href="<%= @login_url %>">Login</a></p>

data/app/widgets/search/base.rb

@@ -6,12 +6,12 @@ module Widgets
       include WillPaginate::ActionView
 
       def index
-        @section_unique_name = params[:section_unique_name]
+        @section_unique_name = params[:section_to_search]
         @content_type = params[:content_type]
-        @search_url = params[:search_url]
+        @results_permalink = params[:results_permalink]
         @per_page = params[:per_page] || 10
-        @redirect_results = params[:redirect_results] || false
-        @inline = params[:inline]
+        @redirect_results = params[:redirect_results]
+        @inline = !@results_permalink.blank?
         @results = nil
 
         if params[:query].present?
@@ -25,7 +25,7 @@ module Widgets
       end
 
       def search
-        @query = params[:query].strip
+        @query = params[:search_query].strip
         @content_type = params[:content_type]
         @section_unique_name = params[:section_unique_name]
         @per_page = params[:per_page]

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

@@ -2,18 +2,18 @@ Compass.ErpApp.Widgets.Search = {
     template: new Ext.Template(
         "<% #Optional Parameters:\n",
         "   # content_type: Leave blank to search all section types, set to Blog to only search Blog articles\n",
-        "   # section_permalink: This is the permalink value for the section \n",
-        "   #                    Useful if you only want to search articles within a single Blog section\n",
+        "   # section_to_search: If set will only search for content within the specified section.  Set using a sections internal_identifier. \n",
         "   # results_permalink: How do you want your results to display? via ajax? or on a new page?\n",
         "   #                    Leave blank if you want results to display via ajax on the same page as the search form\n",
         "   #                    Enter the permalink of results page if you want the search results to display on a new page\n",
         "   # per_page: Number of results per page \n",
-        "   # class: CSS class for the form %>\n",
+        "   # class: CSS class for the form \n",
+        "%>\n",
         "<%= render_widget :search, \n",
         "                  :action => get_widget_action,\n",
         "                  :params => set_widget_params({\n",
         "                               :content_type => '',\n",
-        "                               :section_permalink => '',\n",
+        "                               :section_to_search => '',\n",
         "                               :results_permalink => '',\n",
         "                               :per_page => 20,\n",
         "                               :class => ''}) %>\n"
@@ -22,11 +22,11 @@ Compass.ErpApp.Widgets.Search = {
     addSearch:function(){
         Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.Search.template.apply());
     }
-}
+};
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Search',
-    iconUrl:'/images/icons/search/search_48x48.png',
+    iconUrl:'/assets/icons/search/search_48x48.png',
     onClick:Compass.ErpApp.Widgets.Search.addSearch,
     about:'This widget allows users to search for content in a website.'
 });

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

@@ -1,12 +1,23 @@
-<%= form_tag @search_url, :class => "form-inline" do %>
-    <div class="form-group">
-      <%= label_tag :search_for, 'Search For', :class => "sr-only" %>
-      <%= text_field_tag :query, @query, class: 'form-control', required: true %>
-    </div>
-
-    <%= hidden_field_tag :section_unique_name, @section_unique_name %>
-    <%= hidden_field_tag :content_type, @content_type %>
-    <%= hidden_field_tag :per_page, @per_page %>
-
-    <%= submit_tag "Search", :disable_with => "Please wait...", :class => "btn btn-primary submit" %>
-<% end %>
+<div class="col-md-2 pull-right">
+  <!-- this should not be necessary. aren't glyphicons included in  -->
+
+    <%= form_tag '/search-results', :class => "inline-search-header" do %>
+        <div class="input-group">
+
+            <%= text_field_tag :search_query, @query, class: 'form-control', size: 25, required: true, placeholder: 'Search site...' %>
+
+
+            <%= hidden_field_tag :section_unique_name, @section_unique_name %>
+            <%= hidden_field_tag :content_type, @content_type %>
+            <%= hidden_field_tag :per_page, @per_page %>
+
+            <span class="input-group-btn">
+                <button type="submit" class="btn btn-default">
+                  <span class="glyphicon glyphicon-search"></span>
+                </button>
+            </span>
+        </div>
+    <% end %>
+</div>
+
+

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

@@ -1,41 +1,45 @@
 <%= form_tag (@redirect_results ? @search_url : build_widget_url(:search)), :remote => !@redirect_results do %>
-    <div class="form-group">
-      <%= label_tag :search_for, 'Search For' %>
-      <%= text_field_tag :query, @query, class: 'form-control', required: true %>
-    </div>
+  <div class="form-group">
+    <%= label_tag :search_for, 'Search For' %>
+    <%= text_field_tag :search_query, @query, class: 'form-control', required: true %>
+  </div>
 
-    <%= hidden_field_tag :section_unique_name, @section_unique_name %>
-    <%= hidden_field_tag :content_type, @content_type %>
-    <%= hidden_field_tag :per_page, @per_page %>
+  <%= hidden_field_tag :section_unique_name, @section_unique_name %>
+  <%= hidden_field_tag :content_type, @content_type %>
+  <%= hidden_field_tag :per_page, @per_page %>
 
-    <p class="form-group">
-      <%= submit_tag "Search", :disable_with => "Please wait...", :class => "btn btn-primary submit" %>
-    </p>
+  <p class="form-group">
+    <%= submit_tag "Search", :disable_with => "Please wait...", :class => "btn btn-primary submit" %>
+  </p>
 <% end %>
 <br/>
 <div id="<%= widget_result_id %>">
   <% if @results %>
+    <% if @results.count == 0 %>
+      <h2>No Results</h2>
+    <% else %>
       <% @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>
+        <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
-                        }
-      %>
+    <% 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
+                      }
+    %>
   <% end %>
 </div>