Merge branch 'dev'

Merging dev into master

Assets/js/Manager.js

@@ -9,6 +9,7 @@ var FormManager = Backbone.View.extend({
 	 */
 	events: {
 		'click .nav-btn': 'toggleView',
+		'click .settings-nav .form-nav-item': 'toggleSettingsPanel',
 		'click .add-field': 'addFieldByClick'
 	},
 
@@ -193,6 +194,27 @@ var FormManager = Backbone.View.extend({
 	},
 
 
+	/**
+	 * Toggle the settings panels 
+	 * 
+	 * @param Event e
+	 * @return void
+	 */
+	toggleSettingsPanel: function( e ){
+
+		var self = this;
+		var btn = jQuery( e.target );
+		var slug = btn.data( 'slug' );
+
+		jQuery( '.settings-nav .form-nav-item' ).removeClass( 'active' );
+		btn.addClass( 'active' );
+
+		jQuery( '.settings-panel' ).removeClass( 'active' );
+		jQuery( '#panel-'+slug ).addClass( 'active' );
+
+	},
+
+
 	/**********************************************/
 	/****** Adding fields
 	/**********************************************/

Assets/js/front/Form.js

@@ -154,7 +154,7 @@ define([
 				_data.append( 'action', 'sendForm' );
 				_data.append( 'post_id', self.formId );
 
-				self.el.trigger( 'beforeSubmit', _data, self );
+				self.el.trigger( 'beforeSubmit', [ _data, self ] );
 				self.submitted = true;
 
 				self.logger( 'ajax submit' );
@@ -204,11 +204,17 @@ define([
 		this.trackAnalytics = function(){
 
 			var self = this;
+			var _formName = self.el.data( 'title' );
 
-			if( typeof( ga ) !== 'undefined' ){
+			if( typeof( window.dataLayer ) !== 'undefined' ){
+
+				self.logger( 'google analytics event send via tag manager' );
+				window.dataLayer.push({ 'event': 'Form submit: '+_formName });
+
+
+			}else if( typeof( ga ) !== 'undefined' ){
 
 				self.logger( 'google analytics event send' );
-				var _formName = self.el.data( 'title' );
 
 				ga('send', 'event', 'Form', 'Submit', _formName );
 
@@ -233,7 +239,6 @@ define([
 			if( self.dev )
 				self.el.append( response );
 
-
 			if( Validate.json( response ) && self.dev === false ){
 
 				self.hideLoader();
@@ -243,21 +248,21 @@ define([
 				//check if we need to redirect;
 				if( response.redirect == true ){
 
-					self.el.trigger( 'beforeRedirect', response, self );
+					self.el.trigger( 'beforeRedirect', [ response, self ] );
 
 					window.location.href = response.redirect_url;
 
 				}else{
 
-					self.el.trigger( 'onResponse', response, self );
+					self.el.trigger( 'onResponse', [ response, self ] );
 
 
 					//otherwise, clear the loader and display the message.
 					self.el.addClass( 'msg' );
 					self.el.append('<div class="message">'+ response.message +'</div>' );
 
 					self.resetFields();
-					self.el.trigger( 'onComplete', response, self );
+					self.el.trigger( 'onComplete', [ response, self ] );
 
 					//remove message after 3 seconds, if the form doesn't have a data attribute set:
 					if( self.el.data( 'maintain-msg' ) === undefined ){
@@ -266,6 +271,7 @@ define([
 
 							self.el.removeClass( 'msg' );
 							self.el.find('.message').remove();
+							self.el.trigger( 'onMessageDisappear', self );
 
 						}, 5000 );
 

Assets/sass/_settings.scss

@@ -31,9 +31,15 @@
 
 .settings-panel{
 	clear:both;
-	padding-top:15px;
-	margin-top:30px;
-	border-top:1px solid #ccc;
+	padding: 15px 30px;
+	background: #fff;
+	box-shadow: 0 0 10px rgba(0,0,0,.3);
+	margin-top: 15px;
+	display: none;
+
+	&.active{
+		display: block;
+	}
 
 	.panel-icon{
 		height:42px;
@@ -46,6 +52,11 @@
 	h2{
 		line-height:100%;
 		display:inline-block;
+		padding-bottom: 20px; 
+		.dashicons{
+			float: left;
+			margin-top: 10px;
+		}
 	}
 
 

Classes/Admin/Form/Builder/Toolbar.php

@@ -4,6 +4,7 @@
 
 use Cuisine\Utilities\Sort;
 use ChefForms\Fields\FieldFactory;
+use ChefForms\Wrappers\SettingsManager;
 
 class Toolbar{
 
@@ -120,12 +121,7 @@ private function buildNotificationButtons(){
 	 */
 	private function buildSettingButtons(){
 
-		$html = '<ul id="nav-bar-settings" class="main-form-nav settings-nav">';
-			$html .= '<li class="form-nav-item main-settings active">';
-				$html .= '<i class="dashicons dashicons-admin-generic"></i>';
-				$html .= __( 'Main Settings', 'chefforms' );
-			$html .= '</li>';
-		$html .= '</ul>';
+		$html = SettingsManager::buildNavigation();
 
 		echo $html;
 	}

Classes/Admin/Form/Entries/Entry.php

@@ -10,43 +10,43 @@ class Entry{
 
 	/**
 	 * ID of this entry
-	 * 
+	 *
 	 * @var int
 	 */
 	var $id;
 
 
 	/**
 	 * This entries parent form
-	 * 
+	 *
 	 * @var ChefForms\Wrappers\Form
 	 */
 	var $form;
 
 	/**
 	 * An array of fields
-	 * 
+	 *
 	 * @var array
 	 */
 	var $fields;
 
 	/**
 	 * This entries date, saved as a unix timestamp
-	 * 
+	 *
 	 * @var int
 	 */
 	var $date;
 
 	/**
 	 * Status of this entry
-	 * 
+	 *
 	 * @var string
 	 */
 	var $status;
 
 	/**
 	 * Status posibilities
-	 * 
+	 *
 	 * @var array
 	 */
 	var $statusses;
@@ -70,71 +70,71 @@ public function make( $args ){
 
 	/**
 	 * Build the html to go in the manager
-	 * 
+	 *
 	 * @return string (html, echoed)
 	 */
 	public function build(){
 
 
 		echo '<div class="single-entry">';
-		
+
 			echo '<div class="entry-preview">';
-			
+
 				//status:
 				do_action( 'chef_forms_status_indicator', $this, $this->form->id );
 
 				//date:
 				echo '<div class="entry-date">';
 					echo $this->getDate();
 				echo '</div>';
-		
+
 				//which form?
 				echo '<span class="form-title">';
 					echo get_the_title( $this->form->id );
 				echo '</span>';
 
 			echo '</div>';
-		
-		
-			do_action( 
-				'chef_forms_before_entry_fields', 
-				$this, 
+
+
+			do_action(
+				'chef_forms_before_entry_fields',
+				$this,
 				$this->form->id
 			);
-		
+
 			echo '<div class="entry-fields">';
-		
-				$fields = apply_filters( 
-					'chef_forms_entry_fields', 
+
+				$fields = apply_filters(
+					'chef_forms_entry_fields',
 					$this->form->fields
 				);
-		
+
 				echo '<table cellpadding="0" cellspacing="0">';
-				
+
 					foreach( $fields as $field ){
 
 						echo $field->getNotificationPart( $this->fields );
-					
+
 					}
-		
+
 				echo '</table>';
-		
+
 			echo '</div>';
-		
-			do_action( 
-				'chef_forms_after_entry_fields', 
-				$this, 
+
+			do_action(
+				'chef_forms_after_entry_fields',
+				$this,
 				$this->form->id
 			);
-		
-		
+
+
 		echo '</div>';
 	}
 
 
 	/**
 	 * Returns the date in the right format
-	 * 
+	 *
 	 * @return string
 	 */
 	private function getDate(){