WordPress Social Tools, Related Posts, Monetization – Shareaholic - Version 7.5.0.0

Version Description

  • Several usability improvements to the admin UI!
  • Bugfix: Fixed missing Share Counts on pages that were excluded from Related Content
Download this release

Release Info

Developer shareaholic
Plugin Icon 128x128 WordPress Social Tools, Related Posts, Monetization – Shareaholic
Version 7.5.0.0
Comparing to
See all releases

Code changes from version 7.4.0.8 to 7.5.0.0

Files changed (11) hide show
  1. Rakefile +53 -0
  2. assets/css/main.css +66 -4
  3. assets/img/shareaholic_com_sprite.png +0 -0
  4. assets/js/main.js +15 -3
  5. languages/shareaholic.pot +84 -58
  6. public.php +5 -67
  7. readme.txt +9 -1
  8. shareaholic.php +3 -7
  9. templates/settings.php +49 -44
  10. templates/why_to_sign_up.php +2 -3
  11. utilities.php +12 -4
Rakefile ADDED
@@ -0,0 +1,53 @@
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
1
+ # Copyright Shareaholic, Inc. (www.shareaholic.com). All Rights Reserved.
2
+
3
+ desc 'Get plugin ready for WordPress directory'
4
+ task :makerelease do
5
+ Rake::Task['min'].invoke
6
+ end
7
+
8
+ desc 'Minify scripts using closure compiler'
9
+ task :min => "compiler/compiler.jar" do
10
+ files = %w(main)
11
+ js_root = File.expand_path(File.join(File.dirname(__FILE__),'assets/js'))
12
+ files.each do |name|
13
+ src = File.join(js_root,"#{name}.js")
14
+ dest = File.join(js_root,"#{name}.min.js")
15
+ cmd = "java -jar compiler/compiler.jar "
16
+ cmd << "--js #{src} "
17
+ cmd << "--js_output_file #{dest}"
18
+ sh cmd
19
+ end
20
+ end
21
+
22
+ file "compiler/compiler.jar" do
23
+ mkdir "compiler"
24
+ cd "compiler"
25
+ url = "http://closure-compiler.googlecode.com/files/compiler-latest.zip"
26
+ sh "curl -O #{url}"
27
+ sh "unzip compiler-latest.zip"
28
+ sh "rm compiler-latest.zip"
29
+ cd "../"
30
+ end
31
+
32
+ desc 'Copy latest plugin code to local WP install'
33
+ task :maketest do
34
+ Rake::Task['makerelease'].invoke
35
+ sh "rm -rf ../wordpress_local/wp-content/plugins/shareaholic"
36
+ sh "cp -r ../shareaholic_for_wordpress ../wordpress_local/wp-content/plugins/shareaholic"
37
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \".DS_Store\"`"
38
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \"Thumbs.db\"`"
39
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \".git\"`"
40
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \".gitignore\"`"
41
+ sh "rm -rf ../wordpress_local/wp-content/plugins/shareaholic/compiler"
42
+ end
43
+
44
+ desc 'Copy latest plugin code to local WP install - DOES NOT MINIFY'
45
+ task :makequickcopy do
46
+ sh "rm -rf ../wordpress_local/wp-content/plugins/shareaholic"
47
+ sh "cp -r ../shareaholic_for_wordpress ../wordpress_local/wp-content/plugins/shareaholic"
48
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \".DS_Store\"`"
49
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \"Thumbs.db\"`"
50
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \".git\"`"
51
+ sh "rm -rf `find ../wordpress_local/wp-content/plugins/shareaholic/ -name \".gitignore\"`"
52
+ sh "rm -rf ../wordpress_local/wp-content/plugins/shareaholic/compiler"
53
+ end
assets/css/main.css CHANGED
@@ -23,6 +23,7 @@ fieldset {
23
  .app {
24
  width:100%;
25
  line-height: 3em;
 
26
  }
27
 
28
  .app h2 {
@@ -47,9 +48,6 @@ legend {
47
  position: relative;
48
  top:-4px;
49
  }
50
- .btn {
51
- margin-left:20px;
52
- }
53
 
54
  .helper {
55
  display: block;
@@ -59,6 +57,16 @@ legend {
59
  text-indent: -17px;
60
  }
61
 
 
 
 
 
 
 
 
 
 
 
62
  .label {
63
  margin-right:20px;
64
  }
@@ -73,7 +81,7 @@ h3 {
73
 
74
  #iframe_container, iframe {
75
  width:100%;
76
- height: 550px;
77
  }
78
 
79
  .bg-loading-img {
@@ -106,6 +114,25 @@ h3 {
106
  /* display: none; */
107
  }
108
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
109
  #editing_modal {
110
  padding: 0;
111
  }
@@ -427,3 +454,38 @@ input[type='text'] {
427
  background-color: #45a147;
428
  border: 1px solid #1E8520;
429
  }
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
23
  .app {
24
  width:100%;
25
  line-height: 3em;
26
+ margin-top: 10px;
27
  }
28
 
29
  .app h2 {
48
  position: relative;
49
  top:-4px;
50
  }
 
 
 
51
 
52
  .helper {
53
  display: block;
57
  text-indent: -17px;
58
  }
59
 
60
+ .helper_secondary {
61
+ display: block;
62
+ margin-left: 20px;
63
+ font-size: 12px;
64
+ line-height: 14pt;
65
+ text-indent: -17px;
66
+ padding-top: 12px;
67
+ padding-bottom: 8px;
68
+ }
69
+
70
  .label {
71
  margin-right:20px;
72
  }
81
 
82
  #iframe_container, iframe {
83
  width:100%;
84
+ height: 600px;
85
  }
86
 
87
  .bg-loading-img {
114
  /* display: none; */
115
  }
116
 
117
+ .reveal-modal.has-shortcode iframe,
118
+ .reveal-modal.has-shortcode #iframe_container {
119
+ height: 550px;
120
+ }
121
+
122
+ .fieldset-footer {
123
+ clear: both;
124
+ padding-top: 10px;
125
+ overflow: hidden;
126
+ }
127
+
128
+ .fieldset-footer button{
129
+ float: left;
130
+ }
131
+
132
+ .fieldset-footer .app-status{
133
+ float: left;
134
+ }
135
+
136
  #editing_modal {
137
  padding: 0;
138
  }
454
  background-color: #45a147;
455
  border: 1px solid #1E8520;
456
  }
