Completed
Push — master ( 89c42b...98e503 )
by Jamie
10:17
created
classes/views/styles/_buttons.php 1 patch
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,14 +1,14 @@  discard block
 block discarded – undo
1 1
 <p class="frm_no_top_margin">
2
-	<label for="frm_submit_style"><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name('submit_style') ) ?>" id="frm_submit_style" <?php echo $style->post_content['submit_style'] ? 'checked="checked"': ''; ?> value="1" /> <?php _e( 'Disable submit button styling', 'formidable' ); ?> <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ?>" ></span></label>
2
+	<label for="frm_submit_style"><input type="checkbox" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_style' ) ) ?>" id="frm_submit_style" <?php echo $style->post_content['submit_style'] ? 'checked="checked"' : ''; ?> value="1" /> <?php _e( 'Disable submit button styling', 'formidable' ); ?> <span class="frm_help frm_icon_font frm_tooltip_icon" title="<?php esc_attr_e( 'Note: If disabled, you may not see the change take effect until you make 2 more styling changes or click "Update Options".', 'formidable' ) ?>" ></span></label>
3 3
 </p>
4 4
 
5 5
 <div class="posttypediv">
6 6
 	<ul class="posttype-tabs add-menu-item-tabs">
7 7
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
8
-    		<a href="<?php echo esc_url('?page=formidable-styles&page-tab=default#tabs-panel-button-default') ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
8
+    		<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=default#tabs-panel-button-default' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-default" ><?php _e( 'Default', 'formidable' ) ?></a>
9 9
     	</li>
10 10
 		<li <?php echo ( 'button-hover' == $current_tab ? ' class="tabs"' : '' ); ?>>
11
-			<a href="<?php echo esc_url('?page=formidable-styles&page-tab=button-hover#page-button-hover') ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
11
+			<a href="<?php echo esc_url( '?page=formidable-styles&page-tab=button-hover#page-button-hover' ) ?>" class="nav-tab-link" data-type="tabs-panel-button-hover" ><?php _e( 'Hover', 'formidable' ) ?></a>
12 12
 		</li>
13 13
 		<li <?php echo ( 'button-click' == $current_tab ? ' class="tabs"' : '' ); ?>>
14 14
 			<a href="?page=formidable-styles&page-tab=button-click#tabs-panel-button-click" class="nav-tab-link" data-type="tabs-panel-button-click"><?php _e( 'Click', 'formidable' ) ?></a>
@@ -20,22 +20,22 @@  discard block
 block discarded – undo
20 20
 	?>">
21 21
 	    <div class="field-group field-group-border clearfix">
22 22
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
23
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_font_size') ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
23
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_font_size' ) ) ?>" id="frm_submit_font_size" value="<?php echo esc_attr( $style->post_content['submit_font_size'] ) ?>"  size="3" />
24 24
         </div>
25 25
 
26 26
         <div class="field-group clearfix">
27 27
         	<label><?php _e( 'Width', 'formidable' ) ?></label>
28
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_width') ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
28
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_width' ) ) ?>" id="frm_submit_width" value="<?php echo esc_attr( $style->post_content['submit_width'] ) ?>"  size="5" />
29 29
         </div>
30 30
 
31 31
         <div class="field-group clearfix">
32 32
         	<label><?php _e( 'Height', 'formidable' ) ?></label>
33
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_height') ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
33
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_height' ) ) ?>" id="frm_submit_height" value="<?php echo esc_attr( $style->post_content['submit_height'] ) ?>"  size="5" />
34 34
         </div>
35 35
 
36 36
         <div class="field-group clearfix">
37 37
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
38
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('submit_weight') ) ?>" id="frm_submit_weight">
38
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_weight' ) ) ?>" id="frm_submit_weight">
39 39
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
40 40
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['submit_weight'], $value ) ?>><?php echo $name ?></option>
41 41
 				<?php } ?>
@@ -44,48 +44,48 @@  discard block
 block discarded – undo
44 44
 
45 45
         <div class="field-group clearfix">
46 46
         	<label><?php _e( 'Corners', 'formidable' ) ?></label>
47
-        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_radius') ) ?>" id="frm_submit_border_radius" size="4"/>
47
+        	<input type="text" value="<?php echo esc_attr( $style->post_content['submit_border_radius'] ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_radius' ) ) ?>" id="frm_submit_border_radius" size="4"/>
48 48
         </div>
49 49
 
50 50
         <div class="field-group field-group-border clearfix">
51 51
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
52
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_color') ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
52
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_color' ) ) ?>" id="frm_submit_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_bg_color'] ) ?>" />
53 53
         </div>
54 54
 
55 55
         <div class="field-group clearfix">
56 56
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
57
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_text_color') ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
57
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_text_color' ) ) ?>" id="frm_submit_text_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_text_color'] ) ?>" />
58 58
         </div>
59 59
 
60 60
         <div class="field-group field-group-border clearfix">
61 61
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
62
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_color') ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
62
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_color' ) ) ?>" id="frm_submit_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_border_color'] ) ?>" />
63 63
         </div>
