Skip to content

Commit 9fa7cfa

Browse files
TheNewCokeTheNewCoke
committed
Merge branch '1.18.0-rc'
2 parents ae5212c + 758b6fc commit 9fa7cfa

File tree

10 files changed

+104
-81
lines changed

10 files changed

+104
-81
lines changed

‎package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "wolfnet-idx-for-wordpress",
3-
"version": "1.17.6",
3+
"version": "1.18.0",
44
"description": "WolfNet IDX for WordPress",
55
"homepage": "https://github.com/wolfnet/wordpressplugin",
66
"bugs": "https://github.com/wolfnet/wordpressplugin/issues",

‎readme.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,10 @@ Please upgrade to the latest version of the plugin as we will be disabling our o
8989

9090
## Changelog
9191

92+
### 1.18.0
93+
94+
* Moved the "SSL" setting to the new "Advanced Settings" area, clarifying that it is an API connection method
95+
9296
### 1.17.6
9397

9498
* Fix to get the sort options to display when using multiple markets in a listing grid

‎src/Admin.php‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -245,33 +245,33 @@ public function adminMenu()
245245

246246
$pgs = array(
247247
array(
248-
'title' => 'WolfNet <span class="wolfnet_sup">&reg;</span>',
248+
'title' => 'WolfNet &reg;',
249249
'key' => 'wolfnet_plugin_settings',
250250
//'icon' => $this->url . 'img/wp_wolfnet_nav.png',
251251
'icon' => 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIyMCIgaGVpZ2h0PSIyMCIgdmlld0JveD0iMCAwIDUuMjkxNjY2NSA1LjI5MTY2NjUiPjxnIGZpbGw9IiM5Y2ExYTYiPjxwYXRoIGQ9Ik00LjM3NSAxLjUzOHMuMDM0LS4xOTYuMS4wMWMwIDAgLjA1NC4xNzUtLjAxOS4yMDQgMCAwLS4xMS4wMjQtLjA5LS4xMDQgMCAwIDAtLjA2Ny4wMDktLjExTTIuMTc5IDMuMjdzLjEzOC0uMzI5LjQ2OC0uMzI5YzAgMCAuMjU3IDAgLjQ4Ny4yNjMgMCAwIC4yNjcuNDYzLjQzNS42MzUgMCAwIC41MzkuNDk3LjIzOC44NjggMCAwLS4xMi4yNTMtLjU4Ny4xMzkgMCAwLS40NTQtLjEzOS0uNTQtLjExIDAgMC0uMzI5LjAzOS0uNTM1LjExIDAgMC0uNDUzLjE1My0uNjQ0LS4xMiAwIDAtLjEyOC0uMTkuMDA2LS41NTcgMCAwIC4xNDctLjI0NC4zLS4zODcgMCAwIC4zMi0uNDI2LjM3Mi0uNTEyTS43NzUgMi4yODJTLjkgMS42OCAxLjQyIDIuMTJjMCAwIC4zNjkuNDA2LjMwNy43NDQgMCAwLS4xMzUuNTgzLS42ODcuMzE2IDAgMC0uNDU1LS4yNDQtLjI2NC0uODk4TS44NTcgMS41MzhzLjA0My0uMTUzLjA5NS0uMDFjMCAwIC4wNDcuMTY3LjAyNC4xOTUgMCAwLS4wNTMuMTA2LS4xNDgtLjAxNCAwIDAtLjAwNC0uMS4wMjktLjE3MU0xLjc4My44NnMuMjcyLS40MjUuNTMuMDQzYzAgMCAuMTkxLjM3OC4xNzYuNzQ5IDAgMCAuMDMuNTI1LS41My40OTcgMCAwLS40MjktLjAzMy0uNDczLS42MDIgMCAwIC4wMy0uMzQ4LjI5Ny0uNjg3TTIuMDE2LjA4MnMuMDUzLS4xODcuMS4wMDRjMCAwIC4wNjguMTcyLS4wMDQuMjU4IDAgMC0uMTI0LjA3Mi0uMTQ4LS4wNjIgMCAwLS4wMDQtLjA5LjA1Mi0uMk0yLjg5IDEuMDU1UzMuMS40MTIgMy40NC44N2MwIDAgLjE4LjE4NS4yMjQuMjY3LjA0My4wODEuMTcyLjQ1My4wODIuNjkyIDAgMC0uMjAxLjU0OC0uNzYuMjQzIDAgMC0uMjM0LS4xMzgtLjE3Mi0uNjMgMCAwIC4wMTQtLjI1Mi4wNzYtLjM4N00zLjExLjFzLjAyOS0uMTk0LjEyNC0uMDAzYzAgMCAuMDg2LjIyNC4wMTkuMjQyIDAgMC0uMTQzLjA0OC0uMTUyLS4wNDMgMCAwLS4wMTUtLjEzMy4wMS0uMTk1TTMuODg0IDIuMDg3cy40NjctLjQwNy42MzQuMTQ3YzAgMCAuMTU4LjU5OC0uMTE5Ljg1NCAwIDAtLjM3OC40MDMtLjY5Ny0uMDQyIDAgMC0uMTQ5LS4xNTctLjA0OC0uNTgxIDAgMCAuMS0uMjczLjIzLS4zNzgiLz48L2c+PC9zdmc+',
252252
),
253253
array(
254-
'title' => 'General Settings',
254+
'title' => __('General Settings'),
255255
'key' => 'wolfnet_plugin_settings',
256256
'cb' => array(&$GLOBALS['wolfnet']->views, 'amSettingsPage')
257257
),
258258
array(
259-
'title' => 'Appearance',
259+
'title' => __('Appearance'),
260260
'key' => 'wolfnet_plugin_style',
261261
'cb' => array(&$GLOBALS['wolfnet']->views, 'amStylePage')
262262
),
263263
array(
264-
'title' => 'Edit CSS',
264+
'title' => __('Edit CSS'),
265265
'key' => 'wolfnet_plugin_css',
266266
'cb' => array(&$GLOBALS['wolfnet']->views, 'amEditCssPage')
267267
),
268268
array(
269-
'title' => 'Search Manager',
269+
'title' => __('Search Manager'),
270270
'key' => 'wolfnet_plugin_search_manager',
271271
'cb' => array(&$GLOBALS['wolfnet']->views, 'amSearchManagerPage')
272272
),
273273
array(
274-
'title' => 'Support',
274+
'title' => __('Support'),
275275
'key' => 'wolfnet_plugin_support',
276276
'cb' => array(&$GLOBALS['wolfnet']->views, 'amSupportPage')
277277
),

‎src/template/adminColors.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
<div class="wolfnet_colorOption">
2424
<label for="wolfnet_themeColors[0]">
25-
<?php echo _e('Accent Color'); ?>:
25+
<?php _e('Accent Color'); ?>:
2626
</label>
2727
<div class="wolfnet_colorField">
2828
<input type="text" name="wolfnet_themeColors[0]" id="wolfnet_themeColors[0]"
@@ -33,7 +33,7 @@
3333

3434
<div class="wolfnet_colorOption">
3535
<label for="wolfnet_opacity">
36-
<?php echo _e('Opacity'); ?>:
36+
<?php _e('Opacity'); ?>:
3737
</label>
3838
<div class="wolfnet_colorField">
3939
<select name="wolfnet_themeOpacity" id="wolfnet_themeOpacity">
@@ -46,7 +46,7 @@
4646
</div>
4747
</div>
4848

49-
<button class="button button-primary" type="submit"><?php echo _e('Save Color Options'); ?></button>
49+
<button class="button button-primary" type="submit"><?php _e('Save Color Options'); ?></button>
5050

5151
</div>
5252

‎src/template/adminEditCss.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<div id="icon-options-wolfnet" class="icon32"><br /></div>
44

5-
<h1>WolfNet <sup>&reg;</sup> - Edit CSS</h1>
5+
<h1>Edit CSS - WolfNet<sup>&reg;</sup></h1>
66

77
<p>This is a high-level tool that should only be used by a web developer or designer who is familiar with CSS.</p>
88

‎src/template/adminSearchManager.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626

2727
<div id="icon-options-wolfnet" class="icon32"><br /></div>
2828

29-
<h1>WolfNet <sup>&reg;</sup> - Search Manager</h1>
29+
<h1>Search Manager - WolfNet<sup>&reg;</sup></h1>
3030

3131
<noscript>
3232
<div class="error">

‎src/template/adminSettings.php‎

Lines changed: 83 additions & 64 deletions
Original file line numberDiff line numberDiff line change
@@ -24,34 +24,34 @@
2424

2525
<div class="wrap">
2626

27-
<div id="icon-options-wolfnet" class="icon32"><br /></div>
27+
<div id="icon-options-wolfnet" class="icon32"><br /></div>
2828

29-
<h1>WolfNet <sup>&reg;</sup> - General Settings</h1>
29+
<h1><?php _e('General Settings'); ?> - WolfNet<sup>&reg;</sup></h1>
3030

31-
<form method="post" id="wolfnetSettings" action="options.php">
31+
<form method="post" id="wolfnetSettings" action="options.php">
3232

33-
<?php echo $formHeader; ?>
33+
<?php echo $formHeader; ?>
3434

35-
<input type="hidden" id="wolfnet_setSslVerify" value="<?php echo $setSslVerify; ?>" />
36-
<input type="hidden" id="wolfnet_keyCount" value="<?php echo count($productKey); ?>" />
35+
<input type="hidden" id="wolfnet_setSslVerify" value="<?php echo $setSslVerify; ?>" />
36+
<input type="hidden" id="wolfnet_keyCount" value="<?php echo count($productKey); ?>" />
3737

38-
<fieldset>
38+
<fieldset>
3939

40-
<legend>
41-
<h2 class="title">Product Key</h2>
42-
</legend>
40+
<legend>
41+
<h2 class="title"><?php _e('Product Key'); ?></h2>
42+
</legend>
4343

4444
<table class="key-table widefat" id="wolfnet_keys">
4545
<thead>
4646
<tr>
4747
<th class="row-title" scope="row">
48-
Product Key
48+
<?php _e('Product Key'); ?>
4949
</th>
5050
<th class="row-title" scope="row">
51-
Market Name
51+
<?php _e('Market Name'); ?>
5252
</th>
5353
<th class="row-title" scope="row">
54-
Label
54+
<?php _e('Label'); ?>
5555
</th>
5656
<th class="row-title" scope="row"></th>
5757
</tr>
@@ -111,57 +111,61 @@
111111
</tbody>
112112
</table>
113113

114-
<div class="tablenav bottom">
115-
<button type="button" class="button action" id="wolfnet_addKey">
116-
<span class="wnt-icon wnt-icon-plus"></span>
117-
<?php _e('Add Product Key'); ?>
118-
</button>
119-
</div>
120-
121-
<p class="description">
122-
Enter your unique product key for the WolfNet WordPress plugin. The
123-
product key is required to connect your WordPress site to your WolfNet
124-
property search. WolfNet Plugin features will not be available until the
125-
correct key has been entered. If you do not have a key, please contact
126-
WolfNet Technologies via phone at 612-342-0088 or toll free at
127-
1-866-WOLFNET, or via email at
128-
<a href="mailto:[email protected]">[email protected]</a>.
129-
You may also find us online at
130-
<a href="http://wolfnet.com" target="_blank">WolfNet.com</a>.
131-
</p>
132-
133-
</fieldset>
134-
135-
<fieldset>
136-
137-
<legend>
138-
<h2 class="title">SSL</h2>
139-
</legend>
140-
141-
<p>
142-
<input name="<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>"
143-
id="wnt-<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>"
144-
<?php checked($sslEnabled, true); ?> type="checkbox" value="1" />
145-
<label for="wnt-<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>">
146-
SSL Enabled
147-
</label>
148-
</p>
149-
150-
<p class="description">
151-
This option determines if the plugin will communicate with the API via
152-
a secure connection. In the near future this option will be deprecated
153-
and the API will only work over SSL.
154-
</p>
155-
156-
</fieldset>
157-
158-
<p class="submit">
159-
<?php submit_button(
160-
$text = NULL, $type = 'primary', $name = 'submit', $wrap = FALSE, $other_attributes = NULL
161-
); ?>
162-
</p>
163-
164-
</form>
114+
<div class="tablenav bottom">
115+
<button type="button" class="button action" id="wolfnet_addKey">
116+
<span class="wnt-icon wnt-icon-plus"></span>
117+
<?php _e('Add Product Key'); ?>
118+
</button>
119+
</div>
120+
121+
<p class="description">
122+
<?php printf(
123+
__('Enter your unique product key for the WolfNet WordPress plugin. The product key is required to connect your WordPress site to your WolfNet property search. WolfNet Plugin features will not be available until the correct key has been entered. If you do not have a key, please contact WolfNet Technologies via phone at 612-342-0088 or toll free at 1-866-WOLFNET, or via email at %s. You may also find us online at %s.'),
124+
'<a href="mailto:[email protected]">[email protected]</a>',
125+
'<a href="http://wolfnet.com" target="_blank">WolfNet.com</a>'
126+
); ?>
127+
</p>
128+
129+
</fieldset>
130+
131+
<div id="wolfnet-advanced-options">
132+
<fieldset>
133+
<legend>
134+
<h2 class="title"><?php _e('Advanced Settings'); ?></h2>
135+
</legend>
136+
<table class="form-table">
137+
<tr>
138+
<th scope="row">WolfNet API Connection Port</th>
139+
<td>
140+
<label for="wnt-<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>-1">
141+
<input name="<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>"
142+
id="wnt-<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>-1"
143+
<?php checked($sslEnabled, true); ?> type="radio" value="1" />
144+
<?php _e('Port 443 (Recommended)'); ?>
145+
</label>
146+
<br />
147+
<label for="wnt-<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>-0">
148+
<input name="<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>"
149+
id="wnt-<?php echo Wolfnet_Plugin::SSL_WP_OPTION; ?>-0"
150+
<?php checked($sslEnabled, false); ?> type="radio" value="0" />
151+
<?php _e('Port 80 - not secure'); ?>
152+
</label>
153+
<p class="description">
154+
<?php _e("This option determines if the plugin will communicate with the API via a secure connection. In the near future this option will be deprecated and the API will only work over TLS via port 443."); ?>
155+
</p>
156+
</td>
157+
</tr>
158+
</table>
159+
</fieldset>
160+
</div>
161+
162+
<p class="submit">
163+
<?php submit_button(
164+
$text = NULL, $type = 'primary', $name = 'submit', $wrap = FALSE, $other_attributes = NULL
165+
); ?>
166+
</p>
167+
168+
</form>
165169

166170
</div>
167171

@@ -237,6 +241,21 @@
237241
$.fn.wolfnetInsertKeyRow();
238242
} );
239243