457
+
458
+ i.icon.icon-share_buttons {
459
+ background-position: 0 0px;
460
+ width: 16px;
461
+ height: 16px;
462
+ }
463
+
464
+ i.icon.icon-recommendations {
465
+ background-position: 0 -16px;
466
+ width: 16px;
467
+ height: 16px;
468
+ }
469
+
470
+ i.icon.icon-analytics {
471
+ background-position: 0 -32px;
472
+ width: 16px;
473
+ height: 16px;
474
+ }
475
+
476
+ i.icon.icon-website {
477
+ background-position: 0 -96px;
478
+ width: 16px;
479
+ height: 16px;
480
+ }
481
+
482
+ i.icon {
483
+ vertical-align: middle;
484
+ background-image: url(../img/shareaholic_com_sprite.png);
485
+ background-position: 0 0;
486
+ background-repeat: no-repeat;
487
+ display: inline-block;
488
+ position: relative;
489
+ width: 16px;
490
+ height: 16px;
491
+ }
assets/img/shareaholic_com_sprite.png ADDED
Binary file
assets/js/main.js CHANGED
@@ -44,6 +44,8 @@
44
  return url;
45
  },
46
  callback: function(button) {
 
 
47
  id = $(button).data('location_id');
48
  app = $(button).data('app');
49
  text = 'You can also use this shortcode to place this {{app}} App anywhere.';
@@ -51,21 +53,30 @@
51
  <span id='shortcode_description'></span> \
52
  <textarea id='shortcode' name='widget_div' onclick='select();' readonly='readonly'></textarea> \
53
  </div>"
54
- $(html).appendTo('.reveal-modal');
55
  $('#shortcode_description').text(text.replace(/{{app}}/, Shareaholic.titlecase(app)));
56
  $('#shortcode').text('[shareaholic app="' + app + '" id="' + id + '"]');
57
  },
58
  close: function(button) {
59
  $('#shortcode_container').remove();
 
60
  }
61
  },
62
 
63
  'general_settings': {
64
  selector: '#general_settings',
65
  url: function(button) {
66
- return first_part_of_url + 'edit'
67
  + '?verification_key=' + verification_key;
68
  }
 
 
 
 
 
 
 
 
69
  }
70
  }
71
 
@@ -86,7 +97,7 @@
86
 
