Remove experimental from Facebook and Scripts

This commit is contained in:
JonnyWong16 2016-03-19 20:45:49 -07:00
commit c45a488962
2 changed files with 13 additions and 14 deletions

View file

@ -1110,12 +1110,12 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<tr>
<td><strong>YYYY</strong></td>
<td>Numeric, four digits</td>
<td>Eg., 1999, 2003</td>
<td>E.g. 1999, 2003</td>
</tr>
<tr>
<td><strong>YY</strong></td>
<td>Numeric, two digits</td>
<td>Eg., 99, 03</td>
<td>E.g. 99, 03</td>
</tr>
</tbody>
</table>
@ -1193,7 +1193,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<tr>
<td><strong>Do</strong></td>
<td>Numeric, with suffix</td>
<td>Eg., 1st, 2nd ... 31st.</td>
<td>E.g. 1st, 2nd ... 31st.</td>
</tr>
</tbody>
</table>
@ -1329,12 +1329,12 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<tr>
<td><strong>ZZ</strong></td>
<td>UTC offset</td>
<td>Eg., +0100, -0700</td>
<td>E.g. +0100, -0700</td>
</tr>
<tr>
<td><strong>Z</strong></td>
<td>UTC offset</td>
<td>Eg., +01:00, -07:00</td>
<td>E.g. +01:00, -07:00</td>
</tr>
</tbody>
</table>
@ -1350,7 +1350,7 @@ available_notification_agents = sorted(notifiers.available_notification_agents()
<tr>
<td><strong>X</strong></td>
<td>Unix timestamp</td>
<td>Eg., 1456887825</td>
<td>E.g. 1456887825</td>
</tr>
</tbody>
</table>

View file

@ -2006,12 +2006,11 @@ class Scripts(object):
logger.error(u"PlexPy Notifiers :: Failed to run script: %s" % e)
def return_config_options(self):
config_option = [{'label': 'Warning',
'description': '<strong>Script notifications are currently experimental!</strong><br><br>\
Supported file types: ' + ', '.join(self.script_exts),
config_option = [{'label': 'Supported File Types',
'description': ', '.join(self.script_exts),
'input_type': 'help'
},
{'label': 'Script folder',
{'label': 'Script Folder',
'value': plexpy.CONFIG.SCRIPTS_FOLDER,
'name': 'scripts_folder',
'description': 'Add your script folder.',
@ -2253,13 +2252,12 @@ class FacebookNotifier(object):
def return_config_options(self):
config_option = [{'label': 'Instructions',
'description': '<strong>Facebook notifications are currently experimental!</strong><br><br> \
Step 1: Visit <a href="' + helpers.anon_url('https://developers.facebook.com/apps') + '" target="_blank"> \
'description': 'Step 1: Visit <a href="' + helpers.anon_url('https://developers.facebook.com/apps') + '" target="_blank"> \
Facebook Developers</a> to add a new app using <strong>basic setup</strong>.<br>\
Step 2: Go to <strong>Settings > Basic</strong> and fill in a \
<strong>Contact Email</strong>.<br>\
Step 3: Go to <strong>Settings > Advanced</strong> and fill in \
<strong>Valid OAuth redirect URIs</strong> with your PlexPy URL (i.e. http://localhost:8181).<br>\
<strong>Valid OAuth redirect URIs</strong> with your PlexPy URL (e.g. http://localhost:8181).<br>\
Step 4: Go to <strong>App Review</strong> and toggle public to <strong>Yes</strong>.<br>\
Step 5: Fill in the <strong>PlexPy URL</strong> below with the exact same URL from Step 3.<br>\
Step 6: Fill in the <strong>App ID</strong> and <strong>App Secret</strong> below.<br>\
@ -2270,7 +2268,8 @@ class FacebookNotifier(object):
{'label': 'PlexPy URL',
'value': self.redirect_uri,
'name': 'facebook_redirect_uri',
'description': 'Your PlexPy URL. This will tell Facebook where to redirect you after authorization.',
'description': 'Your PlexPy URL. This will tell Facebook where to redirect you after authorization.\
(e.g. http://localhost:8181)',
'input_type': 'text'
},
{'label': 'Facebook App ID',