64 64
 
65 65
         <div class="field-group clearfix">
66 66
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
67
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_border_width') ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
67
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_border_width' ) ) ?>" id="frm_submit_border_width" value="<?php echo esc_attr( $style->post_content['submit_border_width'] ) ?>" size="4" />
68 68
         </div>
69 69
 
70 70
         <div class="field-group clearfix">
71 71
         	<label><?php _e( 'Shadow', 'formidable' ) ?></label>
72
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_shadow_color') ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
72
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_shadow_color' ) ) ?>" id="frm_submit_shadow_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_shadow_color'] ) ?>" />
73 73
         </div>
74 74
 
75 75
         <div class="clear"></div>
76 76
         <div class="field-group field-group-border frm-full">
77 77
         	<label><?php _e( 'BG Image', 'formidable' ) ?></label>
78
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_bg_img') ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
78
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_bg_img' ) ) ?>" id="frm_submit_bg_img" value="<?php echo esc_attr( $style->post_content['submit_bg_img'] ) ?>"  />
79 79
         </div>
80 80
 
81 81
         <div class="field-group field-group-border clearfix">
82 82
         	<label><?php _e( 'Margin', 'formidable' ) ?></label>
83
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_margin') ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
83
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_margin' ) ) ?>" id="frm_submit_margin" value="<?php echo esc_attr( $style->post_content['submit_margin'] ) ?>" size="6" />
84 84
         </div>
85 85
 
86 86
         <div class="field-group clearfix">
87 87
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
88
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_padding') ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
88
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_padding' ) ) ?>" id="frm_submit_padding" value="<?php echo esc_attr( $style->post_content['submit_padding'] ) ?>" size="6" />
89 89
         </div>
90 90
         <div class="clear"></div>
91 91
 	</div><!-- /.tabs-panel -->
@@ -95,17 +95,17 @@  discard block
 block discarded – undo
95 95
 	?>">
96 96
 	    <div class="field-group clearfix">
97 97
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
98
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_bg_color') ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
98
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_bg_color' ) ) ?>" id="frm_submit_hover_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_bg_color'] ) ?>" />
99 99
         </div>
100 100
 
101 101
         <div class="field-group clearfix">
102 102
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
103
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_color') ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
103
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_color' ) ) ?>" id="frm_submit_hover_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_color'] ) ?>" />
104 104
         </div>
105 105
 
106 106
         <div class="field-group clearfix">
107 107
             <label><?php _e( 'Border', 'formidable' ) ?></label>
108
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_hover_border_color') ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
108
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_hover_border_color' ) ) ?>" id="frm_submit_hover_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_hover_border_color'] ) ?>" />
109 109
         </div>
110 110
 
111 111
 	    <div class="clear"></div>
@@ -116,17 +116,17 @@  discard block
 block discarded – undo
116 116
 	?>">
117 117
 	    <div class="field-group clearfix">
118 118
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
119
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_bg_color') ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
119
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_bg_color' ) ) ?>" id="frm_submit_active_bg_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_bg_color'] ) ?>" />
120 120
         </div>
121 121
 
122 122
         <div class="field-group clearfix">
123 123
     	    <label><?php _e( 'Text', 'formidable' ) ?></label>
124
-    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_color') ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
124
+    	    <input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_color' ) ) ?>" id="frm_submit_active_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_color'] ) ?>" />
125 125
         </div>
126 126
 
127 127
         <div class="field-group clearfix">
128 128
             <label><?php _e( 'Border', 'formidable' ) ?></label>
129
-        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('submit_active_border_color') ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
129
+        	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'submit_active_border_color' ) ) ?>" id="frm_submit_active_border_color" class="hex" value="<?php echo esc_attr( $style->post_content['submit_active_border_color'] ) ?>" />
130 130
         </div>
131 131
 
132 132
 	    <div class="clear"></div>
Please login to merge, or discard this patch.
classes/views/styles/_check-box-radio-fields.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,26 +1,26 @@  discard block
 block discarded – undo
1 1
 <div class="field-group clearfix frm-half frm-first-row">
2 2
 	<label><?php _e( 'Radio', 'formidable' ) ?></label>
