knitkit 2.0.0 → 2.0.1

data/app/views/menus/knitkit/_default_menu.html.erb

@@ -4,7 +4,7 @@
       selected_menu_item = nil
       menu_items.each do |menu_item|
     %>
-      <%if menu_item.has_access?(current_user)%>
+      <%if menu_item.has_access?(@current_user)%>
       <% if menu_item_selected(menu_item)
           selected_menu_item = menu_item
       %>

data/app/views/menus/knitkit/_default_section_menu.html.erb

@@ -6,7 +6,7 @@
     <ul id="menu">
       <% @website_sections.each do |section| %>
         <%if section.in_menu %>
-          <%if section.has_access?(current_user)%>
+          <%if section.has_access?(@current_user)%>
             <% if (!@website_section.nil? && section.id == @website_section.id) or (!selected_section_parent.nil? and selected_section_parent.id == section.id) %>
               <li class="selected">
                 <%

data/app/views/menus/knitkit/_default_sub_menu.html.erb

@@ -3,7 +3,7 @@
   <ul id="side_menu">
     <%
     menu_items.each do |menu_item| %>
-      <%if menu_item.has_access?(current_user)%>
+      <%if menu_item.has_access?(@current_user)%>
         <% if menu_item_selected(menu_item) %>
           <li class="selected">
         <%
@@ -19,7 +19,7 @@
           <% unless selected_menu_item.positioned_children.nil? %>
             <ul class="side_menu_children">
             <% selected_menu_item.positioned_children.each do |child_menu_item| %>
-              <% if child_menu_item.has_access?(current_user)%>
+              <% if child_menu_item.has_access?(@current_user)%>
                 <% if menu_item_selected(child_menu_item) %>
                   <li class="selected">
                 <% else %>

data/app/views/menus/knitkit/_default_sub_section_menu.html.erb

@@ -7,7 +7,7 @@
 	       <ul id="side_menu">
   <%     section.positioned_children.each  do |child_section| %>
           <%if child_section.in_menu %>
-            <%if child_section.has_access?(current_user)%>
+            <%if child_section.has_access?(@current_user)%>
               <% if (!@website_section.nil? && child_section.id == @website_section.id) or (!selected_section_parent.nil? and selected_section_parent.id == child_section.id) %>
                 <li class="selected">
                   <%

data/app/widgets/contact_us/base.rb

@@ -1,6 +1,8 @@
 module Widgets
   module ContactUs
     class Base < ErpApp::Widgets::Base
+      include ActionView::Helpers::SanitizeHelper
+
       def index
         @use_dynamic_form = params[:use_dynamic_form]
 
@@ -22,6 +24,8 @@ module Widgets
         @website = Website.find_by_host(request.host_with_port)
         @website_inquiry = WebsiteInquiry.new
 
+        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
@@ -29,7 +33,7 @@ module Widgets
 				
         if @website_inquiry
           if @website.email_inquiries?
-            @website_inquiry.send_email
+            @website_inquiry.send_email(subject)
           end
 			  
           if @is_html_form
@@ -62,10 +66,6 @@ module Widgets
         def title
           "Contact Us"
         end
-
-        def views_location
-          File.join(File.dirname(__FILE__),"/views")
-        end
           
         def widget_name
           File.basename(File.dirname(__FILE__))

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

@@ -7,7 +7,8 @@ Compass.ErpApp.Widgets.ContactUs = {
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Contact Us',
     iconUrl:'/images/icons/message/message_48x48.png',
-    onClick:Compass.ErpApp.Widgets.ContactUs.addContactUs
+    onClick:Compass.ErpApp.Widgets.ContactUs.addContactUs,
+    about:'This widget creates a form to allow for website inqueries.'
 });
 
 

data/app/widgets/google_map/base.rb

@@ -27,10 +27,6 @@ module Widgets
         def widget_name
           File.basename(File.dirname(__FILE__))
         end
-          
-        def views_location
-          File.join(File.dirname(__FILE__),"/views")
-        end
 
         def base_layout
           begin

data/app/widgets/google_map/javascript/google_map.js

@@ -16,8 +16,8 @@ Compass.ErpApp.Widgets.GoogleMap = {
                 type: 'memory'
             },
             data:[{
-                title:'Google Inc.',
-                address:'1600 Amphitheatre Parkway Mountain View, CA 94043'
+                title:'TrueNorth.',
+                address:'1 S Orange Ave Orlando, FL 32801'
             }]
         });
 
