Strategy11 / formidable-forms

classes/views/frm-settings/form.php

Indentation +2 added lines, -2 removed lines

@@ -157,10 +157,10 @@
 					call_user_func( array( $section['class'], $section['function'] ) );
 				} else {
 					call_user_func( ( isset( $section['function'] ) ? $section['function'] : $section ) );
-                } ?>
+				} ?>
             </div>
         <?php
-        } ?>
+		} ?>
 
         <p class="alignright frm_uninstall">
             <a href="javascript:void(0)" id="frm_uninstall_now"><?php _e( 'Uninstall Formidable', 'formidable' ) ?></a>

Spacing +17 added lines, -17 removed lines

@@ -14,7 +14,7 @@ 
         <div class="contextual-help-tabs">
         <ul class="frm-category-tabs">
 			<?php $a = FrmAppHelper::simple_get( 't', 'sanitize_title', 'general_settings' ); ?>
-        	<li <?php echo ($a == 'general_settings') ? 'class="tabs active"' : '' ?>><a href="#general_settings" class="frm_cursor_pointer"><?php _e( 'General', 'formidable' ) ?></a></li>
+        	<li <?php echo ( $a == 'general_settings' ) ? 'class="tabs active"' : '' ?>><a href="#general_settings" class="frm_cursor_pointer"><?php _e( 'General', 'formidable' ) ?></a></li>
 			<?php foreach ( $sections as $sec_name => $section ) { ?>
 				<li <?php echo ( $a == $sec_name . '_settings' ) ? 'class="tabs active"' : '' ?>>
 					<a href="#<?php echo esc_attr( $sec_name ) ?>_settings">
@@ -25,14 +25,14 @@ 
         </ul>
         </div>
 
-    <?php do_action('frm_before_settings'); ?>
+    <?php do_action( 'frm_before_settings' ); ?>
 
 	<form name="frm_settings_form" method="post" class="frm_settings_form" action="?page=formidable-settings<?php echo ( $a ? '&amp;t=' . $a : '' ); ?>">
         <input type="hidden" name="frm_action" value="process-form" />
         <input type="hidden" name="action" value="process-form" />
-        <?php wp_nonce_field('process_form_nonce', 'process_form'); ?>
+        <?php wp_nonce_field( 'process_form_nonce', 'process_form' ); ?>
 
-        <div class="general_settings tabs-panel <?php echo ($a == 'general_settings') ? 'frm_block' : 'frm_hidden'; ?>">
+        <div class="general_settings tabs-panel <?php echo ( $a == 'general_settings' ) ? 'frm_block' : 'frm_hidden'; ?>">
             <p class="submit">
 				<input class="button-primary" type="submit" value="<?php esc_attr_e( 'Update Options', 'formidable' ) ?>" />
             </p>
@@ -41,20 +41,20 @@ 
 
             <p><label class="frm_left_label"><?php _e( 'Load form styling', 'formidable' ) ?></label>
                 <select id="frm_load_style" name="frm_load_style">
-                <option value="all" <?php selected($frm_settings->load_style, 'all') ?>><?php _e( 'on every page of your site', 'formidable' ) ?></option>
-                <option value="dynamic" <?php selected($frm_settings->load_style, 'dynamic') ?>><?php _e( 'only on applicable pages', 'formidable' ) ?></option>
-                <option value="none" <?php selected($frm_settings->load_style, 'none') ?>><?php _e( 'Don\'t use form styling on any page', 'formidable' ) ?></option>
+                <option value="all" <?php selected( $frm_settings->load_style, 'all' ) ?>><?php _e( 'on every page of your site', 'formidable' ) ?></option>
+                <option value="dynamic" <?php selected( $frm_settings->load_style, 'dynamic' ) ?>><?php _e( 'only on applicable pages', 'formidable' ) ?></option>
+                <option value="none" <?php selected( $frm_settings->load_style, 'none' ) ?>><?php _e( 'Don\'t use form styling on any page', 'formidable' ) ?></option>
                 </select>
             </p>
 
             <p>
 				<label for="frm_use_html">
-					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked($frm_settings->use_html, 1) ?>	> <?php _e( 'Use HTML5 in forms', 'formidable' ) ?>
+					<input type="checkbox" id="frm_use_html" name="frm_use_html" value="1" <?php checked( $frm_settings->use_html, 1 ) ?>	> <?php _e( 'Use HTML5 in forms', 'formidable' ) ?>
 				</label>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'We recommend using HTML 5 for your forms. It adds some nifty options like placeholders, patterns, and autocomplete.', 'formidable' ) ?>"></span>
             </p>
 