3
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('radio_align') ) ?>" id="frm_radio_align">
4
-        <option value="block" <?php selected($style->post_content['radio_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
5
-        <option value="inline" <?php selected($style->post_content['radio_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
3
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'radio_align' ) ) ?>" id="frm_radio_align">
4
+        <option value="block" <?php selected( $style->post_content['radio_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
5
+        <option value="inline" <?php selected( $style->post_content['radio_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
6 6
 	</select>
7 7
 </div>
8 8
 
9 9
 <div class="field-group clearfix frm-half frm-first-row">
10 10
 	<label><?php _e( 'Check Box', 'formidable' ) ?></label>
11
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_align') ) ?>" id="frm_check_align">
12
-        <option value="block" <?php selected($style->post_content['check_align'], 'block') ?>><?php _e( 'Multiple Rows' , 'formidable' ) ?></option>
13
-        <option value="inline" <?php selected($style->post_content['check_align'], 'inline') ?>><?php _e( 'Single Row' , 'formidable' ) ?></option>
11
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_align' ) ) ?>" id="frm_check_align">
12
+        <option value="block" <?php selected( $style->post_content['check_align'], 'block' ) ?>><?php _e( 'Multiple Rows', 'formidable' ) ?></option>
13
+        <option value="inline" <?php selected( $style->post_content['check_align'], 'inline' ) ?>><?php _e( 'Single Row', 'formidable' ) ?></option>
14 14
 	</select>
15 15
 </div>
16 16
 
17 17
 <div class="field-group field-group-background clearfix">
18 18
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
19
-	<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'] ) ?>" />
19
+	<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'] ) ?>" />
20 20
 </div>
21 21
 <div class="field-group clearfix">
22 22
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
23
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('check_weight') ) ?>" id="frm_check_weight">
23
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'check_weight' ) ) ?>" id="frm_check_weight">
24 24
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
25 25
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['check_weight'], $value ) ?>><?php echo $name ?></option>
26 26
 		<?php } ?>
@@ -28,5 +28,5 @@  discard block
 block discarded – undo
28 28
 </div>
29 29
 <div class="field-group clearfix">
30 30
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
31
-	<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" />
31
+	<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" />
32 32
 </div>
Please login to merge, or discard this patch.
classes/views/styles/_date-fields.php 2 patches
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -2,19 +2,19 @@
 block discarded – undo
2 2
 $jquery_themes = FrmStylesHelper::jquery_themes();
3 3
 
4 4
 $alt_img_name = array(
5
-    'ui-lightness'  => 'ui_light',
6
-    'ui-darkness'   => 'ui_dark',
7
-    'start'         => 'start_menu',
8
-    'redmond'       => 'windoze',
9
-    'vader'         => 'black_matte',
10
-    'mint-choc'     => 'mint_choco',
5
+	'ui-lightness'  => 'ui_light',
6
+	'ui-darkness'   => 'ui_dark',
7
+	'start'         => 'start_menu',
8
+	'redmond'       => 'windoze',
9
+	'vader'         => 'black_matte',
10
+	'mint-choc'     => 'mint_choco',
11 11
 );
12 12
 $theme_names = array_keys($jquery_themes);
13 13
 $theme_names = array_combine($theme_names, $theme_names);
14 14
 
15 15
 foreach ( $theme_names as $k => $v ) {
16 16
 	$theme_names[ $k ] = str_replace( '-', '_', $v );
17
-    unset($k, $v);
17
+	unset($k, $v);
18 18
 }
19 19
 
20 20
 $alt_img_name = array_merge($theme_names, $alt_img_name);
Please login to merge, or discard this patch.
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -9,32 +9,32 @@
 block discarded – undo
9 9
     'vader'         => 'black_matte',
10 10
     'mint-choc'     => 'mint_choco',
11 11
 );
12
-$theme_names = array_keys($jquery_themes);
13
-$theme_names = array_combine($theme_names, $theme_names);
12
+$theme_names = array_keys( $jquery_themes );
13
+$theme_names = array_combine( $theme_names, $theme_names );
14 14
 
15 15
 foreach ( $theme_names as $k => $v ) {
16
-	$theme_names[ $k ] = str_replace( '-', '_', $v );
17
-    unset($k, $v);
16
+	$theme_names[$k] = str_replace( '-', '_', $v );
17
+    unset( $k, $v );
18 18
 }
19 19
 
20
-$alt_img_name = array_merge($theme_names, $alt_img_name);
21
-unset($theme_names);
20
+$alt_img_name = array_merge( $theme_names, $alt_img_name );
21
+unset( $theme_names );
22 22
 
23 23
 ?>
24 24
 
25 25
 <div class="field-group clearfix frm-half frm-first-row">
26 26
 	<label><?php _e( 'Theme', 'formidable' ) ?></label>
27
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('theme_selector') ) ?>">
27
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'theme_selector' ) ) ?>">
28 28
 	    <?php foreach ( $jquery_themes as $theme_name => $theme_title ) { ?>
29
-        <option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[ $theme_name ] ); ?>" <?php selected($theme_title, $style->post_content['theme_name']) ?>><?php echo esc_html( $theme_title ) ?></option>
29
+        <option value="<?php echo esc_attr( $theme_name ) ?>" id="90_<?php echo esc_attr( $alt_img_name[$theme_name] ); ?>" <?php selected( $theme_title, $style->post_content['theme_name'] ) ?>><?php echo esc_html( $theme_title ) ?></option>
30 30
         <?php } ?>
31
-        <option value="-1" <?php selected('-1', $style->post_content['theme_name']) ?>>&mdash; <?php _e( 'None', 'formidable' ) ?> &mdash;</option>
31
+        <option value="-1" <?php selected( '-1', $style->post_content['theme_name'] ) ?>>&mdash; <?php _e( 'None', 'formidable' ) ?> &mdash;</option>
32 32
 	</select>
33 33
 </div>
34 34
 
