Merge branch 'release/2.1.1'

change_log.txt

@@ -1,6 +1,22 @@
 ------------------------------------------------------------------------------------------------------------------
-Version 2.1.0.1
+Version 2.1.1
+    - Added PF (French Polynesia) to the country code list. Credit: the GravityView team.
+    - Added percentage based rule lines for alignment check in preview page.
+    - Added gf_form_center readyclass style to properly center the form in the gform_wrapper container.
+    - Updated the HTML field to check for the unfiltered_html capability instead of manage_options before allowing unfiltered HTML to be saved in the form editor.
+    - Fixed an issue with the Drop Down field merge tag where the value is not encoded for use in query string params.
+    - Fixed an issue with the Multi Select field merge tag where the value is displayed instead of the text.
+    - Fixed an issue with the entry list when sorting by entry meta where some entries may not be included in the results.
+    - Fixed an issue with the date and time field input sizes and switched the input containers to a flex layout.
+    - Fixed an issue with the date and time field label sizes and text-alignment.
+    - Fixed an issue caused by the overflow property of the form element.
+    - Fixed an issue with the form wrapper width value.
+    - Fixed conditional logic dependency confirmation appearing every time a field is edited when the visibility is already set to administrative.
+    - Fixed an issue with the Paragraph field validation when a max character limit is configured and the value contains multi-byte characters.
+	- Fixed issue with number max range sanitization.
+	- Fixed an issue with number field min and max range settings when number format is configured with commas as decimal separators.
     - Fixed an issue with the Paragraph field validation when a max character limit is not configured.
+	- AF: Fixed an issue when only using custom keys with the dynamic field map.
 
 ------------------------------------------------------------------------------------------------------------------
 Version 2.1
@@ -10,7 +26,7 @@ Version 2.1
     - Added better support for custom address types (added via gform_address_types filter) and conditional logic.
     - Added GFExports::export_forms() method to allow 3rd parties to more easily export forms.
     - Added the gform_honeypot_labels_pre_render filter.
-    - Added GFFormsModel::get_phsyical_file_path() method; refactored from code in the GFFormsModel::delete_physical_file() method.
+    - Added GFFormsModel::get_phsyical_file_path() method; re-factored from code in the GFFormsModel::delete_physical_file() method.
 	- Added gform_rfc_url_validation hook to control whether or not URL validation conforms with RFC standard. Defaults to true.
 	- Added gform_is_valid_url hook to allow for custom URL validation.
 	- Added the gform_savecontinue_link filter for customizing the save and continue links.
@@ -327,7 +343,7 @@ Version 2.0.0
 ------------------------------------------------------------------------------------------------------------------
 Version 1.9.19.6
     - Added gform_not_found class to the paragraph tag used to wrap 'Oops! We could not locate your form.' error message
-    
+
 ------------------------------------------------------------------------------------------------------------------
 Version 1.9.19.5
     - Fixed an issue restoring field defaults on display by conditional logic when the value was 0.

common.php

