OptionTree - Version 2.4.1

Version Description

  • Hotfix - Fixed a typo in the demo Theme Options related to the social-links.
  • Hotfix - Fixed the language directory path conflict between IIS and Linux while in Theme Mode.
  • Hotfix - Fixed a style issue where select fields would overflow their parent elements.
  • Hotfix - Fixed a PHP notice that was created when the Measurement option type did not have a saved value.
Download this release

Release Info

Developer valendesigns
Plugin Icon wp plugin OptionTree
Version 2.4.1
Comparing to
See all releases

Code changes from version 2.4.0 to 2.4.1

assets/css/ot-admin-rtl.css CHANGED
@@ -290,7 +290,7 @@ div.option-tree-ui-media-wrap {
290
  background-image: url(../images/ot-select-hover-rtl.png);
291
  }
292
  .select-wrapper span {
293
- padding-left: 0;
294
  padding-right: 7px;
295
  }
296
  .type-measurement .select-wrapper {
290
  background-image: url(../images/ot-select-hover-rtl.png);
291
  }
292
  .select-wrapper span {
293
+ padding-left: 27px;
294
  padding-right: 7px;
295
  }
296
  .type-measurement .select-wrapper {
assets/css/ot-admin.css CHANGED
@@ -2091,8 +2091,9 @@ li ul .format-setting-label {
2091
  display: block;
2092
  float: left;
2093
  font-size: 12px;
2094
- height: 27px;
2095
  margin: 0 5px 5px 0;
 
2096
  width: auto;
2097
  -webkit-border-radius: 2px;
2098
  -moz-border-radius: 2px;
@@ -2100,6 +2101,9 @@ li ul .format-setting-label {
2100
  -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.05);
2101
  -moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.05);
2102
  box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.05);
 
 
 
2103
  }
2104
  .select-wrapper:hover {
2105
  background-image: url(../images/ot-select-hover.png);
@@ -2111,6 +2115,7 @@ select.option-tree-ui-select {
2111
  font-size: 14px;
2112
  height: 29px;
2113
  margin: 0;
 
2114
  -moz-opacity: 0;
2115
  opacity: 0;
2116
  padding: 0 !important;
@@ -2126,7 +2131,9 @@ select.option-tree-ui-select option {
2126
  .select-wrapper span {
2127
  height: 27px;
2128
  line-height: 27px;
 
2129
  padding-left: 7px;
 
2130
  position: absolute;
2131
  z-index: 2;
2132
  }
@@ -2153,21 +2160,6 @@ select.option-tree-ui-select option {
2153
  }
2154
  }
2155
 
2156
- /* Webkit */
2157
- @media screen and (-webkit-min-device-pixel-ratio:0) {
2158
- .select-wrapper span {
2159
- height: 26px;
2160
- line-height: 26px;
2161
- }
2162
- }
2163
-
2164
- /* Opera 11 */
2165
- @media not screen and (1) {
2166
- .select-wrapper {
2167
- height: 26px;
2168
- }
2169
- }
2170
-
2171
  /* --------------------------------------------------
2172
  :: Measurement
2173
  ---------------------------------------------------*/
2091
  display: block;
2092
  float: left;
2093
  font-size: 12px;
2094
+ height: 29px;
2095
  margin: 0 5px 5px 0;
2096
+ max-width: 100%;
2097
  width: auto;
2098
  -webkit-border-radius: 2px;
2099
  -moz-border-radius: 2px;
2101
  -webkit-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.05);
2102
  -moz-box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.05);
2103
  box-shadow: inset 1px 1px 1px rgba(0, 0, 0, 0.05);
2104
+ -webkit-box-sizing: border-box;
2105
+ -moz-box-sizing: border-box;
2106
+ box-sizing: border-box;
2107
  }
2108
  .select-wrapper:hover {
2109
  background-image: url(../images/ot-select-hover.png);
2115
  font-size: 14px;
2116
  height: 29px;
2117
  margin: 0;
2118
+ max-width: 100%;
2119
  -moz-opacity: 0;
2120
  opacity: 0;
2121
  padding: 0 !important;
2131
  .select-wrapper span {
2132
  height: 27px;
2133
  line-height: 27px;
2134
+ overflow: hidden;
2135
  padding-left: 7px;
2136
+ padding-right: 27px;
2137
  position: absolute;
2138
  z-index: 2;
2139
  }
2160
  }