35 35
 <div class="field-group clearfix frm-half frm-first-row frm_right_text">
36
-    <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="" />
37
-	<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') ) ?>" />
38
-    <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') ) ?>" />
36
+    <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="" />
37
+	<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' ) ) ?>" />
38
+    <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' ) ) ?>" />
39 39
 </div>
40 40
 <div class="clear"></div>
Please login to merge, or discard this patch.
classes/views/styles/_field-description.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <div class="field-group field-group-background clearfix frm-first-row">
2 2
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
3
-	<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'] ) ?>" />
3
+	<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'] ) ?>" />
4 4
 </div>
5 5
 <div class="field-group clearfix frm-first-row">
6 6
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
7
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_weight') ) ?>" id="frm_description_weight">
7
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_weight' ) ) ?>" id="frm_description_weight">
8 8
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
9 9
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['description_weight'], $value ) ?>><?php echo $name ?></option>
10 10
 		<?php } ?>
@@ -12,21 +12,21 @@  discard block
 block discarded – undo
12 12
 </div>
13 13
 <div class="field-group clearfix frm-first-row">
14 14
 	<label><?php _e( 'Style', 'formidable' ) ?></label>
15
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_style') ) ?>" id="frm_description_style">
16
-		<option value="normal" <?php selected($style->post_content['description_style'], 'normal') ?>><?php _e( 'normal', 'formidable' ) ?></option>
17
-		<option value="italic" <?php selected($style->post_content['description_style'], 'italic') ?>><?php _e( 'italic', 'formidable' ) ?></option>
15
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_style' ) ) ?>" id="frm_description_style">
16
+		<option value="normal" <?php selected( $style->post_content['description_style'], 'normal' ) ?>><?php _e( 'normal', 'formidable' ) ?></option>
17
+		<option value="italic" <?php selected( $style->post_content['description_style'], 'italic' ) ?>><?php _e( 'italic', 'formidable' ) ?></option>
18 18
 	</select>
19 19
 </div>
20 20
 <div class="field-group clearfix">
21 21
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
22
-	<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" />
22
+	<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" />
23 23
 </div>
24 24
 
25 25
 <div class="field-group clearfix">
26 26
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
27
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('description_align') ) ?>" id="frm_description_align">
28
-		<option value="left" <?php selected($style->post_content['description_align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
29
-		<option value="right" <?php selected($style->post_content['description_align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
27
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'description_align' ) ) ?>" id="frm_description_align">
28
+		<option value="left" <?php selected( $style->post_content['description_align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
29
+		<option value="right" <?php selected( $style->post_content['description_align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
30 30
 	</select>
31 31
 </div>
32 32
 <div class="clear"></div>
Please login to merge, or discard this patch.
classes/views/styles/_field-labels.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <div class="field-group field-group-background clearfix frm-first-row">
2 2
 	<label><?php _e( 'Color', 'formidable' ) ?></label>
3
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('label_color') ) ?>" id="frm_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['label_color'] ) ?>" />
3
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'label_color' ) ) ?>" id="frm_label_color" class="hex" value="<?php echo esc_attr( $style->post_content['label_color'] ) ?>" />
4 4
 </div>
5 5
 <div class="field-group clearfix frm-first-row">
6 6
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
7
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('weight') ) ?>" id="frm_weight">
7
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'weight' ) ) ?>" id="frm_weight">
8 8
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
9 9
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['weight'], $value ) ?>><?php echo $name ?></option>
10 10
 		<?php } ?>
@@ -12,45 +12,45 @@  discard block
 block discarded – undo
12 12
 </div>
13 13
 <div class="field-group clearfix frm-first-row">
14 14
 	<label><?php _e( 'Size', 'formidable' ) ?></label>
15
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('font_size') ) ?>" id="frm_font_size" value="<?php echo esc_attr($style->post_content['font_size']) ?>"  size="3" />
15
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'font_size' ) ) ?>" id="frm_font_size" value="<?php echo esc_attr( $style->post_content['font_size'] ) ?>"  size="3" />
16 16
 </div>
17 17
 
18 18
 <div class="field-group clearfix frm_clear">
19 19
 	<label><?php _e( 'Position', 'formidable' ) ?></label>
20
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('position') ) ?>" id="frm_position">
20
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'position' ) ) ?>" id="frm_position">
21 21
 	    <?php foreach ( array( 'none' => __( 'top', 'formidable' ), 'left' => __( 'left', 'formidable' ), 'right' => __( 'right', 'formidable' ), 'no_label' => __( 'none', 'formidable' ) ) as $pos => $pos_label ) { ?>
22
-	        <option value="<?php echo esc_attr( $pos ) ?>" <?php selected($style->post_content['position'], $pos) ?>><?php echo $pos_label ?></option>
22
+	        <option value="<?php echo esc_attr( $pos ) ?>" <?php selected( $style->post_content['position'], $pos ) ?>><?php echo $pos_label ?></option>
23 23
 	    <?php } ?>
24 24
 	</select>
25 25
 </div>
26 26
 
27 27
 <div class="field-group clearfix">
