RubyGems - knitkit - Versions diffs - 2.1.15 → 3.0.0 - Mend

knitkit 2.1.15 → 3.0.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (209) hide show

data/app/views/website_inquiry_mailer/inquiry.erb CHANGED

@@ -1,3 +1,24 @@
-<% @website_inquiry.data.sorted_dynamic_attributes(:use_label => true).each do |k,v| -%>
-<%=k %>: <%=v %>
+<!DOCTYPE html>
+<html>
+<head>
+  <meta content="text/html; charset=UTF-8" http-equiv="Content-Type"/>
+</head>
+<body>
+<h1><%= @website_inquiry.website.title %> Inquiry</h1>
+<h3>
+    There has been an inquiry.
+</h3>
+<span>First Name: </span><span><%= @website_inquiry.first_name %></span>
+<br/>
+<span>Last Name: </span><span><%= @website_inquiry.last_name %></span>
+<br/>
+<span>Email: </span><span><%= @website_inquiry.email %></span>
+<% if @website_inquiry.created_by %>
+    <br/>
+    <span>Username: </span><span><%= @website_inquiry.created_by.username %></span>
 <% end %>
+<br/>
+<br/>
+<p><%= @website_inquiry.message %></p>
+</body>
+</html>

data/app/widgets/contact_us/base.rb CHANGED

@@ -4,55 +4,30 @@ module Widgets
       include ActionView::Helpers::SanitizeHelper
       def index
-        @use_dynamic_form = params[:use_dynamic_form]
         render
       end
       def new
-        @is_html_form = params[:is_html_form]
-        @validation = {}
-        @validation[:first_name] = "First Name Cannot be Blank" if params[:first_name].blank?
-        @validation[:last_name] = "Last Name Cannot be Blank" if params[:last_name].blank?
-        @validation[:message] = "Message Cannot be Blank" if params[:message].blank?
-        @validation[:email] = "Please Enter a Valid Email Address" unless /^.+@.+\..+$/.match(params[:email])
-        if @is_html_form and !@validation.empty?
-          return render :update => {:id => "#{@uuid}_result", :view => :error}
-        end
-        @website = Website.find_by_host(request.host_with_port)
-        @website_inquiry = WebsiteInquiry.new
+        website = Website.find_by_host(request.host_with_port)
-        subject = strip_tags(params[:email_subject])
-        params.delete(:email_subject)
-        params[:created_by] = current_user unless current_user.nil?
-        params[:created_with_form_id] = params[:dynamic_form_id] if params[:dynamic_form_id] and params[:is_html_form].blank?
-        params[:website_id] = @website.id
-        @website_inquiry = @website_inquiry.save_all_attributes(params, ErpApp::Widgets::Base::IGNORED_PARAMS)
-        if @website_inquiry
-          if @website.email_inquiries?
-            @website_inquiry.send_email(subject)
-          end
-          if @is_html_form
-            render :update => {:id => "#{@uuid}_result", :view => :success}
-          else
-            render :json => {
-              :success => true,
-              :response => render_to_string(:template => "success", :layout => false)
-            }
+        website_inquiry = WebsiteInquiry.new
+        website_inquiry.created_by = current_user unless current_user.nil?
+        website_inquiry.website = website
+        website_inquiry.first_name = params[:first_name].strip
+        website_inquiry.last_name = params[:last_name].strip
+        website_inquiry.message = params[:message].strip
+        website_inquiry.email = params[:email].strip
+        if website_inquiry.save
+          if website.email_inquiries?
+            WebsiteInquiryMailer.inquiry(website_inquiry).deliver
           end
+          render :update => {:id => "#{@uuid}_result", :view => :success}
         else
-          if @is_html_form
-            render :update => {:id => "#{@uuid}_result", :view => :error}
-          else
-            render :json => {
-              :success => false,
-              :response => render_to_string(:template => "error", :layout => false)
-            }
-          end
+          @errors = @website_inquiry.errors.full_messages
+          render :update => {:id => "#{@uuid}_result", :view => :error}
         end
       end
@@ -61,26 +36,26 @@ module Widgets
       def locate
         File.dirname(__FILE__)
       end
       class << self
         def title
           "Contact Us"
         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")
