knitkit 2.1.15 → 3.0.0

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

@@ -1,34 +1,50 @@
-  <%= 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 %>
-      </p>
-      <p>
-        <span>Last Name</span>
-        <%= text_field_tag :last_name, @individual.current_last_name %>
-      </p>
-      <p>
-        <span>Middle Name</span>
-        <%= text_field_tag :middle_name, @individual.current_middle_name %>
-      </p>
-      <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},
-						{:style => 'width: auto;'}) %>
-      </p>
-      <p>
-        <span>Gender</span>
-        <%= select_tag(:gender, options_for_select([['M', 'm'], ['F', 'f']], @individual.gender), {:style => 'width: auto;'})%>
-      </p>
-      <p style="padding-top: 15px">
-        <%=  submit_tag "Submit", :disable_with => "Please wait...", :class => "submit", :style => "margin: 0 0 0 120px;" %>
-        <input type="reset" class="submit" value="Reset" style="margin-left: 0;" />
-      </p>
+<%= form_tag build_widget_url(:update_user_information), :remote => true, :id => 'user_information_form', :role => 'form' do %>
+    <div class="form-group">
+      <label for="email">Email Address</label>
+      <%= text_field_tag :email, @user.email, :class => 'form-control', :required => true %>
     </div>
-  <% end %>
+    <div class="form-group">
+      <label for="first_name">First Name</label>
+      <%= text_field_tag :first_name, @individual.current_first_name, :class => 'form-control', :required => true %>
+    </div>
+    <div class="form-group">
+      <label for="last_name">Last Name</label>
+      <%= text_field_tag :last_name, @individual.current_last_name, :class => 'form-control', :required => true %>
+    </div>
+    <div class="form-group">
+      <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>

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

@@ -0,0 +1,6 @@
+<div class="alert alert-danger">
+  <strong>There was an error:</strong>
+  <%= @message %>
+  <button type="button" class="close" data-dismiss="alert">&times;</button>
+</div>
+

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

@@ -1,54 +1,52 @@
 <div id="<%= widget_result_id %>">
   <% if @message %>
-    <div class="<%=@message_cls || 'sexynotice'%>">
-      <%= @message %>
-    </div>
+      <div class="alert alert-success">
+        <%= @message %>
+      </div>
   <% end %>
-  <div>
-
-    <!-- *************************************** Update User Information ************************************* -->
-
-    <a href="#" onclick="var state = document.getElementById('user_info_hide_show').style.display;
-            if (state == 'block') {
-                    document.getElementById('user_info_hide_show').style.display = 'none';
-                    } else {
-                    document.getElementById('user_info_hide_show').style.display = 'block';
-                    }
-            return false;
-    "><h2 style="border-width: 0px 0px 1px; border-style: solid;">User Information</h2></a>
-
-    <div id="user_info_hide_show">
-      <%= render :partial => '/user_information_form' %>
+</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>
-
-    <!-- *************************************** Update Password ************************************* -->
-
-    <a href="#" onclick="var state = document.getElementById('password_hide_show').style.display;
-            if (state == 'block') {
-                    document.getElementById('password_hide_show').style.display = 'none';
-                    } else {
-                    document.getElementById('password_hide_show').style.display = 'block';
-                    }
-            return false;
-    "><h2 style="border-width: 0px 0px 1px; border-style: solid;">Password</h2></a>
-
-    <div id="password_hide_show" style="display: none;">
-      <%= render :partial => '/password_form' %>
+    <div id="userInformation" class="panel-collapse collapse in">
+      <div class="panel-body">
+        <%= render :partial => '/user_information_form' %>
+      </div>
     </div>
-
-    <!-- *************************************** Update Contact Information ************************************* -->
-
-    <a href="#" onclick="var state = document.getElementById('contact_info_hide_show').style.display;
-            if (state == 'block') {
-                    document.getElementById('contact_info_hide_show').style.display = 'none';
-                    } else {
-                    document.getElementById('contact_info_hide_show').style.display = 'block';
-                    }
-            return false;
-    "><h2 style="border-width: 0px 0px 1px; border-style: solid;">Contact Information</h2></a>
-
-    <div id="contact_info_hide_show" style="display: none;">
-      <%= render :partial => '/contact_information_form' %>
+  </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>
+    </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>
+    <div id="contactInformation" class="panel-collapse collapse">
+      <div class="panel-body">
+        <%= render :partial => '/contact_information_form' %>
+      </div>
     </div>
   </div>
 </div>

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

@@ -1 +1,3 @@
-<%= render_widget :manage_profile %>
+<div class="container" style="margin-top:10px;">
+  <%= render_widget :manage_profile %>
+</div>

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

@@ -0,0 +1,5 @@
+<div class="alert alert-success">
+  <strong>Success!</strong>
+  <%= @message %>
+  <button type="button" class="close" data-dismiss="alert">&times;</button>
+</div>

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