28 28
 	<label><?php _e( 'Align', 'formidable' ) ?></label>
29
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('align') ) ?>" id="frm_align">
30
-		<option value="left" <?php selected($style->post_content['align'], 'left') ?>><?php _e( 'left', 'formidable' ) ?></option>
31
-		<option value="right" <?php selected($style->post_content['align'], 'right') ?>><?php _e( 'right', 'formidable' ) ?></option>
29
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'align' ) ) ?>" id="frm_align">
30
+		<option value="left" <?php selected( $style->post_content['align'], 'left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
31
+		<option value="right" <?php selected( $style->post_content['align'], 'right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
32 32
 	</select>
33 33
 </div>
34 34
 
35 35
 <div class="field-group clearfix">
36 36
 	<label><?php _e( 'Width', 'formidable' ) ?></label>
37
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('width') ) ?>" id="frm_width" value="<?php echo esc_attr( $style->post_content['width'] ) ?>" />
37
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'width' ) ) ?>" id="frm_width" value="<?php echo esc_attr( $style->post_content['width'] ) ?>" />
38 38
 </div>
39 39
 
40 40
 <div class="field-group clearfix frm_clear">
41 41
 	<label><?php _e( 'Padding', 'formidable' ) ?></label>
42
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('label_padding') ) ?>" id="frm_label_padding" value="<?php echo esc_attr( $style->post_content['label_padding'] ) ?>" />
42
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'label_padding' ) ) ?>" id="frm_label_padding" value="<?php echo esc_attr( $style->post_content['label_padding'] ) ?>" />
43 43
 </div>
44 44
 
45 45
 <div class="clear"></div>
46 46
 <h3><?php _e( 'Required Indicator', 'formidable' ) ?></h3>
47 47
 <div class="field-group field-group-border clearfix after-h3">
48 48
 	<label class="background"><?php _e( 'Color', 'formidable' ) ?></label>
49
-	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name('required_color') ) ?>" id="frm_required_color" class="hex" value="<?php echo esc_attr( $style->post_content['required_color'] ) ?>" />
49
+	<input type="text" name="<?php echo esc_attr( $frm_style->get_field_name( 'required_color' ) ) ?>" id="frm_required_color" class="hex" value="<?php echo esc_attr( $style->post_content['required_color'] ) ?>" />
50 50
 </div>
51 51
 <div class="field-group clearfix after-h3">
52 52
 	<label><?php _e( 'Weight', 'formidable' ) ?></label>
53
-	<select name="<?php echo esc_attr( $frm_style->get_field_name('required_weight') ) ?>" id="frm_required_weight">
53
+	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'required_weight' ) ) ?>" id="frm_required_weight">
54 54
 		<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
55 55
 		<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['required_weight'], $value ) ?>><?php echo $name ?></option>
56 56
 		<?php } ?>
Please login to merge, or discard this patch.
classes/views/styles/_form-messages.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <div class="posttypediv">
2 2
 	<ul class="posttype-tabs add-menu-item-tabs">
3 3
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
4
-    		<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>
4
+    		<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>
5 5
     	</li>
6 6
 		<li <?php echo ( 'error-msg' == $current_tab ? ' class="tabs"' : '' ); ?>>
7
-			<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>
7
+			<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>
8 8
 		</li>
9 9
 	</ul><!-- .posttype-tabs -->
10 10
 
@@ -14,19 +14,19 @@  discard block
 block discarded – undo
14 14
 	    <div class="field-group field-group-border clearfix">
15 15
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
16 16
             <div class="hasPicker">
17
-                <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>
17
+                <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>
18 18
         </div>
19 19
         <div class="field-group clearfix">
20 20
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
21
-        	<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'] ) ?>" />
21
+        	<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'] ) ?>" />
22 22
         </div>
23 23
         <div class="field-group clearfix">
24 24
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
25
-        	<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" />
25
+        	<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" />
26 26
         </div>
27 27
         <div class="field-group clearfix">
28 28
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
29
-        	<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" />
29
+        	<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" />
30 30
         </div>
31 31
         <div class="clear"></div>
32 32
 	</div><!-- /.tabs-panel -->
@@ -37,21 +37,21 @@  discard block
 block discarded – undo
37 37
 	    <div class="field-group field-group-border clearfix">
38 38
         	<label><?php _e( 'BG Color', 'formidable' ) ?></label>
39 39
             <div class="hasPicker">
40
-                <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>
40
+                <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>
41 41
         </div>
42 42
         <div class="field-group clearfix">
43 43
         	<label><?php _e( 'Border', 'formidable' ) ?></label>
44
-        	<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'] ) ?>" />
44
+        	<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'] ) ?>" />
45 45
         </div>
46 46
         <div class="field-group clearfix">
47 47
 
48 48
         	<label><?php _e( 'Text', 'formidable' ) ?></label>
49
-        	<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'] ) ?>" />
49
+        	<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'] ) ?>" />
50 50
         </div>
51 51
 
52 52
         <div class="field-group clearfix">