-            <?php do_action('frm_style_general_settings', $frm_settings); ?>
+            <?php do_action( 'frm_style_general_settings', $frm_settings ); ?>
 
 			<h3><?php _e( 'User Permissions', 'formidable' ); ?>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Select users that are allowed access to Formidable. Without access to View Forms, users will be unable to see the Formidable menu.', 'formidable' ) ?>"></span>
@@ -77,15 +77,15 @@ 
 			</p>
 
 			<p><label class="frm_left_label"><?php _e( 'Site Key', 'formidable' ) ?></label>
-			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr($frm_settings->pubkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
+			<input type="text" name="frm_pubkey" id="frm_pubkey" size="42" value="<?php echo esc_attr( $frm_settings->pubkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
 
 			<p><label class="frm_left_label"><?php _e( 'Private Key', 'formidable' ) ?></label>
-			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr($frm_settings->privkey) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
+			<input type="text" name="frm_privkey" id="frm_privkey" size="42" value="<?php echo esc_attr( $frm_settings->privkey ) ?>" placeholder="<?php esc_attr_e( 'Optional', 'formidable' ) ?>" /></p>
 
 		    <p><label class="frm_left_label"><?php _e( 'reCAPTCHA Language', 'formidable' ) ?></label>
 			<select name="frm_re_lang" id="frm_re_lang">
 			    <?php foreach ( $captcha_lang as $lang => $lang_name ) { ?>
-				<option value="<?php echo esc_attr($lang) ?>" <?php selected($frm_settings->re_lang, $lang) ?>><?php echo esc_html( $lang_name ) ?></option>
+				<option value="<?php echo esc_attr( $lang ) ?>" <?php selected( $frm_settings->re_lang, $lang ) ?>><?php echo esc_html( $lang_name ) ?></option>
                 <?php } ?>
             </select></p>
 
@@ -138,7 +138,7 @@ 
 			<label class="frm_left_label"><?php _e( 'Success Message', 'formidable' ); ?>
 				<span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'The default message seen after a form is submitted.', 'formidable' ) ?>" ></span>
 			</label>
-            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr($frm_settings->success_msg) ?>" />
+            <input type="text" id="frm_success_msg" name="frm_success_msg" class="frm_with_left_label" value="<?php echo esc_attr( $frm_settings->success_msg ) ?>" />
 		</p>
 
 		<p>
@@ -146,21 +146,21 @@ 
 			<input type="text" value="<?php echo esc_attr( $frm_settings->submit_value ) ?>" id="frm_submit_value" name="frm_submit_value" class="frm_with_left_label" />
 		</p>
 
-        <?php do_action('frm_settings_form', $frm_settings); ?>
+        <?php do_action( 'frm_settings_form', $frm_settings ); ?>
 
         <?php if ( ! FrmAppHelper::pro_is_installed() ) { ?>
         <div class="clear"></div>
         <h3><?php _e( 'Miscellaneous', 'formidable' ) ?></h3>
         <?php } ?>
         <p><label class="frm_left_label"><?php _e( 'Admin menu label', 'formidable' ); ?></label>
-            <input type="text" name="frm_menu" id="frm_menu" value="<?php echo esc_attr($frm_settings->menu) ?>" />
+            <input type="text" name="frm_menu" id="frm_menu" value="<?php echo esc_attr( $frm_settings->menu ) ?>" />
             <?php if ( is_multisite() && is_super_admin() ) { ?>
-            <label for="frm_mu_menu"><input type="checkbox" name="frm_mu_menu" id="frm_mu_menu" value="1" <?php checked($frm_settings->mu_menu, 1) ?> /> <?php _e( 'Use this menu name site-wide', 'formidable' ); ?></label>
+            <label for="frm_mu_menu"><input type="checkbox" name="frm_mu_menu" id="frm_mu_menu" value="1" <?php checked( $frm_settings->mu_menu, 1 ) ?> /> <?php _e( 'Use this menu name site-wide', 'formidable' ); ?></label>
             <?php } ?>
         </p>
 
         <p><label class="frm_left_label"><?php _e( 'Preview Page', 'formidable' ); ?></label>