+            file = File.join(File.dirname(__FILE__), "/views/layouts/base.html.erb")
             IO.read(file)
           rescue
             return nil
           end
         end
       end
-    end#Base
-  end#ContactUs
-end#Widgets
+    end #Base
+  end #ContactUs
+end #Widgets

data/app/widgets/contact_us/javascript/contact_us.js CHANGED

@@ -1,16 +1,16 @@
 Compass.ErpApp.Widgets.ContactUs = {
-    template: new Ext.Template('<%= render_widget :contact_us, :params => {:use_dynamic_form => false} %>'),
+    template: new Ext.Template('<%= render_widget :contact_us %>'),
-    addContactUs:function(){
+    addContactUs: function () {
         Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(Compass.ErpApp.Widgets.ContactUs.template.apply());
     }
-}
+};
 Compass.ErpApp.Widgets.AvailableWidgets.push({
-    name:'Contact Us',
-    iconUrl:'/images/icons/message/message_48x48.png',
-    onClick:Compass.ErpApp.Widgets.ContactUs.addContactUs,
-    about:'This widget creates a form to allow for website inqueries.'
+    name: 'Contact Us',
+    iconUrl: '/images/icons/mail/mail_48x48.png',
+    onClick: Compass.ErpApp.Widgets.ContactUs.addContactUs,
+    about: 'This widget creates a form to allow for website inquiries.'
 });

data/app/widgets/contact_us/views/error.html.erb CHANGED

@@ -1,10 +1,8 @@
-<div class="sexyerror">
-  <h1>An Error Occurred</h1>
-  <% if @is_html_form %>
-    <ul>
-      <% @validation.each do |k, v| %>
+<div class="alert alert-danger">
+  <strong>An Error Occurred</strong>
+  <ul>
+    <% @errors.each do |k, v| %>
         <li><%= v %></li>
-      <% end %>
-    </ul>
-  <% end %>
+    <% end %>
+  </ul>
 </div>

data/app/widgets/contact_us/views/index.html.erb CHANGED

@@ -1 +1,28 @@
-<%= render :partial => '/contact_form' %>
+<div id="<%= widget_result_id %>"></div>
+<%= form_remote_tag build_widget_url(:new) do %>
+    <div class="form-group">
+      <%= label_tag :first_name %>
+      <%= text_field_tag "first_name", nil, :class => "form-control", :required => true %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :last_name %>
+      <%= text_field_tag "last_name", nil, :class => "form-control", :required => true %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :email %>
+      <%= text_field_tag "email", nil, :class => "form-control", :required => true %>
+    </div>
+    <div class="form-group">
+      <%= label_tag :message %>
+      <%= text_area_tag "message", nil, :class => "form-control", :rows => 5, :required => true %>
+    </div>
+    <p class="text-center">
+      <%= submit_tag "Submit", :disable_with => "Please wait...", :class => "btn btn-primary submit", :style => '' %>
+    </p>
+<% end %>

data/app/widgets/contact_us/views/layouts/base.html.erb CHANGED

@@ -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| %>
-  <%=raw content.body_html %>
-<% end %>
-<%= render_widget :contact_us %>
+      <%= render_widget :contact_us %>
+    </div>
+  </div>
+</div>

data/app/widgets/contact_us/views/success.html.erb CHANGED

@@ -1,4 +1,4 @@
-<div class="sexynotice">
-  <h1>Thank you.</h1>
-  <p>We've received your inquiry and will get back to you with a response shortly.</p>
+<div class="alert alert-success">
+  <strong>Thank you</strong>
+  We've received your inquiry and will get back to you with a response shortly
 </div>

data/app/widgets/google_map/views/index.html.erb CHANGED

@@ -1,41 +1,41 @@
-<div id='<%=@uuid%>' style='width:<%=@map_width%>px;height:<%=@map_height%>px;border:solid 1px black;'></div>
+<div id='<%= @uuid %>' style='width:<%=@map_width%>px;height:<%=@map_height%>px;border:solid 1px black;'></div>
 <script type='text/javascript'>