87
  Shareaholic.disable_buttons = function() {
88
  $('#app_settings button').each(function() {
89
- if (!$(this).data('location_id')) {
90
  $(this).attr('disabled', 'disabled');
91
  } else {
92
  $(this).removeAttr('disabled');
@@ -158,6 +169,7 @@
158
 
159
  Shareaholic.bind_button_clicks(Shareaholic.click_objects['app_settings']);
160
  Shareaholic.bind_button_clicks(Shareaholic.click_objects['general_settings']);
 
161
  if (Shareaholic.click_objects['unverified_general_settings']) {
162
  Shareaholic.bind_button_clicks(Shareaholic.click_objects['unverified_general_settings'], true);
163
  }
44
  return url;
45
  },
46
  callback: function(button) {
47
+ $modal = $('.reveal-modal');
48
+ $modal.addClass('has-shortcode')
49
  id = $(button).data('location_id');
50
  app = $(button).data('app');
51
  text = 'You can also use this shortcode to place this {{app}} App anywhere.';
53
  <span id='shortcode_description'></span> \
54
  <textarea id='shortcode' name='widget_div' onclick='select();' readonly='readonly'></textarea> \
55
  </div>"
56
+ $(html).appendTo($modal);
57
  $('#shortcode_description').text(text.replace(/{{app}}/, Shareaholic.titlecase(app)));
58
  $('#shortcode').text('[shareaholic app="' + app + '" id="' + id + '"]');
59
  },
60
  close: function(button) {
61
  $('#shortcode_container').remove();
62
+ $('.reveal-modal').removeClass('has-shortcode');
63
  }
64
  },
65
 
66
  'general_settings': {
67
  selector: '#general_settings',
68
  url: function(button) {
69
+ return first_part_of_url + 'websites/edit/'
70
  + '?verification_key=' + verification_key;
71
  }
72
+ },
73
+ 'app_wide_settings': {
74
+ selector: '.app_wide_settings',
75
+ url: function(button) {
76
+ url = first_part_of_url + $(button).data('href') + '?embedded=true&'
77
+ + 'verification_key=' + verification_key;
78
+ return url
79
+ }
80
  }
81
  }
82
 
97
 
98
  Shareaholic.disable_buttons = function() {
99
  $('#app_settings button').each(function() {
100
+ if (!$(this).data('location_id') && !this.id == 'app_wide_settings') {
101
  $(this).attr('disabled', 'disabled');
102
  } else {
103
  $(this).removeAttr('disabled');
169
 
170
  Shareaholic.bind_button_clicks(Shareaholic.click_objects['app_settings']);
171
  Shareaholic.bind_button_clicks(Shareaholic.click_objects['general_settings']);
172
+ Shareaholic.bind_button_clicks(Shareaholic.click_objects['app_wide_settings']);
173
  if (Shareaholic.click_objects['unverified_general_settings']) {
174
  Shareaholic.bind_button_clicks(Shareaholic.click_objects['unverified_general_settings'], true);
175
  }
languages/shareaholic.pot CHANGED
@@ -3,9 +3,9 @@
3
  msgid ""
4
  msgstr ""
5
  "Project-Id-Version: Shareaholic | share buttons, analytics, related content "
6
- "7.2.2.0\n"
7
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/shareaholic\n"
8
- "POT-Creation-Date: 2014-03-12 20:11:40+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
@@ -13,11 +13,11 @@ msgstr ""
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
 
16
- #: admin.php:217 admin.php:285
17
  msgid "Settings successfully saved"
18
  msgstr ""
19
 
20
- #: admin.php:279
21
  msgid "Settings successfully reset. Refresh this page to complete the reset."
22
  msgstr ""
23
 
@@ -57,46 +57,56 @@ msgid "(it is recommended NOT to disable open graph tags)"
57
  msgstr ""
58
 
59
  #: templates/advanced_settings.php:31
60
- msgid "Disable Admin Bar Menu"
61
  msgstr ""
62
 
63
- #: templates/advanced_settings.php:34 templates/settings.php:94
 
 
 
 
 
 
 
 
 
 
64
  msgid "Saving Changes..."
65
  msgstr ""
66
 
67
- #: templates/advanced_settings.php:34 templates/settings.php:94
68
  msgid "Save Changes"
69
  msgstr ""
70
 
71
- #: templates/advanced_settings.php:42
72
  msgid "Server Connectivity"
73
  msgstr ""
74
 
75
- #: templates/advanced_settings.php:44
76
  msgid "All Shareaholic servers are reachable"
77
  msgstr ""
78
 
79
- #: templates/advanced_settings.php:45
80
  msgid "Shareaholic should be working correctly."
81
  msgstr ""
82
 
83
- #: templates/advanced_settings.php:45
84
  msgid "All Shareaholic servers are accessible."
85
  msgstr ""
86
 
87
- #: templates/advanced_settings.php:47
88
  msgid "Unable to reach any Shareaholic server"
89
  msgstr ""
90
 
91
- #: templates/advanced_settings.php:47
92
  msgid "Checking..."
93
  msgstr ""
94
 
95
- #: templates/advanced_settings.php:47
96
  msgid "Re-check"
97
  msgstr ""
98
 
99
- #: templates/advanced_settings.php:48
100
  msgid ""
101
  "A network problem or firewall is blocking all connections from your web "
102
  "server to Shareaholic.com. <strong>Shareaholic cannot work correctly until "
@@ -106,29 +116,56 @@ msgid ""
106
  "onclick=\"%s\">know</a> too, so we can follow up!"
107
  msgstr ""
108
 
109
- #: templates/advanced_settings.php:55
110
- msgid "Your Shareaholic Site ID"
 
 
 
 
 
 
 
 
111
  msgstr ""
112
 
113
  #: templates/advanced_settings.php:59
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
114
  msgid "Not set."
115
  msgstr ""
116
 
117
- #: templates/advanced_settings.php:69
118
  msgid "Reset"
119
  msgstr ""
120
 
121
- #: templates/advanced_settings.php:70
122
  msgid ""
123
  "This will reset all of your settings and start you from scratch. This can "
124
  "not be undone."
125
  msgstr ""
126
 
127
- #: templates/advanced_settings.php:72
128
  msgid "Resetting Plugin..."
129
  msgstr ""
130
 
131
- #: templates/advanced_settings.php:72
132
  msgid "Reset Plugin"
133
  msgstr ""
134
 
@@ -224,7 +261,7 @@ msgid ""
224
  "customize look & feel, themes, share counters, alignment, etc."
225
  msgstr ""
226
 
227
- #: templates/settings.php:45 templates/settings.php:72
228
  msgid "Customize"
229
  msgstr ""
230
 
@@ -238,15 +275,15 @@ msgid ""
238
  "customize look & feel, themes, block lists, etc."
239
  msgstr ""
240
 
241
- #: templates/settings.php:79
242
  msgid "Related Content:"
243
  msgstr ""
244
 
245
- #: templates/settings.php:83
246
  msgid "Processing"
247
  msgstr ""
248
 
249
- #: templates/settings.php:85
250
  msgid "Ready"
251
  msgstr ""
252
 
@@ -284,72 +321,61 @@ msgid ""
284
  "and %sPrivacy Policy%s."
285
  msgstr ""
286
 
287
- #: templates/why_to_sign_up.php:3
288
- msgid "Installation &amp; Usage Guides"
289
  msgstr ""
290
 
291
  #: templates/why_to_sign_up.php:4
292
- msgid "Submit a Translation"
293
  msgstr ""
294
 
295
  #: templates/why_to_sign_up.php:5
296
- msgid "Get the Shareaholic Browser Add-on"
297
- msgstr ""
298
-
299
- #: templates/why_to_sign_up.php:10
300
  msgid ""
301
- "Unlock additional customization options when you connect this plugin to "
302
- "your FREE Shareaholic account."
303
  msgstr ""
304
 
305
- #: templates/why_to_sign_up.php:12
306
- msgid ""
307
- "Brand your social shares. For example, you can make all Twitter shares say "
308
- "\"by @Twitterhandle\""
309
  msgstr ""
310
 
311
- #: templates/why_to_sign_up.php:13
312
- msgid ""
313
- "Pick your favorite URL shortener, including support for branded bitly short "
314
- "links."
315
  msgstr ""
316
 
317
- #: templates/why_to_sign_up.php:14
318
  msgid ""
319
- "Additional themes for share buttons, related content, etc to match your site."
 
320
  msgstr ""
321
 
322
  #: templates/why_to_sign_up.php:15
323
- msgid "Opportunities to make money with your site, plus lots more!"
324
  msgstr ""
325
 
326
- #: templates/why_to_sign_up.php:17
327
- msgid "Edit General Website Settings"
328
  msgstr ""
329
 
330
- #: templates/why_to_sign_up.php:18
331
- msgid ""
332
- "Connecting is simple. Simply click the button above and sign in to your "
333
- "Shareaholic account to connect this plugin to your account. If you don't "
334
- "have an account already, simply create a new account — it takes just seconds "
335
- "and it's free!"
336
  msgstr ""
337
 
338
- #: utilities.php:93
339
  msgid "Settings"
340
  msgstr ""
341
 
342
- #. #-#-#-#-# plugin.pot (Shareaholic | share buttons, analytics, related content 7.2.2.0) #-#-#-#-#
343
  #. Author of the plugin/theme
344
- #: utilities.php:110
345
  msgid "Shareaholic"
346
  msgstr ""
347
 
348
- #: utilities.php:127
349
  msgid "App Manager"
350
  msgstr ""
351
 
352
- #: utilities.php:134
353
  msgid "General Settings"
354
  msgstr ""
355
 
3
  msgid ""
4
  msgstr ""
5
  "Project-Id-Version: Shareaholic | share buttons, analytics, related content "
6
+ "7.4.0.8\n"
7
  "Report-Msgid-Bugs-To: http://wordpress.org/tag/shareaholic\n"
8
+ "POT-Creation-Date: 2014-06-26 19:48:48+00:00\n"
9
  "MIME-Version: 1.0\n"
10
  "Content-Type: text/plain; charset=UTF-8\n"
11
  "Content-Transfer-Encoding: 8bit\n"
13
  "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14
  "Language-Team: LANGUAGE <LL@li.org>\n"
15
 
16
+ #: admin.php:227 admin.php:297
17
  msgid "Settings successfully saved"
18
  msgstr ""
19
 
20
+ #: admin.php:291
21
  msgid "Settings successfully reset. Refresh this page to complete the reset."
22
  msgstr ""
23
 
57
  msgstr ""
58
 
59
  #: templates/advanced_settings.php:31
60
+ msgid "Disable Admin Bar Menu (requires page refresh)"
61
  msgstr ""
62
 
63
+ #: templates/advanced_settings.php:37
64
+ msgid "Disable server-side Share Counts API"
65
+ msgstr ""
66
+
67
+ #: templates/advanced_settings.php:37
68
+ msgid ""
69
+ "(unless there are issues with calling the service, it is recommended NOT to "
70
+ "disable this API)"
71
+ msgstr ""
72
+
73
+ #: templates/advanced_settings.php:39 templates/settings.php:96
74
  msgid "Saving Changes..."
75
  msgstr ""
76
 
77
+ #: templates/advanced_settings.php:39 templates/settings.php:96
78
  msgid "Save Changes"
79
  msgstr ""
80
 
81
+ #: templates/advanced_settings.php:47
82
  msgid "Server Connectivity"
83
  msgstr ""
84
 
85
+ #: templates/advanced_settings.php:49
86
  msgid "All Shareaholic servers are reachable"
87
  msgstr ""
88
 
89
+ #: templates/advanced_settings.php:50
90
  msgid "Shareaholic should be working correctly."
91
  msgstr ""
92
 
93
+ #: templates/advanced_settings.php:50
94
  msgid "All Shareaholic servers are accessible."
95
  msgstr ""
96
 
97
+ #: templates/advanced_settings.php:52
98
  msgid "Unable to reach any Shareaholic server"
99
  msgstr ""
100
 
101
+ #: templates/advanced_settings.php:52 templates/advanced_settings.php:59
102
  msgid "Checking..."
103
  msgstr ""
104
 
105
+ #: templates/advanced_settings.php:52 templates/advanced_settings.php:59
106
  msgid "Re-check"
107
  msgstr ""
108
 
109
+ #: templates/advanced_settings.php:53
110
  msgid ""
111
  "A network problem or firewall is blocking all connections from your web "
112
  "server to Shareaholic.com. <strong>Shareaholic cannot work correctly until "
116
  "onclick=\"%s\">know</a> too, so we can follow up!"
117
  msgstr ""
118
 
119
+ #: templates/advanced_settings.php:56
120
+ msgid "Server-side Share Counts API is reachable"
121
+ msgstr ""
122
+
123
+ #: templates/advanced_settings.php:57
124
+ msgid "The server-side Share Counts API should be working correctly."
125
+ msgstr ""
126
+
127
+ #: templates/advanced_settings.php:57
128
+ msgid "All servers and services needed by the API are accessible."
129
  msgstr ""
130
 
131
  #: templates/advanced_settings.php:59
132
+ msgid "Unable to reach the server-side Share Count API"
133
+ msgstr ""
134
+
135
+ #: templates/advanced_settings.php:60
136
+ msgid ""
137
+ "A network problem or firewall is blocking connections from your web server "
138
+ "to various Share Count APIs. <strong>The API cannot work correctly until "
139
+ "this is fixed.</strong> If you continue to face this issue, please contact "
140
+ "<a href=\"#\" onclick=\"%s\">us</a> and we will follow up! In the meantime, "
141
+ "if you disable the server-side Share Counts API from the Advanced options "
142
+ "above, Shareaholic will default to using client-side APIs for share counts "
143
+ "successfully -- so nothing to worry about!"
144
+ msgstr ""
145
+
146
+ #: templates/advanced_settings.php:67
147
+ msgid "Your Shareaholic Site ID"
148
+ msgstr ""
149
+
150
+ #: templates/advanced_settings.php:71
151
  msgid "Not set."
152
  msgstr ""
153
 
154
+ #: templates/advanced_settings.php:81
155
  msgid "Reset"
156
  msgstr ""
157
 
158
+ #: templates/advanced_settings.php:82
159
  msgid ""
160
  "This will reset all of your settings and start you from scratch. This can "
161
  "not be undone."
162
  msgstr ""
163
 
164
+ #: templates/advanced_settings.php:84
165
  msgid "Resetting Plugin..."
166
  msgstr ""
167
 
168
+ #: templates/advanced_settings.php:84
169
  msgid "Reset Plugin"
170
  msgstr ""
171
 
261
  "customize look & feel, themes, share counters, alignment, etc."
262
  msgstr ""
263
 
264
+ #: templates/settings.php:45 templates/settings.php:73
265
  msgid "Customize"
266
  msgstr ""
267
 
275
  "customize look & feel, themes, block lists, etc."
276
  msgstr ""
277
 
278
+ #: templates/settings.php:81
279
  msgid "Related Content:"
280
  msgstr ""
281
 
282
+ #: templates/settings.php:85
283
  msgid "Processing"
284
  msgstr ""
285
 
286
+ #: templates/settings.php:87
287
  msgid "Ready"
288
  msgstr ""
289
 
321
  "and %sPrivacy Policy%s."
322
  msgstr ""
323
 
324
+ #: templates/why_to_sign_up.php:2
325
+ msgid "Sign up for a FREE Shareaholic account to unlock more features."
326
  msgstr ""
327
 
328
  #: templates/why_to_sign_up.php:4
329
+ msgid "Brand your social shares with your @Twitterhandle"
330
  msgstr ""
331
 
332
  #: templates/why_to_sign_up.php:5
 
 
 
 
333
  msgid ""
334
+ "Pick your favorite URL shortener, including support for branded bitly short "
335
+ "links."
336
  msgstr ""
337
 
338
+ #: templates/why_to_sign_up.php:6
339
+ msgid "Monetize your site, plus lots more!"
 
 
340
  msgstr ""
341
 
342
+ #: templates/why_to_sign_up.php:8
343
+ msgid "Edit General Website Settings"
 
 
344
  msgstr ""
345
 
346
+ #: templates/why_to_sign_up.php:10
347
  msgid ""
348
+ "Click the button above to sign up or log in to your free Shareaholic "
349
+ "account. It takes just seconds to sign up and it's free!"
350
  msgstr ""
351
 
352
  #: templates/why_to_sign_up.php:15
353
+ msgid "Shareaholic Helpdesk"
354
  msgstr ""
355
 
356
+ #: templates/why_to_sign_up.php:16
357
+ msgid "Submit a Language Translation"
358
  msgstr ""
359
 
360
+ #: templates/why_to_sign_up.php:17
361
+ msgid "Get the Shareaholic Browser Add-on"
 
 
 
 
362
  msgstr ""
363
 
364
+ #: utilities.php:95
365
  msgid "Settings"
366
  msgstr ""
367
 
368
+ #. #-#-#-#-# plugin.pot (Shareaholic | share buttons, analytics, related content 7.4.0.8) #-#-#-#-#
369
  #. Author of the plugin/theme
370
+ #: utilities.php:112
371
  msgid "Shareaholic"
372
  msgstr ""
373
 
374
+ #: utilities.php:129
375
  msgid "App Manager"
376
  msgstr ""
377
 
378
+ #: utilities.php:136
379
  msgid "General Settings"
380
  msgstr ""
381
 
public.php CHANGED
@@ -206,13 +206,16 @@ class ShareaholicPublic {
206
  $article_password = $post->post_password;
207
 
208
  if ($article_visibility == 'draft' || $article_visibility == 'auto-draft' || $article_visibility == 'future' || $article_visibility == 'pending'){
 
209
  $article_visibility = 'draft';
210
  } else if ($article_visibility == 'private' || $post->post_password != '' || is_attachment()) {
 
211
  $article_visibility = 'private';
212
  } else {
 
213
  $article_visibility = NULL;
214
  }
215
-
216
  // Lookup Metabox value
217
  if (get_post_meta($post->ID, 'shareaholic_exclude_recommendations', true)) {
218
  $article_visibility = 'private';
@@ -221,7 +224,7 @@ class ShareaholicPublic {
221
  if (!empty($article_visibility)) {
222
  echo "<meta name='shareaholic:article_visibility' content='" . $article_visibility . "' />\n";
223
  }
224
-
225
  // Article Author Name
226
  if ($post->post_author) {
227
  $article_author_data = get_userdata($post->post_author);
@@ -515,71 +518,6 @@ class ShareaholicPublic {
515
  exit;
516
  }
517
 
518
- /**
519
- * Function to return relevant info for a given page
520
- *
521
- * @return page info in JSON
522
- */
523
- public static function post_info() {
524
- global $wpdb;
525
- $url = isset($_GET['url']) ? $_GET['url'] : NULL;
526
- $post_id = url_to_postid($url);
527
- $post = get_post($post_id);
528
- $url = get_permalink($post_id);
529
- $tags = wp_get_post_tags($post_id, array('fields' => 'names'));
530
-
531
- // $categories = array_map(array('ShareaholicNotifier', 'post_notify_iterator'), get_the_category($post_id));
532
-
533
- if (function_exists('has_post_thumbnail') && has_post_thumbnail($post_id)) {
534
- $featured_image = wp_get_attachment_image_src(get_post_thumbnail_id($post_id), 'large');
535
- } else {
536
- $featured_image = ShareaholicPublic::post_first_image();
537
- if (!$featured_image) {
538
- $featured_image = '';
539
- }
540
- }
541
-
542
- if ($post->post_author) {
543
- $author_data = get_userdata($post->post_author);
544
- $author_name = $author_data->display_name;
545
- }
546
-
547
- $info = array(
548
- 'url' => $url,
549
- 'api_key' => ShareaholicUtilities::get_option('api_key'),
550
- 'content' => array(
551
- 'title' => $post->post_title,
552
- 'excerpt' => $post->post_excerpt,
553
- 'body' => $post->post_content,
554
- 'featured-image-url' => $featured_image,
555
- ),
556
- 'metadata' => array(
557
- 'author_id' => $post->post_author,
558
- 'author_name' => $author_name,
559
- 'post_type' => $post->post_type,
560
- 'post_id' => $post_id,
561
- 'post_tags' => $tags,
562
- // 'post_categories' => $categories,
563
- 'post_language' => get_bloginfo('language'),
564
- 'published' => $post->post_date_gmt,
565
- 'updated' => get_lastpostmodified('GMT'),
566
- 'visibility' => $post->post_status,
567
- ),
568
- 'site_info' => array(
569
- 'platform' => 'wordpress',
570
- 'plugin_version' => Shareaholic::VERSION,
571
- 'posts_total' => $wpdb->get_var( "SELECT count(ID) FROM $wpdb->posts where post_type = 'post' AND post_status = 'publish'" ),
572
- 'posts_total' => $wpdb->get_var( "SELECT count(ID) FROM $wpdb->posts where post_type = 'page' AND post_status = 'publish'" ),
573
- 'comments_total' => wp_count_comments()->approved,
574
- 'users_total' => $wpdb->get_var("SELECT count(ID) FROM $wpdb->users"),
575
- ));
576
-
577
- header('Content-Type: application/json');
578
- echo json_encode($info);
579
- exit;
580
- }
581
-
582
-
583
  /**
584
  * Checks to see if curl is installed
585
  *
206
  $article_password = $post->post_password;
207
 
208
  if ($article_visibility == 'draft' || $article_visibility == 'auto-draft' || $article_visibility == 'future' || $article_visibility == 'pending'){
209
+ echo "<meta name='shareaholic:shareable_page' content='false' />\n";
210
  $article_visibility = 'draft';
211
  } else if ($article_visibility == 'private' || $post->post_password != '' || is_attachment()) {
212
+ echo "<meta name='shareaholic:shareable_page' content='true' />\n";
213
  $article_visibility = 'private';
214
  } else {
215
+ echo "<meta name='shareaholic:shareable_page' content='true' />\n";
216
  $article_visibility = NULL;
217
  }
218
+
219
  // Lookup Metabox value
220
  if (get_post_meta($post->ID, 'shareaholic_exclude_recommendations', true)) {
221
  $article_visibility = 'private';
224
  if (!empty($article_visibility)) {
225
  echo "<meta name='shareaholic:article_visibility' content='" . $article_visibility . "' />\n";
226
  }
227
+
228
  // Article Author Name
229
  if ($post->post_author) {
230
  $article_author_data = get_userdata($post->post_author);
518
  exit;
519
  }
520
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
521
  /**
522
  * Checks to see if curl is installed
523
  *
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: shareaholic
3
  Tags: sexybookmarks, shareaholic, shareholic, facebook, twitter, linkedin, URL Shortener, bitly, tinyurl, Goo.gl, Google+1, Google Analytics, Google Plus, Google, Instapaper, Wish List, Digg, Gmail, Google Bookmarks, Translate, Tumblr, AIM, Yahoo Messenger, Delicious, StumbleUpon, mister wong, evernote, add this, addtoany, share this, sharethis, share and follow, share and enjoy, sharing is sexy, sharing is caring, yahoo, reddit, hackernews, tweet button, twitter button, fark, buffer, myspace, orkut, netlog, hubspot, weheartit, printfriendly, yammer, wanelo, pinterest, google translate, bookmarks, social, email button, social share, socialize, sociable, sharebar, bookmark button, share button, social bookmarking, bookmarks menu, bookmarking, share, seo, analytics, stats, sharing, facebook like, facebook recommend, WPMU, mutisite, shortcode, yaarp, yarpp, nrelate, outbrain, linkwithin, related content, related posts, related, popular posts, popular, thumbnails, recommendations
4
  Requires at least: 3.0
5
  Tested up to: 3.9.1
6
- Stable tag: 7.4.0.8
7
 
8
  Adds an attractive social bookmarking menu and related content widget to your posts, pages, index, or any combination of the three.
9
 
@@ -155,6 +155,10 @@ Please see here: [Usage & Installation Instructions](http://support.shareaholic.
155
 
156
  == Changelog ==
157
 
 
 
 
 
158
  = 7.4.0.8 =
159
  * Miscellaneous performance enhancements and bug fixes
160
  * Shareaholic plugin debugger
@@ -1075,6 +1079,10 @@ Please see here: [Usage & Installation Instructions](http://support.shareaholic.
1075
 
1076
  == Upgrade Notice ==
1077
 
 
 
 
 
1078
  = 7.4.0.8 =
1079
 
1080
  Shareaholic plugin debugger - makes debugging plugin related issues faster and easier.
3
  Tags: sexybookmarks, shareaholic, shareholic, facebook, twitter, linkedin, URL Shortener, bitly, tinyurl, Goo.gl, Google+1, Google Analytics, Google Plus, Google, Instapaper, Wish List, Digg, Gmail, Google Bookmarks, Translate, Tumblr, AIM, Yahoo Messenger, Delicious, StumbleUpon, mister wong, evernote, add this, addtoany, share this, sharethis, share and follow, share and enjoy, sharing is sexy, sharing is caring, yahoo, reddit, hackernews, tweet button, twitter button, fark, buffer, myspace, orkut, netlog, hubspot, weheartit, printfriendly, yammer, wanelo, pinterest, google translate, bookmarks, social, email button, social share, socialize, sociable, sharebar, bookmark button, share button, social bookmarking, bookmarks menu, bookmarking, share, seo, analytics, stats, sharing, facebook like, facebook recommend, WPMU, mutisite, shortcode, yaarp, yarpp, nrelate, outbrain, linkwithin, related content, related posts, related, popular posts, popular, thumbnails, recommendations
4
  Requires at least: 3.0
5
  Tested up to: 3.9.1
6
+ Stable tag: 7.5.0.0
7
 
8
  Adds an attractive social bookmarking menu and related content widget to your posts, pages, index, or any combination of the three.
9
 
155
 
156
  == Changelog ==
157
 
158
+ = 7.5.0.0 =
159
+ * Several usability improvements to the admin UI!
160
+ * Bugfix: Fixed missing Share Counts on pages that were excluded from Related Content
161
+
162
  = 7.4.0.8 =
163
  * Miscellaneous performance enhancements and bug fixes
164
  * Shareaholic plugin debugger
1079
 
1080
  == Upgrade Notice ==
1081
 
1082
+ = 7.5.0.0 =
1083
+
1084
+ Several usability improvements to the admin UI!
1085
+
1086
  = 7.4.0.8 =
1087
 
1088
  Shareaholic plugin debugger - makes debugging plugin related issues faster and easier.
shareaholic.php CHANGED
@@ -3,14 +3,14 @@
3
  * The main file!
4
  *
5
  * @package shareaholic
6
- * @version 7.4.0.8
7
  */
8
 
9
  /*
10
  Plugin Name: Shareaholic | share buttons, analytics, related content
11
  Plugin URI: https://shareaholic.com/publishers/
12
  Description: Whether you want to get people sharing, grow your fans, make money, or know who's reading your content, Shareaholic will help you get it done. See <a href="admin.php?page=shareaholic-settings">configuration panel</a> for more settings.
13
- Version: 7.4.0.8
14
  Author: Shareaholic
15
  Author URI: https://shareaholic.com
16
  Text Domain: shareaholic
@@ -61,7 +61,7 @@ class Shareaholic {
61
  const CM_API_URL = 'https://cm-web.shareaholic.com'; // uses static IPs for firewall whitelisting
62
  const REC_API_URL = 'http://recommendations.shareaholic.com';
63
 
64
- const VERSION = '7.4.0.8';
65
 
66
  /**
67
  * Starts off as false so that ::get_instance() returns
@@ -82,10 +82,6 @@ class Shareaholic {
82
  // Debug info
83
  add_action('wp_ajax_nopriv_shareaholic_debug_info', array('ShareaholicPublic', 'debug_info'));
84
  add_action('wp_ajax_shareaholic_debug_info', array('ShareaholicPublic', 'debug_info'));
85
-
86
- // Page info
87
- add_action('wp_ajax_nopriv_shareaholic_post_info', array('ShareaholicPublic', 'post_info'));
88
- add_action('wp_ajax_shareaholic_post_info', array('ShareaholicPublic', 'post_info'));
89
 
90
  add_action('init', array('ShareaholicPublic', 'init'));
91
  add_action('the_content', array('ShareaholicPublic', 'draw_canvases'));
3
  * The main file!
4
  *
5
  * @package shareaholic
6
+ * @version 7.5.0.0
7
  */
8
 
9
  /*
10
  Plugin Name: Shareaholic | share buttons, analytics, related content
11
  Plugin URI: https://shareaholic.com/publishers/
12
  Description: Whether you want to get people sharing, grow your fans, make money, or know who's reading your content, Shareaholic will help you get it done. See <a href="admin.php?page=shareaholic-settings">configuration panel</a> for more settings.
13
+ Version: 7.5.0.0
14
  Author: Shareaholic
15
  Author URI: https://shareaholic.com
16
  Text Domain: shareaholic
61
  const CM_API_URL = 'https://cm-web.shareaholic.com'; // uses static IPs for firewall whitelisting
62
  const REC_API_URL = 'http://recommendations.shareaholic.com';
63
 
64
+ const VERSION = '7.5.0.0';
65
 
66
  /**
67
  * Starts off as false so that ::get_instance() returns
82
  // Debug info
83
  add_action('wp_ajax_nopriv_shareaholic_debug_info', array('ShareaholicPublic', 'debug_info'));
84
  add_action('wp_ajax_shareaholic_debug_info', array('ShareaholicPublic', 'debug_info'));
 
 
 
 
85
 
86
  add_action('init', array('ShareaholicPublic', 'init'));
87
  add_action('the_content', array('ShareaholicPublic', 'draw_canvases'));
templates/settings.php CHANGED
@@ -22,36 +22,7 @@ window.verification_key = '<?php echo $settings['verification_key'] ?>'
22
  <fieldset class="app" style="line-height:18px;"><?php echo sprintf(__('First time here? Read %sUnderstanding the new Shareaholic for WordPress interface and configuration settings.%s', 'shareaholic'), '<a href="https://blog.shareaholic.com/understanding-the-new-shareaholic-for-wordpress-interface-and-configuration-settings/" target="_blank">','</a>'); ?> <?php echo sprintf(__('If you are upgrading from an earlier version of Shareaholic for WordPress and need help, have a question or have a bug to report, please %slet us know%s.', 'shareaholic'), '<a href="#" onclick="SnapEngage.startLink();">','</a>'); ?>
23
  </fieldset>
24
 
25
- <fieldset class="app"><legend><h2><img src="<?php echo SHAREAHOLIC_ASSET_DIR; ?>img/sharebuttons@2x.png" height=32 width=32 /> <?php echo sprintf(__('Share Buttons', 'shareaholic')); ?></h2></legend>
26
- <span class="helper"><i class="icon-star"></i> <?php echo sprintf(__('Pick where you want your buttons to be displayed. Click "Customize" to customize look & feel, themes, share counters, alignment, etc.', 'shareaholic')); ?></span>
27
-
28
- <?php foreach(array('post', 'page', 'index', 'category') as $page_type) { ?>
29
- <fieldset id='sharebuttons'>
30
- <legend><?php echo ucfirst($page_type) ?></legend>
31
- <?php foreach(array('above', 'below') as $position) { ?>
32
- <?php if (isset($settings['location_name_ids']['share_buttons']["{$page_type}_{$position}_content"])) { ?>
33
- <?php $location_id = $settings['location_name_ids']['share_buttons']["{$page_type}_{$position}_content"] ?>
34
- <?php } else { $location_id = ''; } ?>
35
- <div>
36
- <input type="checkbox" id="share_buttons_<?php echo "{$page_type}_{$position}_content" ?>" name="share_buttons[<?php echo "{$page_type}_{$position}_content" ?>]" class="check"
37
- <?php if (isset($share_buttons["{$page_type}_{$position}_content"])) { ?>
38
- <?php echo ($share_buttons["{$page_type}_{$position}_content"] == 'on' ? 'checked' : '') ?>
39
- <?php } ?>>
40
- <label for="share_buttons_<?php echo "{$page_type}_{$position}_content" ?>"><?php echo ucfirst($position) ?> Content</label>
41
- <button data-app='share_buttons'
42
- data-location_id='<?php echo $location_id ?>'
43
- data-href='share_buttons/locations/{{id}}/edit'
44
- class="btn btn-success">
45
- <?php _e('Customize', 'shareaholic'); ?></button>
46
- </div>
47
- <?php } ?>
48
- </fieldset>
49
- <?php } ?>
50
- </fieldset>
51
-
52
- <div class='clear'></div>
53
-
54
- <fieldset class="app"><legend><h2><img src="<?php echo SHAREAHOLIC_ASSET_DIR; ?>img/related_content@2x.png" height=32 width=32 /> <?php echo sprintf(__('Related Content / Recommendations', 'shareaholic')); ?></h2></legend>
55
  <span class="helper"><i class="icon-star"></i> <?php echo sprintf(__('Pick where you want Related Content to be displayed. Click "Customize" to customize look & feel, themes, block lists, etc.', 'shareaholic')); ?></span>
56
  <?php foreach(array('post', 'page', 'index', 'category') as $page_type) { ?>
57
  <?php foreach(array('below') as $position) { ?>
@@ -69,30 +40,64 @@ window.verification_key = '<?php echo $settings['verification_key'] ?>'
69
  <button data-app='recommendations'
70
  data-location_id='<?php echo $location_id ?>'
71
  data-href="recommendations/locations/{{id}}/edit"
72
- class="btn btn-success">
73
  <?php _e('Customize', 'shareaholic'); ?></button>
74
  </div>
75
  <?php } ?>
76
  </fieldset>
77
  <?php } ?>
78
 
79
- <div class='clear'></div>
80
-
81
- <strong><?php echo sprintf(__('Related Content:', 'shareaholic')); ?></strong>
82
- <?php
83
- $status = ShareaholicUtilities::recommendations_status_check();
84
- if ($status == "processing" || $status == 'unknown'){
85
- echo '<img class="shrsb_health_icon" align="top" src="'.SHAREAHOLIC_ASSET_DIR.'img/circle_yellow.png" />'. sprintf(__('Processing', 'shareaholic'));
86
- } else {
87
- echo '<img class="shrsb_health_icon" align="top" src="'.SHAREAHOLIC_ASSET_DIR.'img/circle_green.png" />'. sprintf(__('Ready', 'shareaholic'));
88
- }
89
- ?>
 
 
 
 
 
 
 
 
90
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
91
  </fieldset>
92
  </div>
93
 
94
- <div class='clear'></div>
95
- <div class="row" style="padding-top:20px; padding-bottom:35px;">
96
  <div class="span2"><input type='submit' onclick="this.value='<?php echo sprintf(__('Saving Changes...', 'shareaholic')); ?>';" value='<?php echo sprintf(__('Save Changes', 'shareaholic')); ?>'></div>
97
  </div>
98
  </form>
22
  <fieldset class="app" style="line-height:18px;"><?php echo sprintf(__('First time here? Read %sUnderstanding the new Shareaholic for WordPress interface and configuration settings.%s', 'shareaholic'), '<a href="https://blog.shareaholic.com/understanding-the-new-shareaholic-for-wordpress-interface-and-configuration-settings/" target="_blank">','</a>'); ?> <?php echo sprintf(__('If you are upgrading from an earlier version of Shareaholic for WordPress and need help, have a question or have a bug to report, please %slet us know%s.', 'shareaholic'), '<a href="#" onclick="SnapEngage.startLink();">','</a>'); ?>
23
  </fieldset>
24
 
25
+ <fieldset class="app"><legend><h2><i class="icon icon-recommendations"></i><?php echo sprintf(__('Related Content', 'shareaholic')); ?></h2></legend>
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
26
  <span class="helper"><i class="icon-star"></i> <?php echo sprintf(__('Pick where you want Related Content to be displayed. Click "Customize" to customize look & feel, themes, block lists, etc.', 'shareaholic')); ?></span>
27
  <?php foreach(array('post', 'page', 'index', 'category') as $page_type) { ?>
28
  <?php foreach(array('below') as $position) { ?>
40
  <button data-app='recommendations'
41
  data-location_id='<?php echo $location_id ?>'
42
  data-href="recommendations/locations/{{id}}/edit"
43
+ class="mll btn btn-success">
44
  <?php _e('Customize', 'shareaholic'); ?></button>
45
  </div>
46
  <?php } ?>
47
  </fieldset>
48
  <?php } ?>
49
 
50
+ <div class='fieldset-footer'>
51
+ <span class="helper_secondary"><i class="icon-star"></i> Re-crawl your content, exclude certain pages from being recommended, etc.</span>
52
+ <button class='app_wide_settings btn' data-href='recommendations/edit'><?php _e('Edit Related Content Settings', 'shareaholic'); ?></button>
53
+ <div class='app-status'>
54
+ &nbsp;&nbsp;&nbsp;&nbsp;<strong><?php echo sprintf(__('Status:', 'shareaholic')); ?></strong>
55
+ <?php
56
+ $status = ShareaholicUtilities::recommendations_status_check();
57
+ if ($status == "processing" || $status == 'unknown'){
58
+ echo '<img class="shrsb_health_icon" align="top" src="'.SHAREAHOLIC_ASSET_DIR.'img/circle_yellow.png" />'. sprintf(__('Processing', 'shareaholic'));
59
+ } else {
60
+ echo '<img class="shrsb_health_icon" align="top" src="'.SHAREAHOLIC_ASSET_DIR.'img/circle_green.png" />'. sprintf(__('Ready', 'shareaholic'));
61
+ }
62
+ ?>
63
+ </div>
64
+ </div>
65
+ </fieldset>
66
+
67
+ <fieldset class="app"><legend><h2><i class="icon icon-share_buttons"></i><?php echo sprintf(__('Share Buttons', 'shareaholic')); ?></h2></legend>
68
+ <span class="helper"><i class="icon-star"></i> <?php echo sprintf(__('Pick where you want your buttons to be displayed. Click "Customize" to customize look & feel, themes, share counters, alignment, etc.', 'shareaholic')); ?></span>
69
 
70
+ <?php foreach(array('post', 'page', 'index', 'category') as $page_type) { ?>
71
+ <fieldset id='sharebuttons'>
72
+ <legend><?php echo ucfirst($page_type) ?></legend>
73
+ <?php foreach(array('above', 'below') as $position) { ?>
74
+ <?php if (isset($settings['location_name_ids']['share_buttons']["{$page_type}_{$position}_content"])) { ?>
75
+ <?php $location_id = $settings['location_name_ids']['share_buttons']["{$page_type}_{$position}_content"] ?>
76
+ <?php } else { $location_id = ''; } ?>
77
+ <div>
78
+ <input type="checkbox" id="share_buttons_<?php echo "{$page_type}_{$position}_content" ?>" name="share_buttons[<?php echo "{$page_type}_{$position}_content" ?>]" class="check"
79
+ <?php if (isset($share_buttons["{$page_type}_{$position}_content"])) { ?>
80
+ <?php echo ($share_buttons["{$page_type}_{$position}_content"] == 'on' ? 'checked' : '') ?>
81
+ <?php } ?>>
82
+ <label for="share_buttons_<?php echo "{$page_type}_{$position}_content" ?>"><?php echo ucfirst($position) ?> Content</label>
83
+ <button data-app='share_buttons'
84
+ data-location_id='<?php echo $location_id ?>'
85
+ data-href='share_buttons/locations/{{id}}/edit'
86
+ class="mll btn btn-success">
87
+ <?php _e('Customize', 'shareaholic'); ?></button>
88
+ </div>
89
+ <?php } ?>
90
+ </fieldset>
91
+ <?php } ?>
92
+
93
+ <div class='fieldset-footer'>
94
+ <span class="helper_secondary"><i class="icon-star"></i> Brand your shares with your @Twitterhandle, pick your favorite URL shortener, share buttons for images, etc.</span>
95
+ <button class='app_wide_settings btn' data-href='share_buttons/edit'><?php _e('Edit Share Button Settings', 'shareaholic'); ?></button>
96
+ </div>
97
  </fieldset>
98
  </div>
99
 
100
+ <div class="row" style="padding-top:20px; padding-bottom:35px; clear:both;">
 
101
  <div class="span2"><input type='submit' onclick="this.value='<?php echo sprintf(__('Saving Changes...', 'shareaholic')); ?>';" value='<?php echo sprintf(__('Save Changes', 'shareaholic')); ?>'></div>
102
  </div>
103
  </form>
templates/why_to_sign_up.php CHANGED
@@ -1,11 +1,10 @@
1
  <div class="signuppromo unit size1of5">
2
  <p class="promoh1"><?php echo sprintf(__('Sign up for a FREE Shareaholic account to unlock more features.', 'shareaholic')); ?></p>
3
  <ul>
4
- <li><?php echo sprintf(__('Brand your social shares with your @Twitterhandle', 'shareaholic')); ?></li>
5
- <li><?php echo sprintf(__('Pick your favorite URL shortener, including support for branded bitly short links.', 'shareaholic')); ?></li>
6
  <li><?php echo sprintf(__('Monetize your site, plus lots more!', 'shareaholic')); ?></li>
7
  </ul>
8
- <button data-href='edit' id='general_settings' class="btn btn-large btn-success"><?php echo sprintf(__('Edit General Website Settings', 'shareaholic')); ?></button>
9
 
10
  <p class="signuppromo_note"><?php echo sprintf(__("Click the button above to sign up or log in to your free Shareaholic account. It takes just seconds to sign up and it's free!", 'shareaholic')); ?></p>
11
  </div>
1
  <div class="signuppromo unit size1of5">
2
  <p class="promoh1"><?php echo sprintf(__('Sign up for a FREE Shareaholic account to unlock more features.', 'shareaholic')); ?></p>
3
  <ul>
4
+ <li><?php echo sprintf(__('Get the Floated Share Buttons app', 'shareaholic')); ?></li>
 
5
  <li><?php echo sprintf(__('Monetize your site, plus lots more!', 'shareaholic')); ?></li>
6
  </ul>
7
+ <button data-href='edit' id='general_settings' class="btn btn-large btn-success"><?php echo sprintf(__('Unlock more features, for free', 'shareaholic')); ?></button>
8
 
9
  <p class="signuppromo_note"><?php echo sprintf(__("Click the button above to sign up or log in to your free Shareaholic account. It takes just seconds to sign up and it's free!", 'shareaholic')); ?></p>
10
  </div>
utilities.php CHANGED
@@ -134,7 +134,15 @@ class ShareaholicUtilities {
134
  'parent' => 'wp_shareaholic_adminbar_menu',
135
  'id' => 'wp_shareaholic_adminbar_submenu-general',
136
  'title' => __('General Settings', 'shareaholic'),
137
- 'href' => 'https://shareaholic.com/publisher_tools/'.self::get_option('api_key').'/edit?verification_key='.self::get_option('verification_key'),
 
 
 
 
 
 
 
 
138
  'meta' => Array( 'target' => '_blank' )
139
  ));
140
  }
@@ -1133,7 +1141,7 @@ class ShareaholicUtilities {
1133
  */
1134
  public static function recommendations_status_check() {
1135
  if (self::get_option('api_key') != NULL){
1136
- $recommendations_url = Shareaholic::REC_API_URL . "/v3/recommend?url=" . urlencode(get_bloginfo('url')) . "&internal=6&sponsored=3&apiKey=" . self::get_option('api_key');
1137
  $cache_key = 'recommendations_status_check-' . md5( $recommendations_url );
1138
 
1139
  $response = get_transient($cache_key);
@@ -1145,8 +1153,8 @@ class ShareaholicUtilities {
1145
  }
1146
 
1147
  if(is_array($response) && array_key_exists('response', $response)) {
1148
- $body = $response['response'];
1149
- if (is_array($body) && $body['code'] == 200) {
1150
  return "ready";
1151
  } else {
1152
  return "processing";
134
  'parent' => 'wp_shareaholic_adminbar_menu',
135
  'id' => 'wp_shareaholic_adminbar_submenu-general',
136
  'title' => __('General Settings', 'shareaholic'),
137
+ 'href' => 'https://shareaholic.com/publisher_tools/'.self::get_option('api_key').'/websites/edit?verification_key='.self::get_option('verification_key'),
138
+ 'meta' => Array( 'target' => '_blank' )
139
+ ));
140
+
141
+ $wp_admin_bar->add_menu(array(
142
+ 'parent' => 'wp_shareaholic_adminbar_menu',
143
+ 'id' => 'wp_shareaholic_adminbar_submenu-help',
144
+ 'title' => __('FAQ & Support', 'shareaholic'),
145
+ 'href' => 'http://support.shareaholic.com/',
146
  'meta' => Array( 'target' => '_blank' )
147
  ));
148
  }
1141
  */
1142
  public static function recommendations_status_check() {
1143
  if (self::get_option('api_key') != NULL){
1144
+ $recommendations_url = Shareaholic::REC_API_URL . "/v4/recommend?url=" . urlencode(get_bloginfo('url')) . "&internal=6&sponsored=0&api_key=" . self::get_option('api_key');
1145
  $cache_key = 'recommendations_status_check-' . md5( $recommendations_url );
1146
 
1147
  $response = get_transient($cache_key);
1153
  }
1154
 
1155
  if(is_array($response) && array_key_exists('response', $response)) {
1156
+ $body = $response['body'];
1157
+ if (is_array($body) && array_key_exists('internal', $body) && !empty($body['internal'])) {
1158
  return "ready";
1159
  } else {
1160
  return "processing";