-        <?php FrmAppHelper::wp_pages_dropdown('frm-preview-page-id', $frm_settings->preview_page_id ) ?>
+        <?php FrmAppHelper::wp_pages_dropdown( 'frm-preview-page-id', $frm_settings->preview_page_id ) ?>
         </p>
 
     </div>

classes/views/frm-settings/license_box.php

Spacing +1 added lines, -1 removed lines

@@ -1,4 +1,4 @@
-<div class="general_settings metabox-holder tabs-panel frm_license_box <?php echo ($a == 'general_settings') ? 'frm_block' : 'frm_hidden'; ?>">
+<div class="general_settings metabox-holder tabs-panel frm_license_box <?php echo ( $a == 'general_settings' ) ? 'frm_block' : 'frm_hidden'; ?>">
 <?php if ( ! is_multisite() || is_super_admin() ) { ?>
     <div class="postbox">
         <div class="inside">

classes/views/shared/errors.php

Indentation +11 added lines, -11 removed lines

@@ -1,23 +1,23 @@
 <div class="clear"></div>
 <?php
 if ( isset($message) && $message != '' ) {
-    if ( FrmAppHelper::is_admin() ) {
-        ?><div id="message" class="updated frm_msg_padding"><?php
-        echo $message;
-        ?></div><?php
-    } else {
-        echo $message;
-    }
+	if ( FrmAppHelper::is_admin() ) {
+		?><div id="message" class="updated frm_msg_padding"><?php
+		echo $message;
+		?></div><?php
+	} else {
+		echo $message;
+	}
 }
 
 if ( isset($errors) && is_array($errors) && count($errors) > 0 ) { ?>
     <div class="error">
         <ul id="frm_errors">
             <?php
-            foreach ( $errors as $error ) {
-                echo '<li>' . $error . '</li>';
-            }
-            ?>
+			foreach ( $errors as $error ) {
+				echo '<li>' . $error . '</li>';
+			}
+			?>
         </ul>
     </div>
 <?php

Spacing +2 added lines, -2 removed lines

@@ -1,6 +1,6 @@ 
 <div class="clear"></div>
 <?php
-if ( isset($message) && $message != '' ) {
+if ( isset( $message ) && $message != '' ) {
     if ( FrmAppHelper::is_admin() ) {
         ?><div id="message" class="updated frm_msg_padding"><?php
         echo $message;
@@ -10,7 +10,7 @@ 
     }
 }
 
-if ( isset($errors) && is_array($errors) && count($errors) > 0 ) { ?>
+if ( isset( $errors ) && is_array( $errors ) && count( $errors ) > 0 ) { ?>
     <div class="error">
         <ul id="frm_errors">
             <?php

classes/views/shared/head.php

Spacing +1 added lines, -1 removed lines

@@ -1,2 +1,2 @@
 <?php
-_deprecated_file( basename(__FILE__), '2.0', null, __( 'Use wp_enqueue_script and wp_enqueue_style.', 'formidable' ) );
+_deprecated_file( basename( __FILE__ ), '2.0', null, __( 'Use wp_enqueue_script and wp_enqueue_style.', 'formidable' ) );

classes/views/styles/_check-box-radio-fields.php

Spacing +9 added lines, -9 removed lines

@@ -1,26 +1,26 @@ 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Radio', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('radio_align') ) ?>" id="frm_radio_align">
-        <option value="block" <?php selected($style->post_content['radio_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
-        <option value="inline" <?php selected($style->post_content['radio_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'radio_align' ) ) ?>" id="frm_radio_align">
+        <option value="block" <?php selected( $style->post_content['radio_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
+        <option value="inline" <?php selected( $style->post_content['radio_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Check Box', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_align') ) ?>" id="frm_check_align">
-        <option value="block" <?php selected($style->post_content['check_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
-        <option value="inline" <?php selected($style->post_content['check_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_align' ) ) ?>" id="frm_check_align">
+        <option value="block" <?php selected( $style->post_content['check_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
+        <option value="inline" <?php selected( $style->post_content['check_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
 	</select>
 </div>
 
 <div class="field-group field-group-background clearfix">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('check_label_color') ) ?>" id="frm_check_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['check_label_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'check_label_color' ) ) ?>" id="frm_check_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['check_label_color'] ) ?>" />
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_weight') ) ?>" id="frm_check_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_weight' ) ) ?>" id="frm_check_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['check_weight'], $value ) ?>><?php echo $name ?></option>
 		<?php } ?>
@@ -28,5 +28,5 @@ 
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('check_font_size') ) ?>" id="frm_check_font_size" value="<?php echo esc_attr( $style->post_content['check_font_size'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'check_font_size' ) ) ?>" id="frm_check_font_size" value="<?php echo esc_attr( $style->post_content['check_font_size'] ) ?>"  size="3" />
 </div>

classes/views/styles/_date-fields.php

Indentation +7 added lines, -7 removed lines

@@ -2,19 +2,19 @@
 $jquery_themes = FrmStylesHelper::jquery_themes();
 
 $alt_img_name = array(
-    'ui-lightness'  => 'ui_light',
-    'ui-darkness'   => 'ui_dark',
-    'start'         => 'start_menu',
-    'redmond'       => 'windoze',
-    'vader'         => 'black_matte',
-    'mint-choc'     => 'mint_choco',
+	'ui-lightness'  => 'ui_light',
+	'ui-darkness'   => 'ui_dark',
+	'start'         => 'start_menu',
+	'redmond'       => 'windoze',
+	'vader'         => 'black_matte',
+	'mint-choc'     => 'mint_choco',
 );
 $theme_names = array_keys($jquery_themes);
 $theme_names = array_combine($theme_names, $theme_names);
 
 foreach ( $theme_names as $k => $v ) {
 	$theme_names[ $k ] = str_replace( '-', '_', $v );
-    unset($k, $v);
+	unset($k, $v);
 }
 
 $alt_img_name = array_merge($theme_names, $alt_img_name);

Spacing +11 added lines, -11 removed lines

@@ -9,25 +9,25 @@ 
     'vader'         => 'black_matte',
     'mint-choc'     => 'mint_choco',
 );
-$theme_names = array_keys($jquery_themes);
-$theme_names = array_combine($theme_names, $theme_names);
+$theme_names = array_keys( $jquery_themes );
+$theme_names = array_combine( $theme_names, $theme_names );
 
 foreach ( $theme_names as $k => $v ) {
-	$theme_names[ $k ] = str_replace( '-', '_', $v );
-    unset($k, $v);
+	$theme_names[$k] = str_replace( '-', '_', $v );
+    unset( $k, $v );
 }
 
-$alt_img_name = array_merge($theme_names, $alt_img_name);
+$alt_img_name = array_merge( $theme_names, $alt_img_name );
 $alt_img_name['-1'] = '';
-unset($theme_names);
+unset( $theme_names );
 
 ?>
 
 <div class="field-group clearfix frm-half frm-first-row">
 	<label><?php _e( 'Theme', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('theme_selector') ) ?>">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_selector' ) ) ?>">
 	    <?php foreach ( $jquery_themes as $theme_name => $theme_title ) { ?>
-		<option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[ $theme_name ] ); ?>" <?php selected( $theme_name, $style->post_content['theme_selector'] ) ?>>
+		<option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[$theme_name] ); ?>" <?php selected( $theme_name, $style->post_content['theme_selector'] ) ?>>
 			<?php echo esc_html( $theme_title ) ?>
 		</option>
         <?php } ?>
@@ -38,8 +38,8 @@ 
 </div>
 
 <div class="field-group clearfix frm-half frm-first-row frm_right_text">
-    <img id="frm_show_cal" src="//jqueryui.com/resources/images/themeGallery/theme_90_<?php echo esc_attr( $alt_img_name[ $style->post_content['theme_css'] ] ) ?>.png" alt="" />
-	<input type="hidden" value="<?php echo esc_attr($style->post_content['theme_css']) ?>" id="frm_theme_css" name="<?php echo esc_attr( $frm_style->get_field_name('theme_css') ) ?>" />
-    <input type="hidden" value="<?php echo esc_attr($style->post_content['theme_name']) ?>" id="frm_theme_name" name="<?php echo esc_attr( $frm_style->get_field_name('theme_name') ) ?>" />
+    <img id="frm_show_cal" src="//jqueryui.com/resources/images/themeGallery/theme_90_<?php echo esc_attr( $alt_img_name[$style->post_content['theme_css']] ) ?>.png" alt="" />
+	<input type="hidden" value="<?php echo esc_attr( $style->post_content['theme_css'] ) ?>" id="frm_theme_css" name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_css' ) ) ?>" />
+    <input type="hidden" value="<?php echo esc_attr( $style->post_content['theme_name'] ) ?>" id="frm_theme_name" name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_name' ) ) ?>" />
 </div>
 <div class="clear"></div>

classes/views/styles/_field-description.php

Spacing +9 added lines, -9 removed lines

@@ -1,10 +1,10 @@ 
 <div class="field-group field-group-background clearfix frm-first-row">
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_color') ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_color' ) ) ?>" id="frm_description_color" class="hex" value="<?php echo esc_attr( $style->post_content['description_color'] ) ?>" />
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_weight') ) ?>" id="frm_description_weight">
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_weight' ) ) ?>" id="frm_description_weight">
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['description_weight'], $value ) ?>><?php echo $name ?></option>
 		<?php } ?>
@@ -12,21 +12,21 @@ 
 </div>
 <div class="field-group clearfix frm-first-row">
 	<label><?php _e( 'Style', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_style') ) ?>" id="frm_description_style">
-		<option value="normal" <?php selected($style->post_content['description_style'], 'normal') ?>><?php _e( 'normal', 'formidable' ) ?></option>
-		<option value="italic" <?php selected($style->post_content['description_style'], 'italic') ?>><?php _e( 'italic', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_style' ) ) ?>" id="frm_description_style">
+		<option value="normal" <?php selected( $style->post_content['description_style'], 'normal' ) ?>><?php _e( 'normal', 'formidable' ) ?></option>
+		<option value="italic" <?php selected( $style->post_content['description_style'], 'italic' ) ?>><?php _e( 'italic', 'formidable' ) ?></option>
 	</select>
 </div>
 <div class="field-group clearfix">
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('description_font_size') ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'description_font_size' ) ) ?>" id="frm_description_font_size" value="<?php echo esc_attr( $style->post_content['description_font_size'] ) ?>"  size="3" />
 </div>
 
 <div class="field-group clearfix">
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_align') ) ?>" id="frm_description_align">
-		<option value="left" <?php selected($style->post_content['description_align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-		<option value="right" <?php selected($style->post_content['description_align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_align' ) ) ?>" id="frm_description_align">
+		<option value="left" <?php selected( $style->post_content['description_align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+		<option value="right" <?php selected( $style->post_content['description_align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
 	</select>
 </div>
 <div class="clear"></div>

classes/views/styles/_form-messages.php

Spacing +10 added lines, -10 removed lines

@@ -1,10 +1,10 @@ 
 <div class="posttypediv">
 	<ul class="posttype-tabs add-menu-item-tabs">
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-success-msg') ?>" class="nav-tab-link" data-type="tabs-panel-success-msg" ><?php _e( 'Success', 'formidable' ) ?></a>
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-success-msg' ) ?>" class="nav-tab-link" data-type="tabs-panel-success-msg" ><?php _e( 'Success', 'formidable' ) ?></a>
     	</li>
 		<li <?php echo ( 'error-msg' == $current_tab ? ' class="tabs"' : '' ); ?>>
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=error-msge#page-error-msg') ?>" class="nav-tab-link" data-type="tabs-panel-error-msg" ><?php _e( 'Error', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=error-msge#page-error-msg' ) ?>" class="nav-tab-link" data-type="tabs-panel-error-msg" ><?php _e( 'Error', 'formidable' ) ?></a>
 		</li>
 	</ul><!-- .posttype-tabs -->
 
@@ -14,19 +14,19 @@ 
 	    <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
             <div class="hasPicker">
-                <input name="<?php echo esc_attr( $frm_style->get_field_name('success_bg_color') ) ?>" id="frm_success_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['success_bg_color'] ) ?>" type="text" /></div>
+                <input name="<?php echo esc_attr( $frm_style->get_field_name( 'success_bg_color' ) ) ?>" id="frm_success_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['success_bg_color'] ) ?>" type="text" /></div>
         </div>
         <div class="field-group clearfix">
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('success_border_color') ) ?>" id="frm_success_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['success_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'success_border_color' ) ) ?>" id="frm_success_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['success_border_color'] ) ?>" />
         </div>
         <div class="field-group clearfix">
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
-        	<input name="<?php echo esc_attr( $frm_style->get_field_name('success_text_color') ) ?>" id="frm_success_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['success_text_color'] ) ?>" type="text" />
+        	<input name="<?php echo esc_attr( $frm_style->get_field_name( 'success_text_color' ) ) ?>" id="frm_success_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['success_text_color'] ) ?>" type="text" />
         </div>
         <div class="field-group clearfix">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('success_font_size') ) ?>" id="frm_success_font_size" value="<?php echo esc_attr( $style->post_content['success_font_size'] ) ?>"  size="3" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'success_font_size' ) ) ?>" id="frm_success_font_size" value="<?php echo esc_attr( $style->post_content['success_font_size'] ) ?>"  size="3" />
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->
@@ -37,21 +37,21 @@ 
 	    <div class="field-group field-group-border clearfix">
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
             <div class="hasPicker">
-                <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('error_bg') ) ?>" id="frm_error_bg" class="hex" value="<?php echo esc_attr($style->post_content['error_bg']) ?>" /></div>
+                <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'error_bg' ) ) ?>" id="frm_error_bg" class="hex" value="<?php echo esc_attr( $style->post_content['error_bg'] ) ?>" /></div>
         </div>
         <div class="field-group clearfix">
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('error_border') ) ?>" id="frm_error_border" class="hex" value="<?php echo esc_attr( $style->post_content['error_border'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'error_border' ) ) ?>" id="frm_error_border" class="hex" value="<?php echo esc_attr( $style->post_content['error_border'] ) ?>" />
         </div>
         <div class="field-group clearfix">
 
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('error_text') ) ?>" id="frm_error_text" class="hex" value="<?php echo esc_attr( $style->post_content['error_text'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'error_text' ) ) ?>" id="frm_error_text" class="hex" value="<?php echo esc_attr( $style->post_content['error_text'] ) ?>" />
         </div>
 
         <div class="field-group clearfix">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('error_font_size') ) ?>" id="frm_error_font_size" value="<?php echo esc_attr( $style->post_content['error_font_size'] ) ?>"  size="3" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'error_font_size' ) ) ?>" id="frm_error_font_size" value="<?php echo esc_attr( $style->post_content['error_font_size'] ) ?>"  size="3" />
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->

classes/views/styles/_section-fields.php

Spacing +27 added lines, -27 removed lines

@@ -1,10 +1,10 @@ 
 <div class="posttypediv">
 	<ul class="posttype-tabs add-menu-item-tabs">
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-headings') ?>" class="nav-tab-link" data-type="tabs-panel-headings" ><?php _e( 'Headings', 'formidable' ) ?></a>
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-headings' ) ?>" class="nav-tab-link" data-type="tabs-panel-headings" ><?php _e( 'Headings', 'formidable' ) ?></a>
     	</li>
 		<li <?php echo ( 'collapse' == $current_tab ? ' class="tabs"' : '' ); ?>>
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=collapse#page-collapse') ?>" class="nav-tab-link" data-type="tabs-panel-collapse" ><?php _e( 'Collapsible', 'formidable' ) ?></a>
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=collapse#page-collapse' ) ?>" class="nav-tab-link" data-type="tabs-panel-collapse" ><?php _e( 'Collapsible', 'formidable' ) ?></a>
 		</li>
 		<li <?php echo ( 'repeat' == $current_tab ? ' class="tabs"' : '' ); ?>>
 			<a href="?page=formidable-styles&page-tab=repeat#tabs-panel-repeat" class="nav-tab-link" data-type="tabs-panel-repeat"><?php _e( 'Repeatable', 'formidable' ) ?></a>
@@ -16,12 +16,12 @@ 
 	?>">
 	    <div class="field-group field-group-background">
         	<label><?php _e( 'Color', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_color') ) ?>" id="frm_section_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_color' ) ) ?>" id="frm_section_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_color'] ) ?>" />
         </div>
 
         <div class="field-group">
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_weight') ) ?>" id="frm_section_weight">
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_weight' ) ) ?>" id="frm_section_weight">
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['section_weight'], $value ) ?>><?php echo $name ?></option>
 				<?php } ?>
@@ -30,54 +30,54 @@ 
 
         <div class="field-group">
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_font_size') ) ?>" id="frm_section_font_size" value="<?php echo esc_attr( $style->post_content['section_font_size'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_font_size' ) ) ?>" id="frm_section_font_size" value="<?php echo esc_attr( $style->post_content['section_font_size'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border frm-half">
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_pad') ) ?>" id="frm_section_pad" value="<?php echo esc_attr( $style->post_content['section_pad'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_pad' ) ) ?>" id="frm_section_pad" value="<?php echo esc_attr( $style->post_content['section_pad'] ) ?>" />
         </div>
 
         <div class="field-group frm-half">
     	    <label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_bg_color') ) ?>" id="frm_section_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_bg_color'] ) ?>" />
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_bg_color' ) ) ?>" id="frm_section_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_bg_color'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border frm-half">
         	<label><?php _e( 'Top Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_mar_top') ) ?>" id="frm_section_mar_top" value="<?php echo esc_attr( $style->post_content['section_mar_top'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_mar_top' ) ) ?>" id="frm_section_mar_top" value="<?php echo esc_attr( $style->post_content['section_mar_top'] ) ?>" />
         </div>
         <div class="field-group frm-half">
         	<label><?php _e( 'Bottom Margin', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_mar_bottom') ) ?>" id="frm_section_mar_bottom" value="<?php echo esc_attr( $style->post_content['section_mar_bottom'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_mar_bottom' ) ) ?>" id="frm_section_mar_bottom" value="<?php echo esc_attr( $style->post_content['section_mar_bottom'] ) ?>" />
         </div>
 
         <div class="field-group field-group-border">
             <label><?php _e( 'Border', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_border_color') ) ?>" id="frm_section_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_border_color'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_color' ) ) ?>" id="frm_section_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['section_border_color'] ) ?>" />
         </div>
         <div class="field-group">
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('section_border_width') ) ?>" id="frm_section_border_width" value="<?php echo esc_attr( $style->post_content['section_border_width'] ) ?>" />
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_width' ) ) ?>" id="frm_section_border_width" value="<?php echo esc_attr( $style->post_content['section_border_width'] ) ?>" />
         </div>
         <div class="field-group">
         	<label><?php _e( 'Style', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_border_style') ) ?>" id="frm_section_border_style">
-        	    <option value="solid" <?php selected($style->post_content['section_border_style'], 'solid') ?>><?php _e( 'solid', 'formidable' ) ?></option>
-        		<option value="dotted" <?php selected($style->post_content['section_border_style'], 'dotted') ?>><?php _e( 'dotted', 'formidable' ) ?></option>
-        		<option value="dashed" <?php selected($style->post_content['section_border_style'], 'dashed') ?>><?php _e( 'dashed', 'formidable' ) ?></option>
-        		<option value="double" <?php selected($style->post_content['section_border_style'], 'double') ?>><?php _e( 'double', 'formidable' ) ?></option>
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_style' ) ) ?>" id="frm_section_border_style">
+        	    <option value="solid" <?php selected( $style->post_content['section_border_style'], 'solid' ) ?>><?php _e( 'solid', 'formidable' ) ?></option>
+        		<option value="dotted" <?php selected( $style->post_content['section_border_style'], 'dotted' ) ?>><?php _e( 'dotted', 'formidable' ) ?></option>
+        		<option value="dashed" <?php selected( $style->post_content['section_border_style'], 'dashed' ) ?>><?php _e( 'dashed', 'formidable' ) ?></option>
+        		<option value="double" <?php selected( $style->post_content['section_border_style'], 'double' ) ?>><?php _e( 'double', 'formidable' ) ?></option>
         	</select>
         </div>
 
         <div class="field-group field-group-border frm-half">
         	<label><?php _e( 'Border Position', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_border_loc') ) ?>" id="frm_section_border_loc">
-        	    <option value="-top" <?php selected($style->post_content['section_border_loc'], '-top') ?>><?php _e( 'top', 'formidable' ) ?></option>
-        		<option value="-bottom" <?php selected($style->post_content['section_border_loc'], '-bottom') ?>><?php _e( 'bottom', 'formidable' ) ?></option>
-        		<option value="-left" <?php selected($style->post_content['section_border_loc'], '-left') ?>><?php _e( 'left', 'formidable' ) ?></option>
-        		<option value="-right" <?php selected($style->post_content['section_border_loc'], '-right') ?>><?php _e( 'right', 'formidable' ) ?></option>
-        		<option value="" <?php selected($style->post_content['section_border_loc'], '') ?>><?php _e( 'all', 'formidable' ) ?></option>
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_loc' ) ) ?>" id="frm_section_border_loc">
+        	    <option value="-top" <?php selected( $style->post_content['section_border_loc'], '-top' ) ?>><?php _e( 'top', 'formidable' ) ?></option>
+        		<option value="-bottom" <?php selected( $style->post_content['section_border_loc'], '-bottom' ) ?>><?php _e( 'bottom', 'formidable' ) ?></option>
+        		<option value="-left" <?php selected( $style->post_content['section_border_loc'], '-left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
+        		<option value="-right" <?php selected( $style->post_content['section_border_loc'], '-right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
+        		<option value="" <?php selected( $style->post_content['section_border_loc'], '' ) ?>><?php _e( 'all', 'formidable' ) ?></option>
         	</select>
         </div>
         <div class="clear"></div>
@@ -88,14 +88,14 @@ 
 	?>">
 	    <div class="field-group frm-half">
         	<label><?php _e( 'Icons', 'formidable' ) ?></label>
-            <?php FrmStylesHelper::bs_icon_select($style, $frm_style, 'arrow'); ?>
+            <?php FrmStylesHelper::bs_icon_select( $style, $frm_style, 'arrow' ); ?>
         </div>
 
         <div class="field-group frm-half">
         	<label><?php _e( 'Icon Position', 'formidable' ) ?></label>
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('collapse_pos') ) ?>" id="frm_collapse_pos">
-        	    <option value="after" <?php selected($style->post_content['collapse_pos'], 'after') ?>><?php _e( 'After Heading', 'formidable' ) ?></option>
-        	    <option value="before" <?php selected($style->post_content['collapse_pos'], 'before') ?>><?php _e( 'Before Heading', 'formidable' ) ?></option>
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'collapse_pos' ) ) ?>" id="frm_collapse_pos">
+        	    <option value="after" <?php selected( $style->post_content['collapse_pos'], 'after' ) ?>><?php _e( 'After Heading', 'formidable' ) ?></option>
+        	    <option value="before" <?php selected( $style->post_content['collapse_pos'], 'before' ) ?>><?php _e( 'Before Heading', 'formidable' ) ?></option>
         	</select>
         </div>
         <div class="clear"></div>
@@ -106,7 +106,7 @@ 
 	?>">
 	    <div class="field-group frm-half">
         	<label><?php _e( 'Icons', 'formidable' ) ?></label>
-            <?php FrmStylesHelper::bs_icon_select($style, $frm_style, 'minus'); ?>
+            <?php FrmStylesHelper::bs_icon_select( $style, $frm_style, 'minus' ); ?>
         </div>
         <div class="clear"></div>
 	</div><!-- /.tabs-panel -->