-  //we do not want to load google libraries more than once.
-  window.loadMap_<%=@uuid%> = function(){
-    var myOptions = {
-      zoom: <%=@zoom%>,
-      mapTypeId: google.maps.MapTypeId.<%=@map_type%>
-    }
+    //we do not want to load google libraries more than once.
+    window.loadMap_<%=@uuid%> = function () {
+        var myOptions = {
+            zoom: <%=@zoom%>,
+            mapTypeId: google.maps.MapTypeId.<%=@map_type%>
+        };
-    var map_<%=@uuid%> = new google.maps.Map(document.getElementById('<%=@uuid%>'), myOptions);
-    var dropPins = <%=raw @drop_pins.to_json%>;
-    window.codeAddress(dropPins,map_<%=@uuid%>)
-  }
+        var map_<%=@uuid%> = new google.maps.Map(document.getElementById('<%=@uuid%>'), myOptions);
+        var dropPins = <%=raw @drop_pins.to_json%>;
+        window.codeAddress(dropPins, map_<%=@uuid%>)
+    };
-  if(!window.mapJsLoaded){
-    new OnDemandLoadByAjax().load('http://maps.google.com/maps/api/js?sensor=false&callback=loadMap_<%=@uuid%>');
-    window.mapJsLoaded = true;
-  }
-  else{
-    setTimeout(loadMap_<%=@uuid%>,1000);
-  }
+    if (!window.mapJsLoaded) {
+        new OnDemandLoadByAjax().load('https://maps.google.com/maps/api/js?sensor=false&callback=loadMap_<%=@uuid%>');
+        window.mapJsLoaded = true;
+    }
+    else {
+        setTimeout(loadMap_<%=@uuid%>, 1000);
+    }
-  window.codeAddress = function(dropPins, map){
-    var geocoder = new google.maps.Geocoder();
-    Ext.each(dropPins,function(dropPin){
-      geocoder.geocode( { 'address': dropPin['address']}, function(results, status) {
-        if (status == google.maps.GeocoderStatus.OK) {
-          map.setCenter(results[0].geometry.location);
-          new google.maps.Marker({
-            map: map,
-            animation: google.maps.Animation.DROP,
-            position: results[0].geometry.location,
-            title:dropPin['title']
-          });
-        } else {
-          alert("Geocode was not successful for the following reason: " + status);
-        }
-      });
-    });
-  }
+    window.codeAddress = function (dropPins, map) {
+        var geocoder = new google.maps.Geocoder();
+        jQuery.each(dropPins, function (index, dropPin) {
+            geocoder.geocode({ 'address': dropPin['address']}, function (results, status) {
+                if (status == google.maps.GeocoderStatus.OK) {
+                    map.setCenter(results[0].geometry.location);
+                    new google.maps.Marker({
+                        map: map,
+                        animation: google.maps.Animation.DROP,
+                        position: results[0].geometry.location,
+                        title: dropPin['title']
+                    });
+                } else {
+                    alert("Geocode was not successful for the following reason: " + status);
+                }
+            });
+        });
+    }
 </script>

data/app/widgets/login/base.rb CHANGED

@@ -7,6 +7,7 @@ module Widgets
         @login_to   = (session[:return_to_url] or params[:login_to])
         @signup_url = params[:signup_url]
         @reset_password_url = params[:reset_password_url]
+        @message = flash[:notice]
         render
       end

data/app/widgets/login/javascript/login.js CHANGED

@@ -131,7 +131,7 @@ Compass.ErpApp.Widgets.Login = {
                             if (action == ':login_header') {
                                 var loginWidgetLoginUrlField = basicForm.findField('loginWidgetLoginUrl');
                                 data.loginWidgetLoginUrl = loginWidgetLoginUrlField.getValue();
-                                 content = Compass.ErpApp.Widgets.Login.loginHeaderTemplate.apply(data);
+                                content = Compass.ErpApp.Widgets.Login.loginHeaderTemplate.apply(data);
                             }
                             else {
                                 var loginWidgetLoginToField = basicForm.findField('loginWidgetLoginTo');
@@ -157,11 +157,11 @@ Compass.ErpApp.Widgets.Login = {
         });
         addLoginWidgetWindow.show();
     }