244+
245+
var $advOptions = $('#wolfnet-advanced-options'),
246+
$advContent = $advOptions.find('fieldset').first().hide();
247+
248+
var $advToggle = $('<p>')
249+
.append(
250+
$('<button type="button" class="button">')
251+
.html('<span class="wnt-icon wnt-icon-cog"></span> <?php _e('Advanced Settings ...'); ?>')
252+
.click(function () {
253+
$advToggle.hide();
254+
$advContent.show();
255+
})
256+
)
257+
.prependTo($advOptions);
258+
240259
});
241260

242261
}

‎src/template/adminStyle.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<div id="icon-options-wolfnet" class="icon32"><br /></div>
1414

15-
<h1>WolfNet <sup>&reg;</sup> - Appearance</h1>
15+
<h1>Appearance - WolfNet<sup>&reg;</sup></h1>
1616

1717
<p>
1818
The 'Modern' widget themes streamline the look of the property photos within

‎src/template/adminSupport.php‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ function wolfnet_print_thumbnail($img, $imgdir)
3131

3232
<div id="icon-options-wolfnet" class="icon32"><br /></div>
3333

34-
<h1>WolfNet <sup>&reg;</sup> - Plugin Support</h1>
34+
<h1>Plugin Support - WolfNet<sup>&reg;</sup></h1>
3535

