mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

update icons

Browse source
This commit is contained in:
Luke Pulverenti 2016-02-13 02:19:49 -05:00
parent c80bf053e1
commit 14b19bb60f
10 changed files with 25 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

2
dashboard-ui/components/itemidentifier/itemidentifier.template.html
View file

@ -1,5 +1,5 @@
<div class="dialogHeader"> <div class="dialogHeader">
<paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button> <paper-icon-button icon="arrow-back" class="btnCancel" tabindex="-1"></paper-icon-button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
</div> </div>
</div> </div>

2
dashboard-ui/components/metadataeditor/metadataeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="dialogHeader"> <div class="dialogHeader">
<paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button> <paper-icon-button icon="arrow-back" class="btnCancel" tabindex="-1"></paper-icon-button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
${ButtonEdit} ${ButtonEdit}
</div> </div>

2
dashboard-ui/components/metadataeditor/personeditor.template.html
View file

@ -1,5 +1,5 @@
<div class="dialogHeader"> <div class="dialogHeader">
<paper-icon-button icon="close" class="btnCancel" tabindex="-1"></paper-icon-button> <paper-icon-button icon="arrow-back" class="btnCancel" tabindex="-1"></paper-icon-button>
<div class="dialogHeaderTitle"> <div class="dialogHeaderTitle">
${ButtonEdit} ${ButtonEdit}
</div> </div>

6
dashboard-ui/components/recordingcreator/recordingcreator.js
View file

@ -227,6 +227,12 @@
} }
} }
if (AppInfo.enableSupporterMembership) {
context.querySelector('.btnSupporterForConverting a').href = 'https://emby.media/premiere';
} else {
context.querySelector('.btnSupporterForConverting a').href = '#';
}
ApiClient.getNamedConfiguration("livetv").then(function (config) { ApiClient.getNamedConfiguration("livetv").then(function (config) {
$('#chkConvertRecordings', context).checked(config.EnableRecordingEncoding); $('#chkConvertRecordings', context).checked(config.EnableRecordingEncoding);

7
dashboard-ui/components/recordingcreator/recordingcreator.template.html
View file

@ -49,7 +49,7 @@
<br /> <br />
<paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox> <paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox>
<div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div> <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div>
<div class="fieldDescription paperCheckboxFieldDescription hide btnSupporter"><a href="http://emby.media/premiere" target="_blank">${ButtonLearnMore}</a></div> <div class="fieldDescription paperCheckboxFieldDescription btnSupporterForConverting"><a href="https://emby.media/premiere" target="_blank" class="accent">${FeatureRequiresEmbyPremiere}</a></div>
</div> </div>
<br /> <br />
<div class="advancedToggle hide"> <div class="advancedToggle hide">
@ -69,7 +69,10 @@
<a class="clearLink btnSupporter hide" href="http://emby.media/premiere" target="_blank"><paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button></a> <a class="clearLink btnSupporter hide" href="http://emby.media/premiere" target="_blank"><paper-button raised class="accent block"><iron-icon icon="check"></iron-icon><span>${HeaderBecomeProjectSupporter}</span></paper-button></a>
</div> </div>
<button type="submit" data-role="none" class="clearButton btnSubmitContainer"> <button type="submit" data-role="none" class="clearButton btnSubmitContainer">
<paper-button raised class="submit block" style="background:#cc3333;"><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button> <paper-button raised class="submit block" style="background:#cc3333;" autoFocus><iron-icon icon="videocam"></iron-icon><span>${ButtonRecord}</span></paper-button>
</button> </button>
</div> </div>
<br />
<br />
<br />
</form> </form>

4
dashboard-ui/css/site.css
View file

@ -641,6 +641,10 @@ h1 a:hover {
text-decoration: underline; text-decoration: underline;
} }
.ui-body-b a.accent {
color: #52B54B !important;
}
.ui-listview li h3 { .ui-listview li h3 {
font-weight: 400; font-weight: 400;
} }

2
dashboard-ui/livetvsettings.html
View file

@ -55,7 +55,7 @@
<div> <div>
<paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox> <paper-checkbox id="chkConvertRecordings">${OptionConvertRecordingsToStreamingFormat}</paper-checkbox>
<div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div> <div class="fieldDescription paperCheckboxFieldDescription">${OptionConvertRecordingsToStreamingFormatHelp}</div>
<div class="fieldDescription paperCheckboxFieldDescription"><a class="lnkSupporterLearnMore" href="http://emby.media/premiere" target="_blank" style="display:none;">${ButtonLearnMore}</a></div> <div class="fieldDescription paperCheckboxFieldDescription btnSupporterForConverting"><a href="https://emby.media/premiere" target="_blank" class="accent">${FeatureRequiresEmbyPremiere}</a></div>
</div> </div>
<br /> <br />
<br /> <br />

4
dashboard-ui/scripts/livetvsettings.js
View file

@ -81,9 +81,9 @@
}); });
if (AppInfo.enableSupporterMembership) { if (AppInfo.enableSupporterMembership) {
$('.lnkSupporterLearnMore', page).show(); page.querySelector('.btnSupporterForConverting a').href = 'https://emby.media/premiere';
} else { } else {
$('.lnkSupporterLearnMore', page).hide(); page.querySelector('.btnSupporterForConverting a').href = '#';
} }
}); });

3
dashboard-ui/strings/html/en-US.json
View file

@ -1535,5 +1535,6 @@
"LabelCodecIntrosPath": "Codec intros path:", "LabelCodecIntrosPath": "Codec intros path:",
"LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.", "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.",
"OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format", "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
"OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices. This feature requires an active Emby Premiere subscription." "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
"FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription."
} }

3
dashboard-ui/strings/html/server.json
View file

@ -1550,5 +1550,6 @@
"LabelCodecIntrosPath": "Codec intros path:", "LabelCodecIntrosPath": "Codec intros path:",
"LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.", "LabelCodecIntrosPathHelp": "A folder containing video files. If an intro video file name matches the video codec, audio codec, audio profile, or a tag, then it will be played prior to the main feature.",
"OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format", "OptionConvertRecordingsToStreamingFormat": "Automatically convert recordings to a streaming friendly format",
"OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices. This feature requires an active Emby Premiere subscription." "OptionConvertRecordingsToStreamingFormatHelp": "Recordings will be converted on the fly to MP4 for easy playback on your devices.",
"FeatureRequiresEmbyPremiere": "This feature requires an active Emby Premiere subscription."
} }