2161
  }
2162
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
2163
  /* --------------------------------------------------
2164
  :: Measurement
2165
  ---------------------------------------------------*/
assets/theme-mode/demo-theme-options.php CHANGED
@@ -503,7 +503,7 @@ function custom_theme_options() {
503
  'label' => __( 'Social Links', 'theme-text-domain' ),
504
  'desc' => '<p>' . sprintf( __( 'The Social Links option type utilizes a drag & drop interface to create a list of social links. There are a few filters that make extending this option type easy. You can set the %s filter to %s and turn off loading default values. Use the %s filter to change the default values that are loaded. To filter the settings array use the %s filter.', 'theme-text-domain' ), '<code>ot_type_social_links_load_defaults</code>', '<code>false</code>', '<code>ot_type_social_links_defaults</code>', '<code>ot_social_links_settings</code>' ) . '</p>',
505
  'std' => '',
506
- 'type' => 'sidebar-select',
507
  'section' => 'option_types',
508
  'rows' => '',
509
  'post_type' => '',
503
  'label' => __( 'Social Links', 'theme-text-domain' ),
504
  'desc' => '<p>' . sprintf( __( 'The Social Links option type utilizes a drag & drop interface to create a list of social links. There are a few filters that make extending this option type easy. You can set the %s filter to %s and turn off loading default values. Use the %s filter to change the default values that are loaded. To filter the settings array use the %s filter.', 'theme-text-domain' ), '<code>ot_type_social_links_load_defaults</code>', '<code>false</code>', '<code>ot_type_social_links_defaults</code>', '<code>ot_social_links_settings</code>' ) . '</p>',
505
  'std' => '',
506
+ 'type' => 'social-links',
507
  'section' => 'option_types',
508
  'rows' => '',
509
  'post_type' => '',
includes/ot-functions-admin.php CHANGED
@@ -3926,10 +3926,10 @@ if ( ! function_exists( 'ot_list_item_view' ) ) {
3926
  * @param int $key The array key for the current element.
3927
  * @param array An array of values for the current list item.
3928
  *
3929
- * @return void
3930
  *
3931
- * @access public
3932
- * @since 2.4.0
3933
  */
3934
  if ( ! function_exists( 'ot_social_links_view' ) ) {
3935
 
3926
  * @param int $key The array key for the current element.
3927
  * @param array An array of values for the current list item.
3928
  *
3929
+ * @return void
3930
  *
3931
+ * @access public
3932
+ * @since 2.4.0
3933
  */
3934
  if ( ! function_exists( 'ot_social_links_view' ) ) {
3935
 
includes/ot-functions-option-types.php CHANGED
@@ -926,7 +926,7 @@ if ( ! function_exists( 'ot_type_measurement' ) ) {
926
  echo '<option value="">&nbsp;--&nbsp;</option>';
927
 
928
  foreach ( ot_measurement_unit_types( $field_id ) as $unit ) {
929
- echo '<option value="' . esc_attr( $unit ) . '"' . selected( $field_value[1], $unit, false ) . '>' . esc_attr( $unit ) . '</option>';
930
  }
931
 
932
  echo '</select>';
926
  echo '<option value="">&nbsp;--&nbsp;</option>';
927
 
928
  foreach ( ot_measurement_unit_types( $field_id ) as $unit ) {
929
+ echo '<option value="' . esc_attr( $unit ) . '"' . ( isset( $field_value[1] ) ? selected( $field_value[1], $unit, false ) : '' ) . '>' . esc_attr( $unit ) . '</option>';
930
  }
931
 
932
  echo '</select>';
languages/option-tree.po CHANGED
@@ -1,8 +1,8 @@
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: OptionTree\n"
4
- "POT-Creation-Date: 2014-05-08 12:42-0800\n"
5
- "PO-Revision-Date: 2014-05-08 12:43-0800\n"
6
  "Last-Translator: Derek Herman <derek@valendesigns.com>\n"
7
  "Language-Team: Valen Designs\n"
8
  "Language: English\n"
@@ -24,7 +24,7 @@ msgid ""
24
  "OptionTree, and remove this warning."
25
  msgstr ""
26
 
27
- #: ../ot-loader.php:725 ../assets/theme-mode/demo-theme-options.php:624
28
  #: ../includes/ot-functions-admin.php:652
29
  #: ../includes/ot-functions-docs-page.php:374
30
  #: ../includes/ot-functions-settings-page.php:170
@@ -70,7 +70,7 @@ msgid "More Options"
70
  msgstr ""
71
 
72
  #: ../assets/theme-mode/demo-meta-boxes.php:62
73
- #: ../assets/theme-mode/demo-theme-options.php:533
74
  #: ../includes/ot-functions-admin.php:2232
75
  #: ../includes/ot-functions-docs-page.php:269
76
  msgid "Text"
@@ -81,7 +81,7 @@ msgid "This is a demo Text field."
81
  msgstr ""
82
 
83
  #: ../assets/theme-mode/demo-meta-boxes.php:68
84
- #: ../assets/theme-mode/demo-theme-options.php:548
85
  #: ../includes/ot-functions-admin.php:2233
86
  #: ../includes/ot-functions-docs-page.php:272
87
  msgid "Textarea"
@@ -124,7 +124,7 @@ msgid ""
124
  msgstr ""
125
 
126
  #: ../assets/theme-mode/demo-theme-options.php:45
127
- #: ../assets/theme-mode/demo-theme-options.php:609
128
  #: ../includes/ot-functions-admin.php:3584
129
  #: ../includes/ot-functions-docs-page.php:111
130
  #: ../includes/ot-functions-docs-page.php:354
@@ -527,12 +527,29 @@ msgid ""
527
  msgstr ""
528
 
529
  #: ../assets/theme-mode/demo-theme-options.php:503
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
530
  #: ../includes/ot-functions-admin.php:2230
531
  #: ../includes/ot-functions-docs-page.php:263
532
  msgid "Taxonomy Checkbox"
533
  msgstr ""
534
 
535
- #: ../assets/theme-mode/demo-theme-options.php:504
536
  #: ../includes/ot-functions-docs-page.php:264
537
  msgid ""
538
  "The Taxonomy Checkbox option type displays a list of taxonomy IDs. It allows "
@@ -540,13 +557,13 @@ msgid ""
540
  "array for use in a custom function or loop."
541
  msgstr ""
542
 
543
- #: ../assets/theme-mode/demo-theme-options.php:518
544
  #: ../includes/ot-functions-admin.php:2231
545
  #: ../includes/ot-functions-docs-page.php:266
546
  msgid "Taxonomy Select"
547
  msgstr ""
548
 
549
- #: ../assets/theme-mode/demo-theme-options.php:519
550
  #: ../includes/ot-functions-docs-page.php:267
551
  msgid ""
552
  "The Taxonomy Select option type displays a list of taxonomy IDs. It allows "
@@ -554,14 +571,14 @@ msgid ""
554
  "in a custom function or loop."
555
  msgstr ""
556
 
557
- #: ../assets/theme-mode/demo-theme-options.php:534
558
  #: ../includes/ot-functions-docs-page.php:270
559
  msgid ""
560
  "The Text option type is used to save string values. For example, any "
561
  "optional or required text that is of reasonably short character length."
562
  msgstr ""
563
 
564
- #: ../assets/theme-mode/demo-theme-options.php:549
565
  #: ../includes/ot-functions-docs-page.php:273
566
  #, php-format
567
  msgid ""
@@ -570,26 +587,26 @@ msgid ""
570
  "the how it is displayed. For example, you can filter %s, %s, %s, and %s."
571
  msgstr ""
572
 
573
- #: ../assets/theme-mode/demo-theme-options.php:563
574
  #: ../includes/ot-functions-admin.php:2234
575
  #: ../includes/ot-functions-docs-page.php:331
576
  msgid "Textarea Simple"
577
  msgstr ""
578
 
579
- #: ../assets/theme-mode/demo-theme-options.php:564
580
  #: ../includes/ot-functions-docs-page.php:332
581
  msgid ""
582
  "The Textarea Simple option type is a large string value used for custom code "
583
  "or text in the theme. The Textarea Simple does not have a WYSIWYG editor."
584
  msgstr ""
585
 
586
- #: ../assets/theme-mode/demo-theme-options.php:578
587
  #: ../includes/ot-functions-admin.php:2235
588
  #: ../includes/ot-functions-docs-page.php:347
589
  msgid "Textblock"
590
  msgstr ""
591
 
592
- #: ../assets/theme-mode/demo-theme-options.php:579
593
  #: ../includes/ot-functions-docs-page.php:348
594
  msgid ""
595
  "The Textblock option type is used only on the Theme Option page. It will "
@@ -599,13 +616,13 @@ msgid ""
599
  "themes template files as it does not save a value."
600
  msgstr ""
601
 
602
- #: ../assets/theme-mode/demo-theme-options.php:593
603
  #: ../includes/ot-functions-admin.php:2236
604
  #: ../includes/ot-functions-docs-page.php:350
605
  msgid "Textblock Titled"
606
  msgstr ""
607
 
608
- #: ../assets/theme-mode/demo-theme-options.php:594
609
  #: ../includes/ot-functions-docs-page.php:351
610
  msgid ""
611
  "The Textblock Titled option type is used only on the Theme Option page. It "
@@ -615,13 +632,13 @@ msgid ""
615
  "this in your themes template files as it does not save a value."
616
  msgstr ""
617
 
618
- #: ../assets/theme-mode/demo-theme-options.php:608
619
  #: ../includes/ot-functions-admin.php:2237
620
  #: ../includes/ot-functions-docs-page.php:353
621
  msgid "Typography"
622
  msgstr ""
623
 
624
- #: ../assets/theme-mode/demo-theme-options.php:609
625
  #: ../includes/ot-functions-docs-page.php:354
626
  #, php-format
627
  msgid ""
@@ -633,13 +650,13 @@ msgid ""
633
  "filters allow you to fine tune the select lists for your specific needs."
634
  msgstr ""
635
 
636
- #: ../assets/theme-mode/demo-theme-options.php:623
637
  #: ../includes/ot-functions-admin.php:2238
638
  #: ../includes/ot-functions-docs-page.php:373
639
  msgid "Upload"
640
  msgstr ""
641
 
642
- #: ../assets/theme-mode/demo-theme-options.php:624
643
  #: ../includes/ot-functions-docs-page.php:374
644
  #, php-format
645
  msgid ""
@@ -651,11 +668,11 @@ msgid ""
651
  "upload or %s any media to your new server and change the URIs if necessary."
652
  msgstr ""
653
 
654
- #: ../assets/theme-mode/demo-theme-options.php:638
655
  msgid "Upload Attachment ID"
656
  msgstr ""
657
 
658
- #: ../assets/theme-mode/demo-theme-options.php:639
659
  #, php-format
660
  msgid ""
661
  "The Upload option type can also be saved as an attachment ID by adding %s to "
@@ -945,11 +962,6 @@ msgstr ""
945
  msgid "Slider"
946
  msgstr ""
947
 
948
- #: ../includes/ot-functions-admin.php:2226
949
- #: ../includes/ot-functions-docs-page.php:251
950
- msgid "Social Links"
951
- msgstr ""
952
-
953
  #: ../includes/ot-functions-admin.php:2227
954
  #: ../includes/ot-functions-docs-page.php:254
955
  msgid "Tab"
@@ -1452,16 +1464,6 @@ msgid ""
1452
  "creating sliding image content."
1453
  msgstr ""
1454
 
1455
- #: ../includes/ot-functions-docs-page.php:252
1456
- #, php-format
1457
- msgid ""
1458
- "The Social Links option type utilizes a drag & drop interface to create a "
1459
- "list of social links. There are a few filters that make extending this "
1460
- "option type easy. You can set the %s filter to %s and turn off loading "
1461
- "default values. Use the %s filter to change the default values that are "
1462
- "loaded. To filter the settings array use the %s filter."
1463
- msgstr ""
1464
-
1465
  #: ../includes/ot-functions-docs-page.php:255
1466
  msgid ""
1467
  "The Tab option type will break a section or metabox into tabbed content."
1
  msgid ""
2
  msgstr ""
3
  "Project-Id-Version: OptionTree\n"
4
+ "POT-Creation-Date: 2014-05-19 23:29-0800\n"
5
+ "PO-Revision-Date: 2014-05-19 23:30-0800\n"
6
  "Last-Translator: Derek Herman <derek@valendesigns.com>\n"
7
  "Language-Team: Valen Designs\n"
8
  "Language: English\n"
24
  "OptionTree, and remove this warning."
25
  msgstr ""
26
 
27
+ #: ../ot-loader.php:744 ../assets/theme-mode/demo-theme-options.php:639
28
  #: ../includes/ot-functions-admin.php:652
29
  #: ../includes/ot-functions-docs-page.php:374
30
  #: ../includes/ot-functions-settings-page.php:170
70
  msgstr ""
71
 
72
  #: ../assets/theme-mode/demo-meta-boxes.php:62
73
+ #: ../assets/theme-mode/demo-theme-options.php:548
74
  #: ../includes/ot-functions-admin.php:2232
75
  #: ../includes/ot-functions-docs-page.php:269
76
  msgid "Text"
81
  msgstr ""
82
 
83
  #: ../assets/theme-mode/demo-meta-boxes.php:68
84
+ #: ../assets/theme-mode/demo-theme-options.php:563
85
  #: ../includes/ot-functions-admin.php:2233
86
  #: ../includes/ot-functions-docs-page.php:272
87
  msgid "Textarea"
124
  msgstr ""
125
 
126
  #: ../assets/theme-mode/demo-theme-options.php:45
127
+ #: ../assets/theme-mode/demo-theme-options.php:624
128
  #: ../includes/ot-functions-admin.php:3584
129
  #: ../includes/ot-functions-docs-page.php:111
130
  #: ../includes/ot-functions-docs-page.php:354
527
  msgstr ""
528
 
529
  #: ../assets/theme-mode/demo-theme-options.php:503
530
+ #: ../includes/ot-functions-admin.php:2226
531
+ #: ../includes/ot-functions-docs-page.php:251
532
+ msgid "Social Links"
533
+ msgstr ""
534
+
535
+ #: ../assets/theme-mode/demo-theme-options.php:504
536
+ #: ../includes/ot-functions-docs-page.php:252
537
+ #, php-format
538
+ msgid ""
539
+ "The Social Links option type utilizes a drag & drop interface to create a "
540
+ "list of social links. There are a few filters that make extending this "
541
+ "option type easy. You can set the %s filter to %s and turn off loading "
542
+ "default values. Use the %s filter to change the default values that are "
543
+ "loaded. To filter the settings array use the %s filter."
544
+ msgstr ""
545
+
546
+ #: ../assets/theme-mode/demo-theme-options.php:518
547
  #: ../includes/ot-functions-admin.php:2230
548
  #: ../includes/ot-functions-docs-page.php:263
549
  msgid "Taxonomy Checkbox"
550
  msgstr ""
551
 
552
+ #: ../assets/theme-mode/demo-theme-options.php:519
553
  #: ../includes/ot-functions-docs-page.php:264
554
  msgid ""
555
  "The Taxonomy Checkbox option type displays a list of taxonomy IDs. It allows "
557
  "array for use in a custom function or loop."
558
  msgstr ""
559
 
560
+ #: ../assets/theme-mode/demo-theme-options.php:533
561
  #: ../includes/ot-functions-admin.php:2231
562
  #: ../includes/ot-functions-docs-page.php:266
563
  msgid "Taxonomy Select"
564
  msgstr ""
565
 
566
+ #: ../assets/theme-mode/demo-theme-options.php:534
567
  #: ../includes/ot-functions-docs-page.php:267
568
  msgid ""
569
  "The Taxonomy Select option type displays a list of taxonomy IDs. It allows "
571
  "in a custom function or loop."
572
  msgstr ""
573
 
574
+ #: ../assets/theme-mode/demo-theme-options.php:549
575
  #: ../includes/ot-functions-docs-page.php:270
576
  msgid ""
577
  "The Text option type is used to save string values. For example, any "
578
  "optional or required text that is of reasonably short character length."
579
  msgstr ""
580
 
581
+ #: ../assets/theme-mode/demo-theme-options.php:564
582
  #: ../includes/ot-functions-docs-page.php:273
583
  #, php-format
584
  msgid ""
587
  "the how it is displayed. For example, you can filter %s, %s, %s, and %s."
588
  msgstr ""
589
 
590
+ #: ../assets/theme-mode/demo-theme-options.php:578
591
  #: ../includes/ot-functions-admin.php:2234
592
  #: ../includes/ot-functions-docs-page.php:331
593
  msgid "Textarea Simple"
594
  msgstr ""
595
 
596
+ #: ../assets/theme-mode/demo-theme-options.php:579
597
  #: ../includes/ot-functions-docs-page.php:332
598
  msgid ""
599
  "The Textarea Simple option type is a large string value used for custom code "
600
  "or text in the theme. The Textarea Simple does not have a WYSIWYG editor."
601
  msgstr ""
602
 
603
+ #: ../assets/theme-mode/demo-theme-options.php:593
604
  #: ../includes/ot-functions-admin.php:2235
605
  #: ../includes/ot-functions-docs-page.php:347
606
  msgid "Textblock"
607
  msgstr ""
608
 
609
+ #: ../assets/theme-mode/demo-theme-options.php:594
610
  #: ../includes/ot-functions-docs-page.php:348
611
  msgid ""
612
  "The Textblock option type is used only on the Theme Option page. It will "
616
  "themes template files as it does not save a value."
617
  msgstr ""
618
 
619
+ #: ../assets/theme-mode/demo-theme-options.php:608
620
  #: ../includes/ot-functions-admin.php:2236
621
  #: ../includes/ot-functions-docs-page.php:350
622
  msgid "Textblock Titled"
623
  msgstr ""
624
 
625
+ #: ../assets/theme-mode/demo-theme-options.php:609
626
  #: ../includes/ot-functions-docs-page.php:351
627
  msgid ""
628
  "The Textblock Titled option type is used only on the Theme Option page. It "
632
  "this in your themes template files as it does not save a value."
633
  msgstr ""
634
 
635
+ #: ../assets/theme-mode/demo-theme-options.php:623
636
  #: ../includes/ot-functions-admin.php:2237
637
  #: ../includes/ot-functions-docs-page.php:353
638
  msgid "Typography"
639
  msgstr ""
640
 
641
+ #: ../assets/theme-mode/demo-theme-options.php:624
642
  #: ../includes/ot-functions-docs-page.php:354
643
  #, php-format
644
  msgid ""
650
  "filters allow you to fine tune the select lists for your specific needs."
651
  msgstr ""
652
 
653
+ #: ../assets/theme-mode/demo-theme-options.php:638
654
  #: ../includes/ot-functions-admin.php:2238
655
  #: ../includes/ot-functions-docs-page.php:373
656
  msgid "Upload"
657
  msgstr ""
658
 
659
+ #: ../assets/theme-mode/demo-theme-options.php:639
660
  #: ../includes/ot-functions-docs-page.php:374
661
  #, php-format
662
  msgid ""
668
  "upload or %s any media to your new server and change the URIs if necessary."
669
  msgstr ""
670
 
671
+ #: ../assets/theme-mode/demo-theme-options.php:653
672
  msgid "Upload Attachment ID"
673
  msgstr ""
674
 
675
+ #: ../assets/theme-mode/demo-theme-options.php:654
676
  #, php-format
677
  msgid ""
678
  "The Upload option type can also be saved as an attachment ID by adding %s to "
962
  msgid "Slider"
963
  msgstr ""
964
 
 
 
 
 
 
965
  #: ../includes/ot-functions-admin.php:2227
966
  #: ../includes/ot-functions-docs-page.php:254
967
  msgid "Tab"
1464
  "creating sliding image content."
1465
  msgstr ""
1466
 
 
 
 
 
 
 
 
 
 
 
1467
  #: ../includes/ot-functions-docs-page.php:255
1468
  msgid ""
1469
  "The Tab option type will break a section or metabox into tabbed content."
ot-loader.php CHANGED
@@ -3,7 +3,7 @@
3
  * Plugin Name: OptionTree
4
  * Plugin URI: https://github.com/valendesigns/option-tree/
5
  * Description: Theme Options UI Builder for WordPress. A simple way to create & save Theme Options and Meta Boxes for free or premium themes.
6
- * Version: 2.4.0
7
  * Author: Derek Herman
8
  * Author URI: http://valendesigns.com
9
  * License: GPLv3
@@ -80,8 +80,27 @@ if ( ! class_exists( 'OT_Loader' ) ) {
80
  * This path will be relative in plugin mode and absolute in theme mode.
81
  *
82
  * @since 2.0.10
 
83
  */
84
- define( 'OT_LANG_DIR', dirname( plugin_basename( __FILE__ ) ) . DIRECTORY_SEPARATOR . 'languages' . DIRECTORY_SEPARATOR );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
85
 
86
  /* load the text domain */
87
  if ( OT_PLUGIN_MODE ) {
@@ -112,7 +131,7 @@ if ( ! class_exists( 'OT_Loader' ) ) {
112
 
113
  } else {
114
 
115
- load_theme_textdomain( 'option-tree', OT_LANG_DIR . 'theme-mode' );
116
 
117
  }
118
 
@@ -159,7 +178,7 @@ if ( ! class_exists( 'OT_Loader' ) ) {
159
  /**
160
  * Current Version number.
161
  */
162
- define( 'OT_VERSION', '2.4.0' );
163
 
164
  /**
165
  * For developers: Theme mode.
3
  * Plugin Name: OptionTree
4
  * Plugin URI: https://github.com/valendesigns/option-tree/
5
  * Description: Theme Options UI Builder for WordPress. A simple way to create & save Theme Options and Meta Boxes for free or premium themes.
6
+ * Version: 2.4.1
7
  * Author: Derek Herman
8
  * Author URI: http://valendesigns.com
9
  * License: GPLv3
80
  * This path will be relative in plugin mode and absolute in theme mode.
81
  *
82
  * @since 2.0.10
83
+ * @updated 2.4.1
84
  */
85
+ if ( OT_PLUGIN_MODE ) {
86
+
87
+ define( 'OT_LANG_DIR', trailingslashit( dirname( plugin_basename( __FILE__ ) ) ) . trailingslashit( 'languages' ) );
88
+
89
+ } else {
90
+
91
+ if ( apply_filters( 'ot_child_theme_mode', false ) == true ) {
92
+
93
+ $path = ltrim( end( @explode( get_stylesheet(), str_replace( '\\', '/', dirname( __FILE__ ) ) ) ), '/' );
94
+ define( 'OT_LANG_DIR', trailingslashit( trailingslashit( get_stylesheet_directory() ) . $path ) . trailingslashit( 'languages' ) . 'theme-mode' );
95
+
96
+ } else {
97
+
98
+ $path = ltrim( end( @explode( get_template(), str_replace( '\\', '/', dirname( __FILE__ ) ) ) ), '/' );
99
+ define( 'OT_LANG_DIR', trailingslashit( trailingslashit( get_template_directory() ) . $path ) . trailingslashit( 'languages' ) . 'theme-mode' );
100
+
101
+ }
102
+
103
+ }
104
 
105
  /* load the text domain */
106
  if ( OT_PLUGIN_MODE ) {
131
 
132
  } else {
133
 
134
+ load_theme_textdomain( 'option-tree', OT_LANG_DIR );
135
 
136
  }
137
 
178
  /**
179
  * Current Version number.
180
  */
181
+ define( 'OT_VERSION', '2.4.1' );
182
 
183
  /**
184
  * For developers: Theme mode.
readme.txt CHANGED
@@ -4,14 +4,20 @@ Donate link: http://bit.ly/NuXI3T
4
  Tags: options, theme options, meta boxes
5
  Requires at least: 3.5
6
  Tested up to: 3.9.1
7
- Stable tag: 2.4.0
8
  License: GPLv3
9
 
10
  Theme Options UI Builder for WordPress. A simple way to create & save Theme Options and Meta Boxes for free or premium themes.
11
 
12
  == Description ==
13
 
14
- OptionTree attempts to bridge the gap between WordPress developers, designers and end-users by creating fully responsive option panels and meta boxes with an ease unlike any other plugin. Packed full of advanced features with tons of hooks and filters to adjust every aspect of the user experience. You can build your theme options with a drag & drop interface locally and export a fully functioning `theme-options.php` file for production use that's i18n translation ready with you own custom text domain. And, in just a few simple lines of code, all your themes can have separate settings arrays saved to the database with unique IDs. Not only that, but OptionTree takes full advantage of the new color schemes introduced in WordPress 3.8, it looks and feels built-in.
 
 
 
 
 
 
15
 
16
  #### Theme Integration
17
  If you're like me, you want to know how everything works. Download and activate the [OptionTree Theme](https://github.com/valendesigns/option-tree-theme) and see first hand how to integrate OptionTree into your own project. I'll walk you through installing OptionTree and you'll get a chance to see all the various options and filters first hand and in the wild.
@@ -92,14 +98,18 @@ For a list of all the OptionTree UI display filters refer to the `demo-functions
92
 
93
  == Frequently Asked Questions ==
94
 
95
- = I get errors or a blank screen when I activate the plugin. What's the deal? =
96
-
97
- The most likely scenario is your theme already has OptionTree installed in Theme Mode. And since the plugin and theme version can't both be active at the same time without the sky falling on your head, your site has decided to throw in the towel. If that's not your issue, open up a support request and we'll figure it out together.
98
-
99
  = Is there a demo theme I can install? =
100
 
101
  There sure is, and I'm glad you asked. Download and activate the [OptionTree Theme](https://github.com/valendesigns/option-tree-theme) and get some experience setting up OptionTree on your own with detailed directions and tips.
102
 
 
 
 
 
 
 
 
 
103
  == Screenshots ==
104
 
105
  1. Theme Options
@@ -108,6 +118,12 @@ There sure is, and I'm glad you asked. Download and activate the [OptionTree The
108
 
109
  == Changelog ==
110
 
 
 
 
 
 
 
111
  = 2.4.0 =
112
  * Added filter 'ot_post_formats' which loads meta boxes specifically for post formats.
113
  * Added the Social Links option type.
4
  Tags: options, theme options, meta boxes
5
  Requires at least: 3.5
6
  Tested up to: 3.9.1
7
+ Stable tag: 2.4.1
8
  License: GPLv3
9
 
10
  Theme Options UI Builder for WordPress. A simple way to create & save Theme Options and Meta Boxes for free or premium themes.
11
 
12
  == Description ==
13
 
14
+ OptionTree attempts to bridge the gap between WordPress developers, designers and end-users by creating fully responsive option panels and meta boxes with an ease unlike any other plugin. OptionTree has many advanced features with well placed hooks and filters to adjust every aspect of the user experience.
15
+
16
+ Build your Theme Options panel locally with an easy to use drag & drop interface and then export a functioning `theme-options.php` file for production use that is i18n translation ready, with your custom text domain automatically inserted.
17
+
18
+ And, in just a few simple lines of code, save settings to the database with a unique array ID so none of your Theme Options conflict with other themes that use OptionTree.
19
+
20
+ Also, OptionTree now takes full advantage of the new color schemes introduced in WordPress 3.8, it looks and feels built-in.
21
 
22
  #### Theme Integration
23
  If you're like me, you want to know how everything works. Download and activate the [OptionTree Theme](https://github.com/valendesigns/option-tree-theme) and see first hand how to integrate OptionTree into your own project. I'll walk you through installing OptionTree and you'll get a chance to see all the various options and filters first hand and in the wild.
98
 
99
  == Frequently Asked Questions ==
100
 
 
 
 
 
101
  = Is there a demo theme I can install? =
102
 
103
  There sure is, and I'm glad you asked. Download and activate the [OptionTree Theme](https://github.com/valendesigns/option-tree-theme) and get some experience setting up OptionTree on your own with detailed directions and tips.
104
 
105
+ = Why are my translation files not loading? =
106
+
107
+ It is important to note that when you use OptionTree as a plugin, you must store your language files in the `option-tree/languages` directory and use file names like `option-tree-es_ES.mo` & `option-tree-es_ES.po`. However, when using OptionTree in Theme Mode you must also create a `theme-mode` directory inside the `option-tree/languages` directory and store your files there with names like `es_ES.mo` & `es_ES.po`. This is due to the different naming conventions of the `load_plugin_textdomain()` and `load_theme_textdomain()` functions.
108
+
109
+ = I get errors or a blank screen when I activate the plugin. What's the deal? =
110
+
111
+ The most likely scenario is your theme already has OptionTree installed in Theme Mode. And since the plugin and theme version can't both be active at the same time without the sky falling on your head, your site has decided to throw in the towel. If that's not your issue, open up a support request and we'll figure it out together. UPDATE: As of OptionTree 2.4.0 the plugin version will not conflict with the Theme Mode version if they are both 2.4.0 or higher.
112
+
113
  == Screenshots ==
114
 
115
  1. Theme Options
118
 
119
  == Changelog ==
120
 
121
+ = 2.4.1 =
122
+ * Hotfix - Fixed a typo in the demo Theme Options related to the `social-links`.
123
+ * Hotfix - Fixed the language directory path conflict between IIS and Linux while in Theme Mode.
124
+ * Hotfix - Fixed a style issue where select fields would overflow their parent elements.
125
+ * Hotfix - Fixed a PHP notice that was created when the Measurement option type did not have a saved value.
126
+
127
  = 2.4.0 =
128
  * Added filter 'ot_post_formats' which loads meta boxes specifically for post formats.
129
  * Added the Social Links option type.