@@ -4747,9 +4747,12 @@ public static function replace_field_variable( $text, $form, $lead, $url_encode,
 		$i          = $match[0][0] == '{' ? 4 : 5;
 		$modifier   = strtolower( rgar( $match, $i ) );
 		$modifiers  = array_map( 'trim', explode( ',', $modifier ) );
-		$url_encode = ! $url_encode && in_array( 'urlencode', $modifiers );
 		$field->set_modifiers( $modifiers );
 
+		if( in_array( 'urlencode', $modifiers ) ) {
+			$url_encode = true;
+		}
+
 		$value = $field->get_value_merge_tag( $value, $input_id, $lead, $form, $modifier, $raw_value, $url_encode, $esc_html, $format, $nl2br );
 
 		if ( ! in_array( $field->type, array( 'html', 'section', 'signature' ) ) ) {

css/formsmain.css

@@ -3,7 +3,7 @@
 
 Gravity Forms Front End Form Styles
 http: //www.gravityforms.com
-updated: October 20, 2016 10:51 AM GMT-5
+updated: November 10, 2016 3:38 PM GMT-5
 
 Gravity Forms is a Rocketgenius project
 copyright 2008-2016 Rocketgenius Inc.
@@ -25,7 +25,7 @@ to no.
 */
 
 
-/* mobile styles first */
+/* mobile styles first ​*/
 
 .gform_wrapper {
     margin: 16px 0;
@@ -34,7 +34,6 @@ to no.
 
 .gform_wrapper form {
     text-align: left;
-    overflow-x: hidden;
     max-width: 100%;
     margin: 0 auto;
 }
@@ -53,8 +52,6 @@ to no.
     background: none;
 }
 
-
-
 .gform_wrapper input:not([type='radio']):not([type='checkbox']):not([type='submit']):not([type='button']):not([type='image']):not([type='file']) {
     font-size: inherit;
     font-family: inherit;
@@ -165,19 +162,116 @@ html>body .entry ul,
     margin-bottom: 18px;
 }
 
-.gform_wrapper .gfield_time_hour,
-.gform_wrapper .gfield_time_minute,
-.gform_wrapper .gfield_date_month,
+.gform_wrapper .clear-multi{
+    display: flex;
+}
+
+/* date ​fields */
+
 .gform_wrapper .gfield_date_day,
 .gform_wrapper .gfield_date_year {
-    width: 75px;
     display: -moz-inline-stack;
     display: inline-block;
 }
 
-.gform_wrapper .top_label .ginput_container_time {
-    display: -moz-inline-stack;
-    display: inline-block;
+.gform_wrapper .gfield_date_day,
+.gform_wrapper .gfield_date_month,
+.gform_wrapper .gfield_date_year {
+    width: 33.333%;
+    flex-direction: row;
+}
+
+@media only screen and (min-width: 321px) {
+
+    .gform_wrapper .gfield_date_day,
+    .gform_wrapper .gfield_date_month {
+        max-width: 4rem;
+    }
+
+    .gform_wrapper .gfield_date_year,
+    .gform_wrapper .gfield_time_ampm {
+        max-width: calc(4rem + .5rem);
+    }
+
+}
+
+.gform_wrapper .gfield_date_dropdown_month,
+.gform_wrapper .gfield_date_dropdown_day,
+.gform_wrapper .gfield_date_dropdown_year {
+    vertical-align: top;
+    flex-direction: row;
+}
+
+.gform_wrapper .gfield_date_dropdown_month,
+.gform_wrapper .gfield_date_dropdown_day,
+.gform_wrapper .gfield_date_dropdown_year {
+    margin-right: .5rem;
+}
+
+.gform_wrapper .gfield_date_month,
+.gform_wrapper .gfield_date_day {
+    width: 4rem;
+    margin-right: .5rem;
+}
+
+.gform_wrapper .gfield_date_month input[type="number"],
+.gform_wrapper .gfield_date_day input[type="number"] {
+    width: calc(3rem + 8px) !important;
+}
+
+.gform_wrapper .gfield_date_year input[type="number"] {
+    width: calc(4rem + 8px) !important;
+}
+
+.gform_wrapper .gfield_date_year {
+    width: 5rem;
+}
+
+.gform_wrapper .gfield_date_month input,
+.gform_wrapper .gfield_date_day input {
+    width: calc(3rem + 8px);
+}
+
+.gform_wrapper .gfield_date_year input {
+    width: 4rem;
+}
+
+.gform_wrapper .field_sublabel_above div[class*="gfield_date_"].ginput_container label,
+.gform_wrapper .field_sublabel_below div[class*="gfield_date_"].ginput_container label {
+    width: 3rem;
+    text-align: center;
+}
+
+.gform_wrapper .field_sublabel_above div.gfield_date_year.ginput_container label,
+.gform_wrapper .field_sublabel_below div.gfield_date_year.ginput_container label {
+    width: 4rem;
+}
+
+/* time ​fields */
+
+.gform_wrapper .gfield_time_hour,
+.gform_wrapper .gfield_time_minute,
+.gform_wrapper .gfield_time_ampm {
+    width: 33.333%;
+    flex-direction: row;
+}
+
+@media only screen and (min-width: 321px) {
+
+    .gform_wrapper .gfield_time_hour,
+    .gform_wrapper .gfield_time_minute {
+        max-width: 4rem;
+    }
+
+    .gform_wrapper .gfield_time_hour,
+    .gform_wrapper .gfield_time_ampm {
+        max-width: calc(4rem + .5rem);
+    }
+
+    .gform_wrapper .gfield_time_hour {
+        max-width: calc(4rem + .5rem);
+    }
+
 }
 
 .gform_wrapper ul.gform_fields:not(.top_label) .ginput_container_time span {
@@ -193,24 +287,12 @@ html>body .entry ul,
     margin-top: 9%;
 }
 
-.gform_wrapper .gfield_date_month,
-.gform_wrapper .gfield_date_day,
-.gform_wrapper .gfield_date_year {
-    margin-right: 12px;
-}
-
-.gform_wrapper .gfield_date_dropdown_month,
-.gform_wrapper .gfield_date_dropdown_day,
-.gform_wrapper .gfield_date_dropdown_year {
-    vertical-align: top;
-    display: -moz-inline-stack;
-    display: inline-block;
+.gform_wrapper .gfield_time_minute {
+    margin-right: .5rem;
 }
 
-.gform_wrapper .gfield_date_dropdown_month,
-.gform_wrapper .gfield_date_dropdown_day,
-.gform_wrapper .gfield_date_dropdown_year {
-    margin-right: 6px;
+.gform_wrapper .gfield_time_hour {
+    margin-right: .25rem;
 }
 
 .gform_wrapper .gfield_time_ampm {
@@ -225,40 +307,19 @@ html>body .entry ul,
 }
 
 .gform_wrapper .gfield_time_hour input,
-.gform_wrapper .gfield_time_minute input,
-.gform_wrapper .gfield_date_month input,
-.gform_wrapper .gfield_date_day input,
-.gform_wrapper .gfield_date_year input {
-    width: 70% !important;
+.gform_wrapper .gfield_time_minute input {
+    width: calc(3rem + 8px);
 }
 
 .gform_wrapper .gfield_time_hour input[type="number"],
-.gform_wrapper .gfield_time_minute input[type="number"],
-.gform_wrapper .gfield_date_month input[type="number"],
-.gform_wrapper .gfield_date_day input[type="number"],
-.gform_wrapper .gfield_date_year input[type="number"] {
-    width: calc(60% + 16px) !important;
+.gform_wrapper .gfield_time_minute input[type="number"] {
+    width: calc(3rem + 8px) !important;
 }
 
-.gform_wrapper .gfield_date_month,
-.gform_wrapper .gfield_date_day,
-.gform_wrapper .gfield_date_year {
-    width: 50px;
-    float: left;
-}
-
-.gform_wrapper .gfield_date_year {
-    width: 48px !important;
-}
-
-.gform_wrapper .gfield_date_month input,
-.gform_wrapper .gfield_date_day input,
-.gform_wrapper .gfield_date_year input {
-    width: 85% !important;
-}
-
-.gform_wrapper .gfield_date_year input {
-    width: 88% !important;
+.gform_wrapper .field_sublabel_above div[class*="gfield_time_"].ginput_container label,
+.gform_wrapper .field_sublabel_below div[class*="gfield_time_"].ginput_container label {
+    width: 3rem;
+    text-align: center;
 }
 
 .gform_wrapper .field_hover {
@@ -310,9 +371,11 @@ html>body .entry ul,
 .gform_wrapper .field_sublabel_above .ginput_complex.ginput_container label,
 .gform_wrapper .field_sublabel_below .ginput_complex.ginput_container label,
 .gform_wrapper .field_sublabel_above div[class*="gfield_time_"].ginput_container label,
-.gform_wrapper .field_sublabel_below div[class*="gfield_time_"].ginput_container label {
+.gform_wrapper .field_sublabel_below div[class*="gfield_time_"].ginput_container label,
+.gform_wrapper .field_sublabel_above div[class*="gfield_date_"].ginput_container label,
+.gform_wrapper .field_sublabel_below div[class*="gfield_date_"].ginput_container label {
     display: block;
-    font-size: 80%;
+    font-size: .813rem;
     letter-spacing: .5pt;
     white-space: nowrap;
 }
@@ -528,7 +591,7 @@ body .gform_wrapper ul li.field_description_below div.ginput_container_checkbox
 .gform_wrapper .gfield_description,
 .gform_wrapper .gsection_description,
 .gform_wrapper .instruction {
-    font-size: 80%;
+    font-size: .813rem;
     line-height: inherit;
     clear: both;
     font-family: inherit;
@@ -1038,7 +1101,7 @@ body .gform_wrapper ul.gform_fields li.gfield.gform_validation_container {
 
 .gform_wrapper .gform_page_footer {
     margin: 14px 0;
-    width: calc(100% - 6px);
+    width: calc(100% - 16px);
     border-top: 1px dotted #CCC;
     padding: 16px 0 0 0;
     clear: both;
@@ -1060,7 +1123,7 @@ body .gform_wrapper ul.gform_fields li.gfield.gform_validation_container {
 
 .gform_wrapper .gf_progressbar_wrapper {
     clear: both;
-    width: calc(100% + 16px);
+    width: 100%;
     margin: 0 0 16px 0;
     padding: 0 0 16px 0;
 }
@@ -2456,7 +2519,7 @@ body .gform_wrapper div.gform_body ul.gform_fields li.gfield.gfield_html dl dd {
 @media only screen and (min-width: 641px) {
 
     .gform_wrapper .gform_body {
-        width: calc(100% + 16px);
+        width: 100%;
     }
 
     .gform_wrapper.gform_validation_error .gform_body ul li.gfield.gfield_error:not(.gf_left_half):not(.gf_right_half) {