@@ -1,32 +1,37 @@
-<div id="<%=widget_result_id%>"></div>
-<div>
-  <%= form_tag '/users/reset_password', :remote => true, :id => 'reset_password_form' do %>
-    <div class="form_settings">
-      <p>
-        <span style="width:175px">Email Address</span>
-        <%= 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;'%>
-      </p>
-    </div>
-  <% end %>
-</div>
-<script type="text/javascript">
-jQuery('#reset_password_form').bind('ajaxComplete', function(e, xhr, settings){
-  var response = jQuery.parseJSON(xhr.responseText);
-  if(response.success){
-    jQuery('#<%=widget_result_id%>').html('<div class="sexynotice">'+response.message+'</div>');
-  }
-  else{
-    jQuery('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.message+'</div>');
-  }
-});
-</script>
+<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 %>
+    <input name="login" type="text" class="form-control" placeholder="Username / Email Address" required autofocus>
+    <br/>
 
+    <p class="text-center">
+      <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="domain" value="<%= @domain %>"/>
+<% end %>
 
+<script type="text/javascript">
+    jQuery('#reset_password_form').bind('ajax:success', function (e, response) {
+        var html = '';
 
+        if (response.success) {
+            html = [
+                '<div class="alert alert-success" >',
+                '<button type="button" class="close" data-dismiss="alert">&times;</button>',
+                response.message,
+                '</div>'
+            ].join('');
+        }
+        else {
+            html = [
+                '<div class="alert alert-danger" >',
+                '<button type="button" class="close" data-dismiss="alert">&times;</button>',
+                response.message,
+                '</div>'
+            ].join('');
+        }
 
+        jQuery('#<%=widget_result_id%>').html(html);
+    });
+</script>

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

@@ -1 +1,10 @@
-<%= render_widget :reset_password, :params => {:login_url => "/login"}%>
+<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>
+
+      <%= render_widget :reset_password, :params => {:login_url => "/login"} %>
+
+    </div>
+  </div>
+</div>

data/app/widgets/search/base.rb

@@ -5,40 +5,35 @@ module Widgets
       include Rails.application.routes.url_helpers
       include WillPaginate::ActionView
 
-      def set_variables
-        @results_permalink = params[:results_permalink]
-        @section_permalink = params[:section_permalink]
+      def index
+        @section_unique_name = params[:section_unique_name]
         @content_type = params[:content_type]
-        @per_page = params[:per_page]
-        @css_class = params[:class]
+        @search_url = params[:search_url]
+        @per_page = params[:per_page] || 10
+        @redirect_results = params[:redirect_results] || false
+        @inline = params[:inline]
+        @results = nil
 
-        if @results_permalink.nil? or @results_permalink.blank?
-          @ajax_results = true
-        else
-          @ajax_results = false
+        if params[:query].present?
+          query = params[:query].strip
+          page = params[:page] || 1
+
+          @results = self.perform_search(query, @content_type, @section_unique_name, @per_page, page)
         end
-      end
 
-      def index
-        set_variables
         render
       end
 
-      def new
-        set_variables
-        @website = Website.find_by_host(request.host_with_port)
+      def search
+        @query = params[:query].strip
+        @content_type = params[:content_type]
+        @section_unique_name = params[:section_unique_name]
+        @per_page = params[:per_page]
+        page = params[:page] || 1
 
-        options = {
-          :website_id => @website.id,
-          :query => params[:query],
-          :content_type => params[:content_type],
-          :section_permalink => params[:section_permalink],
-          :page => (params[:page] || 1),
-          :per_page => (params[:per_page] || 20)
-        }
-        @results = Content.do_search(options)
+        @results = self.perform_search(@query, @content_type, @section_unique_name, @per_page, page)
 
-        if @ajax_results
+        if request.xhr?
           render :update => {:id => "#{@uuid}_result", :view => :show}
         else
           render :view => :show
@@ -70,6 +65,23 @@ module Widgets
         end
       end
 
+      protected
+
+      def perform_search(query, content_type, section_unique_name, per_page, page)
+        website = Website.find_by_host(request.host_with_port)
+
+        options = {
+            :website_id => website.id,
+            :section_unique_name => section_unique_name,
+            :query => query,
+            :content_type => content_type,
+            :page => page,
+            :per_page => per_page
+        }
+
+        Content.do_search(options)
+      end
+
     end
   end
 end

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

@@ -0,0 +1,12 @@
+<%= 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 %>

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

@@ -0,0 +1,41 @@
+<%= 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>
+
+    <%= 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>
+<% end %>
+<br/>
+<div id="<%= widget_result_id %>">
+  <% if @results %>
+      <% @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
+                        }
+      %>
+  <% end %>
+</div>

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

@@ -1,3 +1,5 @@
-<p>
-  <%=render :partial => '/search' %>
-</p>
+<% if @inline %>
+    <%= render :partial => 'inline_search_form' %>
+<% else %>
+    <%= render :partial => 'search_form' %>
+<% end %>

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

@@ -1,24 +1,14 @@
-<h2><%=h @website_section.title %></h2>
+<div style="margin-top:10px;" class="container">
+  <h2><%= @website_section.title %></h2>
 
-<% @contents.each do |content| %>
-  <%=raw content.body_html %>
-<% end %>
-  
-<% #Optional Parameters:
- # content_type: Leave blank to search all section types, set to Blog to only search Blog articles
- # section_permalink: This is the permalink value for the section
- #                    Useful if you only want to search articles within a single Blog section
- # results_permalink: How do you want your results to display? via ajax? or on a new page?
- #                    Leave blank if you want results to display via ajax on the same page as the search form
- #                    Enter the permalink of results page if you want the search results to display on a new page
- # per_page: Number of results per page 
- # class: CSS class for the form %>
-<%= render_widget :search,
-                  :action => get_widget_action,
-                  :params => set_widget_params({
-                               :content_type => '',
-                               :section_permalink => '',
-                               :results_permalink => '',
-                               :per_page => 20,
-                               :class => ''
-                    }) %>
+  <% #Optional Parameters:
+     # content_type: Leave blank to search all section types, set to Blog to only search Blog articles
+     # section_unique_name: Leave blank to search all pages if passed will confine search to a particular
+     #  pages content
+     # search_url: Main search url, only needed if results are being redirected
+     # redirect_results: If true will redirect to search page to display results.  Used for inline search
+     #   boxes
+     # per_page: Number of results per page
+  %>
+  <%= render_widget :search %>
+</div>