Some minor styling changes.

Add album_name as parameter for notifications.
This commit is contained in:
Tim 2015-07-29 01:06:21 +02:00
parent 5f203bb837
commit d750c5f610
4 changed files with 143 additions and 146 deletions

View file

@ -3,10 +3,9 @@
<h3>Import PlexWatch Database</h3>
</div>
<div class="modal-body" id="modal-text">
<div class="card-back">
<div class="form-group">
<label for="db_location">Database Location</label>
<input type="text" id="db_location" name="db_location" value="" size="30" required>
<input type="text" class="input-xlarge" id="db_location" name="db_location" value="" required>
<p class="help-block">Enter the path and file name for the PlexWatch database you wish to import.</p>
</div>
<div class="form-group">
@ -19,10 +18,9 @@
</div>
<div class="form-group">
<label for="import_ignore_interval">Ignore Interval</label>
<input type="text" id="import_ignore_interval" name="import_ignore_interval" value="120" size="30" required>
<input type="text" class="input-mini" id="import_ignore_interval" name="import_ignore_interval" value="120" required>
<p class="help-block">Enter the minimum duration (in seconds) an item must have been active for. Set to 0 to import all.</p>
</div>
</div>
</div>
<div class="modal-footer">
<div>

View file

@ -407,118 +407,116 @@
<h3 id="myModalLabel">Date &amp; Time Format Options</h3>
</div>
<div class="modal-body">
<div class="card-back">
<table>
<tbody>
<tr>
<td colspan="3"><h5>Day</h5></td>
<td align="center" colspan="3"><h5>Day</h5></td>
</tr>
<tr>
<td align="center"><strong>DD</strong></td>
<td width="100"><strong>DD</strong></td>
<td width="300">Numeric, with leading zeros</td>
<td>01 to 31</td>
</tr>
<tr>
<td align="center"><strong>D</strong></td>
<td><strong>D</strong></td>
<td>Numeric, without leading zeros</td>
<td>1 to 31</td>
</tr>
<tr>
<td align="center"><strong>Do</strong></td>
<td><strong>Do</strong></td>
<td>The English suffix for the day of the month</td>
<td>st, nd or th in the 1st, 2nd or 15th.</td>
</tr>
<tr>
<td colspan="3"><h5>Month</h5></td>
<td align="center" colspan="3"><h5>Month</h5></td>
</tr>
<tr>
<td align="center"><strong>MM</strong></td>
<td><strong>MM</strong></td>
<td>Numeric, with leading zeros</td>
<td>01 to 31</td>
</tr>
<tr>
<td align="center"><strong>M</strong></td>
<td><strong>M</strong></td>
<td>Numeric, without leading zeros</td>
<td>1 to 31</td>
</tr>
<tr>
<td align="center"><strong>MMMM</strong></td>
<td><strong>MMMM</strong></td>
<td>Textual full</td>
<td>January to December</td>
</tr>
<tr>
<td align="center"><strong>MMM</strong></td>
<td><strong>MMM</strong></td>
<td>Textual three letters</td>
<td>Jan to Dec</td>
</tr>
<tr>
<td colspan="3"><h5>Year</h5></td>
<td align="center" colspan="3"><h5>Year</h5></td>
</tr>
<tr>
<td align="center"><strong>YYYY</strong></td>
<td><strong>YYYY</strong></td>
<td>Numeric, 4 digits</td>
<td>Eg., 1999, 2003</td>
</tr>
<tr>
<td align="center"><strong>YY</strong></td>
<td><strong>YY</strong></td>
<td>Numeric, 2 digits</td>
<td>Eg., 99, 03</td>
</tr>
<tr>
<td colspan="3"><h5>Time</h5></td>
<td align="center" colspan="3"><h5>Time</h5></td>
</tr>
<tr>
<td align="center"><strong>a</strong></td>
<td><strong>a</strong></td>
<td width="300">am/pm Lowercase</td>
<td>am, pm</td>
</tr>
<tr>
<td align="center"><strong>A</strong></td>
<td><strong>A</strong></td>
<td>AM/PM Uppercase</td>
<td>AM, PM</td>
</tr>
<tr>
<td align="center"><strong>h</strong></td>
<td><strong>h</strong></td>
<td>Hour, 12-hour, without leading zeros</td>
<td>1-12</td>
</tr>
<tr>
<td align="center"><strong>hh</strong></td>
<td><strong>hh</strong></td>
<td>Hour, 12-hour, with leading zeros</td>
<td>01-12</td>
</tr>
<tr>
<td align="center"><strong>H</strong></td>
<td><strong>H</strong></td>
<td>Hour, 24-hour, without leading zeros</td>
<td>0-23</td>
</tr>
<tr>
<td align="center"><strong>HH</strong></td>
<td><strong>HH</strong></td>
<td>Hour, 24-hour, with leading zeros</td>
<td>00-23</td>
</tr>
<tr>
<td align="center"><strong>mm</strong></td>
<td><strong>mm</strong></td>
<td>Minutes, with leading zeros</td>
<td>00-59</td>
</tr>
<tr>
<td align="center"><strong>ss</strong></td>
<td><strong>ss</strong></td>
<td>Seconds, with leading zeros</td>
<td>00-59</td>
</tr>
<tr>
<td align="center"><strong>zz</strong></td>
<td><strong>zz</strong></td>
<td>Timezone abbreviation</td>
<td>Eg., EST, MDT ...</td>
</tr>
</tbody>
</table>
</div>
</div>
<div class="modal-footer"></div>
</div>
<div id="pms-auth-modal" class="modal hide fade" tabindex="-1" role="dialog"
@ -530,7 +528,6 @@
</div>
<div class="modal-body" id="modal-text">
<div>
<div class="card-back">
<span>
This will attempt to fetch your token for you. This will not work on Internet Explorer 9 or lower.
PlexPy does not store your username and password.
@ -548,7 +545,6 @@
</div>
</div>
</div>
</div>
<div class="modal-footer">
<div class="">
<input type="button" id="get-pms-auth-token" class="squared squared-primary" value="Fetch Token">
@ -604,6 +600,10 @@
<td width="150"><strong>{episode_name}</strong></td>
<td>The title of the episode being played back.</td>
</tr>
<tr>
<td width="150"><strong>{album_name}</strong></td>
<td>The title of the album being played back if item is track.</td>
</tr>
<tr>
<td width="150"><strong>{transcode_decision}</strong></td>
<td>The transcode decisions for the media item.</td>

View file

@ -27,11 +27,9 @@ _CONFIG_DEFINITIONS = {
'PMS_IS_REMOTE': (int, 'PMS', 0),
'PMS_LOGS_FOLDER': (str, 'PMS', ''),
'PMS_PORT': (int, 'PMS', 32400),
'PMS_PASSWORD': (str, 'PMS', ''),
'PMS_TOKEN': (str, 'PMS', ''),
'PMS_SSL': (int, 'General', 0),
'PMS_URL': (str, 'PMS', ''),
'PMS_USERNAME': (str, 'PMS', ''),
'PMS_USE_BIF': (int, 'PMS', 0),
'PMS_UUID': (str, 'PMS', ''),
'TIME_FORMAT': (str, 'General', 'HH:mm'),

View file

@ -261,6 +261,7 @@ def build_notify_text(session, state):
'summary': item_metadata['summary'],
'season_num': item_metadata['parent_index'],
'episode_num': item_metadata['index'],
'album_name': item_metadata['parent_title'],
'rating': item_metadata['rating'],
'duration': duration,
'progress': view_offset,