53 53
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
54
-        	<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" />
54
+        	<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" />
55 55
         </div>
56 56
         <div class="clear"></div>
57 57
 	</div><!-- /.tabs-panel -->
Please login to merge, or discard this patch.
classes/views/styles/_sample_form.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@
 block discarded – undo
1 1
 <div class="frm_forms with_frm_style frm_style_<?php echo esc_attr( $style->post_name ) ?>">
2 2
 <div class="frm-show-form">
3 3
 <div class="frm_error_style">
4
-    <strong><?php echo __( 'SAMPLE:', 'formidable' ) .'</strong> '. $frm_settings->invalid_msg ?>
4
+    <strong><?php echo __( 'SAMPLE:', 'formidable' ) . '</strong> ' . $frm_settings->invalid_msg ?>
5 5
 </div>
6 6
 
7
-<div id="message" class="frm_message"><strong><?php echo __( 'SAMPLE:', 'formidable' ) .'</strong> '. $frm_settings->success_msg ?></div>
7
+<div id="message" class="frm_message"><strong><?php echo __( 'SAMPLE:', 'formidable' ) . '</strong> ' . $frm_settings->success_msg ?></div>
8 8
 
9 9
 <?php $pos_class = 'frm_pos_container frm_' . ( $style->post_content['position'] == 'none' ? 'top' : ( $style->post_content['position'] == 'no_label' ? 'none' : $style->post_content['position'] ) ) . '_container'; ?>
10 10
 
Please login to merge, or discard this patch.
classes/views/styles/_section-fields.php 1 patch
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,10 +1,10 @@  discard block
 block discarded – undo
1 1
 <div class="posttypediv">
2 2
 	<ul class="posttype-tabs add-menu-item-tabs">
3 3
 		<li <?php echo ( 'default' == $current_tab ? ' class="tabs"' : '' ); ?>>
4
-    		<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>
4
+    		<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>
5 5
     	</li>
6 6
 		<li <?php echo ( 'collapse' == $current_tab ? ' class="tabs"' : '' ); ?>>
7
-			<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>
7
+			<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>
8 8
 		</li>
9 9
 		<li <?php echo ( 'repeat' == $current_tab ? ' class="tabs"' : '' ); ?>>
10 10
 			<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 @@  discard block
 block discarded – undo
16 16
 	?>">
17 17
 	    <div class="field-group field-group-background">
18 18
         	<label><?php _e( 'Color', 'formidable' ) ?></label>
19
-        	<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'] ) ?>" />
19
+        	<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'] ) ?>" />
20 20
         </div>
21 21
 
22 22
         <div class="field-group">
23 23
         	<label><?php _e( 'Weight', 'formidable' ) ?></label>
24
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_weight') ) ?>" id="frm_section_weight">
24
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_weight' ) ) ?>" id="frm_section_weight">
25 25
 				<?php foreach ( FrmStyle::get_bold_options() as $value => $name ) { ?>
26 26
 				<option value="<?php echo esc_attr( $value ) ?>" <?php selected( $style->post_content['section_weight'], $value ) ?>><?php echo $name ?></option>
27 27
 				<?php } ?>
@@ -30,54 +30,54 @@  discard block
 block discarded – undo
30 30
 
31 31
         <div class="field-group">
32 32
         	<label><?php _e( 'Size', 'formidable' ) ?></label>
33
-        	<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'] ) ?>" />
33
+        	<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'] ) ?>" />
34 34
         </div>
35 35
 
36 36
         <div class="field-group field-group-border frm-half">
37 37
         	<label><?php _e( 'Padding', 'formidable' ) ?></label>
38
-        	<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'] ) ?>" />
38
+        	<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'] ) ?>" />
39 39
         </div>
40 40
 
41 41
         <div class="field-group frm-half">
42 42
     	    <label class="background"><?php _e( 'BG color', 'formidable' ) ?></label>
43
-    	    <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'] ) ?>" />
43
+    	    <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'] ) ?>" />
44 44
         </div>
45 45
 
46 46
         <div class="field-group field-group-border frm-half">
47 47
         	<label><?php _e( 'Top Margin', 'formidable' ) ?></label>
48
-        	<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'] ) ?>" />
48
+        	<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'] ) ?>" />
49 49
         </div>
50 50
         <div class="field-group frm-half">
51 51
         	<label><?php _e( 'Bottom Margin', 'formidable' ) ?></label>
52
-        	<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'] ) ?>" />
52
+        	<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'] ) ?>" />
53 53
         </div>
54 54
 
55 55
         <div class="field-group field-group-border">
56 56
             <label><?php _e( 'Border', 'formidable' ) ?></label>
57
-        	<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'] ) ?>" />
57
+        	<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'] ) ?>" />
58 58
         </div>
59 59
         <div class="field-group">
60 60
         	<label><?php _e( 'Thickness', 'formidable' ) ?></label>
61
-        	<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'] ) ?>" />
61
+        	<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'] ) ?>" />
62 62
         </div>
63 63
         <div class="field-group">
64 64
         	<label><?php _e( 'Style', 'formidable' ) ?></label>