@@ -170,5 +170,6 @@ Compass.ErpApp.Widgets.GoogleMap = {
 Compass.ErpApp.Widgets.AvailableWidgets.push({
     name:'Google Map',
     iconUrl:'/images/icons/map/map_48x48.png',
-    onClick:Compass.ErpApp.Widgets.GoogleMap.addGoogleMap
+    onClick:Compass.ErpApp.Widgets.GoogleMap.addGoogleMap,
+    about:'This widget creates a google map with drop points you setup.'
 });

data/app/widgets/login/base.rb

@@ -1,4 +1,3 @@
-
 module Widgets
   module Login
     class Base < ErpApp::Widgets::Base
@@ -42,10 +41,6 @@ module Widgets
           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/login/javascript/login.js

@@ -1,162 +1,164 @@
 Compass.ErpApp.Widgets.Login = {
-    addLogin:function(){
-        var addLoginWidgetWindow = Ext.create("Ext.window.Window",{
-            layout:'fit',
-            width:375,
-            title:'Add Login Widget',
-            plain: true,
-            buttonAlign:'center',
-            items: Ext.create("Ext.form.Panel",{
-                labelWidth: 100,
-                frame:false,
-                bodyStyle:'padding:5px 5px 0',
-                defaults: {
-                    width: 225
-                },
-                items: [
-                 {
-                    width: 150,
-                    xtype: 'combo',
-                    forceSelection:true,
-                    store: [
-                    [':login_header','Header'],
-                    [':login_page','Page'],
-                    ],
-                    fieldLabel: 'Widget View',
-                    value:':login_page',
-                    name: 'widgetLayout',
-                    allowBlank: false,
-                    triggerAction: 'all',
-                    listeners:{
-                        change:function(field, newValue, oldValue){
-                            var basicForm = field.findParentByType('form').getForm();
-                            var loginWidgetLoginToField = basicForm.findField('loginWidgetLoginTo');
-                            var loginWidgetLogoutToField = basicForm.findField('loginWidgetLogoutTo');
-                            var loginWidgetLoginUrlField = basicForm.findField('loginWidgetLoginUrl');
-                            var loginWidgetSignUpUrlField = basicForm.findField('loginWidgetSignUpUrl');
-                            var loginWidgetResetPasswordUrlField = basicForm.findField('loginWidgetResetPasswordUrl');
-                            if(newValue == ':login_header'){
-                                loginWidgetLoginToField.hide();
-                                loginWidgetLogoutToField.hide();
-                                loginWidgetLoginUrlField.show();
-                                loginWidgetResetPasswordUrlField.hide();
-                                loginWidgetLoginUrlField.setValue('/login');
-                                loginWidgetSignUpUrlField.setValue('/sign-up');
-                                loginWidgetResetPasswordUrlField.setValue('/reset-password');
-                            }
-                            else{
-                                loginWidgetLoginToField.show();
-                                loginWidgetLogoutToField.show();
-                                loginWidgetLoginUrlField.hide();
-                                loginWidgetResetPasswordUrlField.show();
-                                loginWidgetLoginToField.setValue('/home');
-                                loginWidgetLogoutToField.setValue('/home');
-                                loginWidgetSignUpUrlField.setValue('/sign-up');
-                            }
-                        }
-                    }
-                },
-                {
-                    xtype:'textfield',
-                    fieldLabel:'Login To',
-                    allowBlank:false,
-                    value:'/home',
-                    id:'loginWidgetLoginTo'
-                },
-                {
-                    xtype:'textfield',
-                    fieldLabel:'Logout To',
-                    allowBlank:false,
-                    value:'/home',
-                    id:'loginWidgetLogoutTo'
-                },
-                {
-                    xtype:'textfield',
-                    fieldLabel:'Login Url',
-                    allowBlank:false,
-                    hidden:true,
-                    value:'/login',
-                    id:'loginWidgetLoginUrl'
-                },
-                {
-                    xtype:'textfield',
-                    toolTip:'Only needed if Signup widget is setup.',
-                    fieldLabel:'Sign Up Url',
-                    allowBlank:true,
-                    value:'/sign-up',
-                    id:'loginWidgetSignUpUrl'
-                },
-                {
-                    xtype:'textfield',
-                    toolTip:'Only needed if Reset Password widget is setup.',
-                    fieldLabel:'Reset Password Url',
-                    allowBlank:true,
-                    hidden:true,
-                    value:'/reset-password',
-                    id:'loginWidgetResetPasswordUrl'
-                }
-                ]
-            }),
-            buttons: [{
-                text:'Submit',
-                listeners:{
-                    'click':function(button){
-                        var tpl = null;
-                        var content = null;
-                        var window = button.findParentByType('window');
-                        var formPanel = window.query('form')[0];
-                        var basicForm = formPanel.getForm();
-                        var action = basicForm.findField('widgetLayout').getValue();
+  addLogin:function(){
+    var addLoginWidgetWindow = Ext.create("Ext.window.Window",{
+      layout:'fit',
+      width:375,
+      title:'Add Login Widget',
+      plain: true,
+      buttonAlign:'center',
+      items: Ext.create("Ext.form.Panel",{
+        labelWidth: 100,
+        frame:false,
+        bodyStyle:'padding:5px 5px 0',
+        defaults: {
+          width: 225
+        },
+        items: [
+        {
+          xtype: 'combo',
+          forceSelection:true,
+          store: [
+          [':login_header','Header'],
+          [':login_page','Page'],
+          ],
+          fieldLabel: 'Widget View',
+          value:':login_page',
+          name: 'widgetLayout',
+          allowBlank: false,
+          triggerAction: 'all',
+          listeners:{
+            change:function(field, newValue, oldValue){
+              var basicForm = field.findParentByType('form').getForm();
+              var loginWidgetLoginToField = basicForm.findField('loginWidgetLoginTo');
+              var loginWidgetLogoutToField = basicForm.findField('loginWidgetLogoutTo');
+              var loginWidgetLoginUrlField = basicForm.findField('loginWidgetLoginUrl');
+              var loginWidgetSignUpUrlField = basicForm.findField('loginWidgetSignUpUrl');
+              var loginWidgetResetPasswordUrlField = basicForm.findField('loginWidgetResetPasswordUrl');
+              if(newValue == ':login_header'){
+                loginWidgetLoginToField.hide();
+                loginWidgetLogoutToField.hide();
+                loginWidgetLoginUrlField.show();
+                loginWidgetResetPasswordUrlField.hide();
+                loginWidgetLoginUrlField.setValue('/login');
+                loginWidgetSignUpUrlField.setValue('/sign-up');
+                loginWidgetResetPasswordUrlField.setValue('/reset-password');
+              }
+              else{
+                loginWidgetLoginToField.show();
+                loginWidgetLogoutToField.show();
+                loginWidgetLoginUrlField.hide();
+                loginWidgetResetPasswordUrlField.show();
+                loginWidgetLoginToField.setValue('/home');
+                loginWidgetLogoutToField.setValue('/home');
+                loginWidgetSignUpUrlField.setValue('/sign-up');
+              }
+            }
+          }
+        },
+        {
+          xtype:'textfield',
+          fieldLabel:'Login To',
+          allowBlank:false,
+          value:'/home',
+          id:'loginWidgetLoginTo'
+        },
+        {
+          xtype:'textfield',
+          fieldLabel:'Logout To',
+          allowBlank:false,
+          value:'/home',
+          id:'loginWidgetLogoutTo'
+        },
+        {
+          xtype:'textfield',
+          fieldLabel:'Login Url',
+          allowBlank:false,
+          hidden:true,
+          value:'/login',
+          id:'loginWidgetLoginUrl'
+        },
+        {
+          xtype:'textfield',
+          toolTip:'Only needed if Signup widget is setup.',
+          fieldLabel:'Sign Up Url',
+          allowBlank:true,
+          value:'/sign-up',
+          id:'loginWidgetSignUpUrl'
+        },
+        {
+          xtype:'textfield',
+          toolTip:'Only needed if Reset Password widget is setup.',
+          fieldLabel:'Reset Password Url',
+          allowBlank:true,
+          hidden:true,
+          value:'/reset-password',
+          id:'loginWidgetResetPasswordUrl'
+        }
+        ]
+      }),
+      buttons: [{
+        text:'Submit',
+        listeners:{
+          'click':function(button){
+            var tpl = null;
+            var content = null;
+            var window = button.findParentByType('window');
+            var formPanel = window.query('form')[0];
+            var basicForm = formPanel.getForm();
+            var action = basicForm.findField('widgetLayout').getValue();
 
-                        var loginWidgetSignUpUrlField = basicForm.findField('loginWidgetSignUpUrl');
-                        var loginWidgetResetPasswordUrlField = basicForm.findField('loginWidgetResetPasswordUrl');
-                        var data = {action:action};
-                        data.loginWidgetSignUpUrl = loginWidgetSignUpUrlField.getValue();
-                        data.loginWidgetResetPasswordUrl = loginWidgetResetPasswordUrlField.getValue();
-                        if(action == ':login_header'){
-                            var loginWidgetLoginUrlField = basicForm.findField('loginWidgetLoginUrl');
-                            data.loginWidgetLoginUrl = loginWidgetLoginUrlField.getValue();
-                            tpl = new Ext.XTemplate("<%= render_widget :login,\n",
-                                                    "   :action => :login_header,\n",
-                                                    "   :params => {:login_url => '{loginWidgetLoginUrl}',\n",
-                                                    "               :signup_url => '{loginWidgetSignUpUrl}'}%>");
-                            content = tpl.apply(data);
-                        }
-                        else{
-                            var loginWidgetLoginToField = basicForm.findField('loginWidgetLoginTo');
-                            var loginWidgetLogoutToField = basicForm.findField('loginWidgetLogoutTo');
-                            data.loginWidgetLoginTo = loginWidgetLoginToField.getValue();
-                            data.loginWidgetLogoutTo = loginWidgetLogoutToField.getValue();
-                            tpl = new Ext.XTemplate("<%= render_widget :login,\n",
-                                                    "   :params => {:login_to => '{loginWidgetLoginTo}',\n",
-                                                    "               :logout_to => '{loginWidgetLogoutTo}',\n",
-                                                    "               #optional field if Sign Up widget is setup\n",
-                                                    "               #:signup_url => '{loginWidgetSignUpUrl}',\n",
-                                                    "               #optional field if Reset Password widget is setup\n",
-                                                    "               #:reset_password_url => '{loginWidgetResetPasswordUrl}'}%>");
-                            content = tpl.apply(data);
-                        }
+            var loginWidgetSignUpUrlField = basicForm.findField('loginWidgetSignUpUrl');
+            var loginWidgetResetPasswordUrlField = basicForm.findField('loginWidgetResetPasswordUrl');
+            var data = {
+              action:action
+            };
+            data.loginWidgetSignUpUrl = loginWidgetSignUpUrlField.getValue();
+            data.loginWidgetResetPasswordUrl = loginWidgetResetPasswordUrlField.getValue();
+            if(action == ':login_header'){
+              var loginWidgetLoginUrlField = basicForm.findField('loginWidgetLoginUrl');
+              data.loginWidgetLoginUrl = loginWidgetLoginUrlField.getValue();
+              tpl = new Ext.XTemplate("<%= render_widget :login,\n",
+                "   :action => :login_header,\n",
+                "   :params => {:login_url => '{loginWidgetLoginUrl}',\n",
+                "               :signup_url => '{loginWidgetSignUpUrl}'}%>");
+              content = tpl.apply(data);
+            }
+            else{
+              var loginWidgetLoginToField = basicForm.findField('loginWidgetLoginTo');
+              var loginWidgetLogoutToField = basicForm.findField('loginWidgetLogoutTo');
+              data.loginWidgetLoginTo = loginWidgetLoginToField.getValue();
+              data.loginWidgetLogoutTo = loginWidgetLogoutToField.getValue();
+              tpl = new Ext.XTemplate("<%= render_widget :login,\n",
+                "   :params => {:login_to => '{loginWidgetLoginTo}',\n",
+                "               :logout_to => '{loginWidgetLogoutTo}',\n",
+                "               #optional field if Sign Up widget is setup\n",
+                "               #:signup_url => '{loginWidgetSignUpUrl}',\n",
+                "               #optional field if Reset Password widget is setup\n",
+                "               #:reset_password_url => '{loginWidgetResetPasswordUrl}'}%>");
+              content = tpl.apply(data);
+            }
 
-                        //add rendered template to center region editor
-                        Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(content);
-                        addLoginWidgetWindow.close();
-                    }
-                }
-            },{
-                text: 'Close',
-                handler: function(){
-                    addLoginWidgetWindow.close();
-                }
-            }]
-        });
-        addLoginWidgetWindow.show();
-    }
+            //add rendered template to center region editor
+            Ext.getCmp('knitkitCenterRegion').addContentToActiveCodeMirror(content);
+            addLoginWidgetWindow.close();
+          }
+        }
+      },{
+        text: 'Close',
+        handler: function(){
+          addLoginWidgetWindow.close();
+        }
+      }]
+    });
+    addLoginWidgetWindow.show();
+  }
 }
 
 Compass.ErpApp.Widgets.AvailableWidgets.push({
-    name:'Login',
-    iconUrl:'/images/icons/key/key_48x48.png',
-    onClick:Compass.ErpApp.Widgets.Login.addLogin
+  name:'Login',
+  iconUrl:'/images/icons/key/key_48x48.png',
+  onClick:Compass.ErpApp.Widgets.Login.addLogin,
+  about:'This widget creates a login form to allow users to log into the website.'
 });