3636
<p>
3737
Please contact WolfNet Technologies via phone at 612-342-0088 or toll-free at 1-866-WOLFNET,

‎src/template/adminThemes.php‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,22 +44,22 @@
4444

4545
<span class="wolfnet_widget_theme_label">
4646
<span class="wolfnet_widget_theme_flag">
47-
<?php if ($themeOptSelected) echo _e('Active:') ?>
47+
<?php if ($themeOptSelected) _e('Active:') ?>
4848
</span>
4949
<?php _e($themeOpt['label']); ?>
5050
</span>
5151

5252
<span class="wolfnet_widget_theme_actions">
5353
<?php if ($themeOptSelected) { ?>
5454
<a href="#wolfnet-color-options"
55-
class="button-primary"><?php echo _e('Customize'); ?></a>
55+
class="button-primary"><?php _e('Customize'); ?></a>
5656
<?php } else { ?>
5757
<button type="submit" class="button button-secondary"
5858
name="wolfnet_widgetTheme"
5959
id="wolfnet_widgetTheme_<?php echo esc_attr($themeOpt['name']); ?>"
6060
value="<?php echo esc_attr($themeOpt['name']); ?>"
6161
title="<?php esc_attr_e('Apply this widget theme'); ?>">
62-
<?php echo _e('Apply'); ?>
62+
<?php _e('Apply'); ?>
6363
</button>
6464
<?php } ?>
6565
</span>

0 commit comments

Comments
 (0)