65
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_border_style') ) ?>" id="frm_section_border_style">
66
-        	    <option value="solid" <?php selected($style->post_content['section_border_style'], 'solid') ?>><?php _e( 'solid', 'formidable' ) ?></option>
67
-        		<option value="dotted" <?php selected($style->post_content['section_border_style'], 'dotted') ?>><?php _e( 'dotted', 'formidable' ) ?></option>
68
-        		<option value="dashed" <?php selected($style->post_content['section_border_style'], 'dashed') ?>><?php _e( 'dashed', 'formidable' ) ?></option>
69
-        		<option value="double" <?php selected($style->post_content['section_border_style'], 'double') ?>><?php _e( 'double', 'formidable' ) ?></option>
65
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_style' ) ) ?>" id="frm_section_border_style">
66
+        	    <option value="solid" <?php selected( $style->post_content['section_border_style'], 'solid' ) ?>><?php _e( 'solid', 'formidable' ) ?></option>
67
+        		<option value="dotted" <?php selected( $style->post_content['section_border_style'], 'dotted' ) ?>><?php _e( 'dotted', 'formidable' ) ?></option>
68
+        		<option value="dashed" <?php selected( $style->post_content['section_border_style'], 'dashed' ) ?>><?php _e( 'dashed', 'formidable' ) ?></option>
69
+        		<option value="double" <?php selected( $style->post_content['section_border_style'], 'double' ) ?>><?php _e( 'double', 'formidable' ) ?></option>
70 70
         	</select>
71 71
         </div>
72 72
 
73 73
         <div class="field-group field-group-border frm-half">
74 74
         	<label><?php _e( 'Border Position', 'formidable' ) ?></label>
75
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('section_border_loc') ) ?>" id="frm_section_border_loc">
76
-        	    <option value="-top" <?php selected($style->post_content['section_border_loc'], '-top') ?>><?php _e( 'top', 'formidable' ) ?></option>
77
-        		<option value="-bottom" <?php selected($style->post_content['section_border_loc'], '-bottom') ?>><?php _e( 'bottom', 'formidable' ) ?></option>
78
-        		<option value="-left" <?php selected($style->post_content['section_border_loc'], '-left') ?>><?php _e( 'left', 'formidable' ) ?></option>
79
-        		<option value="-right" <?php selected($style->post_content['section_border_loc'], '-right') ?>><?php _e( 'right', 'formidable' ) ?></option>
80
-        		<option value="" <?php selected($style->post_content['section_border_loc'], '') ?>><?php _e( 'all', 'formidable' ) ?></option>
75
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'section_border_loc' ) ) ?>" id="frm_section_border_loc">
76
+        	    <option value="-top" <?php selected( $style->post_content['section_border_loc'], '-top' ) ?>><?php _e( 'top', 'formidable' ) ?></option>
77
+        		<option value="-bottom" <?php selected( $style->post_content['section_border_loc'], '-bottom' ) ?>><?php _e( 'bottom', 'formidable' ) ?></option>
78
+        		<option value="-left" <?php selected( $style->post_content['section_border_loc'], '-left' ) ?>><?php _e( 'left', 'formidable' ) ?></option>
79
+        		<option value="-right" <?php selected( $style->post_content['section_border_loc'], '-right' ) ?>><?php _e( 'right', 'formidable' ) ?></option>
80
+        		<option value="" <?php selected( $style->post_content['section_border_loc'], '' ) ?>><?php _e( 'all', 'formidable' ) ?></option>
81 81
         	</select>
82 82
         </div>
83 83
         <div class="clear"></div>
@@ -88,14 +88,14 @@  discard block
 block discarded – undo
88 88
 	?>">
89 89
 	    <div class="field-group frm-half">
90 90
         	<label><?php _e( 'Icons', 'formidable' ) ?></label>
91
-            <?php FrmStylesHelper::bs_icon_select($style, $frm_style, 'arrow'); ?>
91
+            <?php FrmStylesHelper::bs_icon_select( $style, $frm_style, 'arrow' ); ?>
92 92
         </div>
93 93
 
94 94
         <div class="field-group frm-half">
95 95
         	<label><?php _e( 'Icon Position', 'formidable' ) ?></label>
96
-        	<select name="<?php echo esc_attr( $frm_style->get_field_name('collapse_pos') ) ?>" id="frm_collapse_pos">
97
-        	    <option value="after" <?php selected($style->post_content['collapse_pos'], 'after') ?>><?php _e( 'After Heading', 'formidable' ) ?></option>
98
-        	    <option value="before" <?php selected($style->post_content['collapse_pos'], 'before') ?>><?php _e( 'Before Heading', 'formidable' ) ?></option>
96
+        	<select name="<?php echo esc_attr( $frm_style->get_field_name( 'collapse_pos' ) ) ?>" id="frm_collapse_pos">
97
+        	    <option value="after" <?php selected( $style->post_content['collapse_pos'], 'after' ) ?>><?php _e( 'After Heading', 'formidable' ) ?></option>
98
+        	    <option value="before" <?php selected( $style->post_content['collapse_pos'], 'before' ) ?>><?php _e( 'Before Heading', 'formidable' ) ?></option>
99 99
         	</select>