-}
+};
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name: 'Login',
-    iconUrl: '/images/icons/key/key_48x48.png',
+    iconUrl: '/images/icons/login/login_48x48.png',
     onClick: Compass.ErpApp.Widgets.Login.addLogin,
     about: 'This widget creates a login form to allow users to log into the website.'
 });

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

@@ -1,35 +1,55 @@
-<div id="<%=widget_result_id%>"></div>
+<div style="width:500px;" id="<%= widget_result_id %>">
+  <% if @message %>
+      <div class="alert alert-info">
+        <button type="button" class="close" data-dismiss="alert">&times;</button>
+        <%= @message %>
+      </div>
+  <% end %>
+</div>
 <div>
   <%= form_tag '/session/sign_in', :remote => true, :id => 'login_form' do %>
-    <div class="form_settings">
-      <p>
-        <span style="width:175px">Username or Email Address</span>
-        <%= text_field_tag "login"%>
-      </p>
-      <p>
-        <span style="width:175px">Password</span>
-        <%= password_field_tag "password"%>
-      </p>
-      <input type="hidden" name="logout_to" value="<%=@logout_to%>" />
-      <input type="hidden" name="login_to" value="<%=@login_to%>" />
-      <p style="padding-top: 15px">
-        <span style="width:175px">&nbsp;</span>
-        <%= submit_tag "Login", :disable_with => "Please wait...", :class => "submit", :style => 'margin:0px;'%>
-        <%unless @signup_url.blank?%> | <%= link_to 'Sign Up', @signup_url %> <%end%> <%unless @reset_password_url.blank?%> | <%= link_to 'Reset Password', @reset_password_url %> <%end%>
+      <div class="form-group">
+        <label for="login">Username or Email address</label>
+        <%= text_field_tag "login", nil, :class => "form-control", :placeholder => "Login or email" %>
+      </div>
+      <div class="form-group">
+        <%= password_field_tag "password", nil, :class => "form-control", :placeholder => "**********" %>
+      </div>
+      <input type="hidden" name="logout_to" value="<%= @logout_to %>"/>
+      <input type="hidden" name="login_to" value="<%= @login_to %>"/>
+      <p class="text-center">
+        <%= submit_tag "Login", :disable_with => "Please wait...", :class => "btn btn-primary submit", :style => '' %>
+        <% unless @signup_url.blank? %> | <%= link_to 'Sign Up', @signup_url %>
+        <% end %>
+        <% unless @reset_password_url.blank? %> | <%= link_to 'Reset Password', @reset_password_url %>
+        <% end %>
       </p>
-    </div>
   <% end %>
 </div>
 <script type="text/javascript">
-jQuery('#login_form').bind('ajaxComplete', function(e, xhr, settings){
-  var response = jQuery.parseJSON(xhr.responseText);
-  if(response.success){
-    window.location = response.login_to;
-  }
-  else{
-    jQuery('#<%=widget_result_id%>').html('<div class="sexyerror">'+response.errors.reason+'</div>');
-  }
-});
+    jQuery('#login_form').bind('ajax:success', function (e, response) {
+        var html = '';
+        if (response.success) {
+            window.location = response.login_to;
+        }
+        else {
+            html = [
+                '<div class="alert alert-danger" >',
+                '<button type="button" class="close" data-dismiss="alert">&times;</button>',
+                response.errors.reason,
+                '</div>'
+            ].join('');
+        }
+        jQuery('#<%=widget_result_id%>').html(html);
+    });
 </script>

data/app/widgets/login/views/layouts/base.html.erb CHANGED

@@ -1,14 +1,16 @@
-<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| %>
-  <%=raw content.body_html %>
-<% end %>
-<%= render_widget :login,
-                  :params => {:logout_to => "/login",
-                              :login_to => "/home",
-                              #optional field if Sign Up widget is setup
-                              :signup_url => '/sign-up',
-                              #optional field if Reset Password widget is setup
-                              :reset_password_url => '/reset-password'
-                             } %>
+      <%= render_widget :login,
+                        :params => {:logout_to => "/login",
+                                    :login_to => "/home",
+                                    #optional field if Sign Up widget is setup
+                                    :signup_url => '/sign-up',
+                                    #optional field if Reset Password widget is setup
+                                    :reset_password_url => '/reset-password'
+                        } %>
+    </div>
+  </div>
+</div>