100 100
         </div>
101 101
         <div class="clear"></div>
@@ -106,7 +106,7 @@  discard block
 block discarded – undo
106 106
 	?>">
107 107
 	    <div class="field-group frm-half">
108 108
         	<label><?php _e( 'Icons', 'formidable' ) ?></label>
109
-            <?php FrmStylesHelper::bs_icon_select($style, $frm_style, 'minus'); ?>
109
+            <?php FrmStylesHelper::bs_icon_select( $style, $frm_style, 'minus' ); ?>
110 110
         </div>
111 111
         <div class="clear"></div>
112 112
 	</div><!-- /.tabs-panel -->
Please login to merge, or discard this patch.
classes/views/styles/custom_css.php 2 patches
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -17,14 +17,14 @@
 block discarded – undo
17 17
         <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" id="frm_custom_css_box" class="hide-if-js"><?php echo FrmAppHelper::esc_textarea($style->post_content['custom_css']) ?></textarea>
18 18
 
19 19
         <?php
20
-        foreach ( $style->post_content as $k => $v ) {
21
-            if ( $k == 'custom_css' ) {
22
-                continue;
23
-            }
24
-        ?>
20
+		foreach ( $style->post_content as $k => $v ) {
21
+			if ( $k == 'custom_css' ) {
22
+				continue;
23
+			}
24
+		?>
25 25
         <input type="hidden" value="<?php echo esc_attr($v) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $k ) ) ?>" />    
26 26
         <?php
27
-        } ?>
27
+		} ?>
28 28
 		<p class="button-controls"><input type="submit" name="nav-menu-locations" id="nav-menu-locations" class="button button-primary left" value="<?php esc_attr_e( 'Save Changes', 'formidable' ) ?>" /></p>
29 29
 
30 30
     </form>
Please login to merge, or discard this patch.
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,20 +1,20 @@  discard block
 block discarded – undo
1 1
 <div class="nav-menus-php">
2 2
 <div class="wrap">
3
-    <?php FrmStylesHelper::style_menu('custom_css'); ?>
3
+    <?php FrmStylesHelper::style_menu( 'custom_css' ); ?>
4 4
 
5 5
     <p><?php _e( 'You can add custom css here or in your theme style.css', 'formidable' ) ?></p>
6 6
 
7
-    <?php include(FrmAppHelper::plugin_path() .'/classes/views/shared/errors.php'); ?>
7
+    <?php include( FrmAppHelper::plugin_path() . '/classes/views/shared/errors.php' ); ?>
8 8
 
9 9
 	<form method="post">
10 10
 	    <input type="hidden" name="ID" value="<?php echo esc_attr( $style->ID ) ?>" />
11
-        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name('post_title', '') ); ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
12
-        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name('menu_order', '') ); ?>" value="<?php echo esc_attr( $style->menu_order ) ?>" />
11
+        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name( 'post_title', '' ) ); ?>" value="<?php echo esc_attr( $style->post_title ) ?>" />
12
+        <input type="hidden" name="<?php echo esc_attr( $frm_style->get_field_name( 'menu_order', '' ) ); ?>" value="<?php echo esc_attr( $style->menu_order ) ?>" />
13 13
         <input type="hidden" name="style_name" value="frm_style_<?php echo esc_attr( $style->post_name ) ?>" />
14 14
 		<input type="hidden" name="frm_action" value="save_css" />
15 15
         <?php wp_nonce_field( 'frm_custom_css_nonce', 'frm_custom_css' ); ?>
16 16
 
17
-        <textarea name="<?php echo esc_attr( $frm_style->get_field_name('custom_css') ) ?>" id="frm_custom_css_box" class="hide-if-js"><?php echo FrmAppHelper::esc_textarea($style->post_content['custom_css']) ?></textarea>
17
+        <textarea name="<?php echo esc_attr( $frm_style->get_field_name( 'custom_css' ) ) ?>" id="frm_custom_css_box" class="hide-if-js"><?php echo FrmAppHelper::esc_textarea( $style->post_content['custom_css'] ) ?></textarea>
18 18
 
19 19
         <?php
20 20
         foreach ( $style->post_content as $k => $v ) {
@@ -22,7 +22,7 @@  discard block
 block discarded – undo
22 22
                 continue;
23 23
             }
24 24
         ?>
25
-        <input type="hidden" value="<?php echo esc_attr($v) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $k ) ) ?>" />    
25
+        <input type="hidden" value="<?php echo esc_attr( $v ) ?>" name="<?php echo esc_attr( $frm_style->get_field_name( $k ) ) ?>" />    
26 26
         <?php
27 27
         } ?>
28 28
 		<p class="button-controls"><input type="submit" name="nav-menu-locations" id="nav-menu-locations" class="button button-primary left" value="<?php esc_attr_e( 'Save Changes', 'formidable' ) ?>" /></p>
Please login to merge, or discard this patch.