cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-17 19:08:18 -07:00
Code Issues Packages Projects Releases Wiki Activity

rework upnp discovery

Browse Source
This commit is contained in:
Luke Pulverenti 2016-09-11 03:33:53 -04:00
parent 3e990981fe
commit 9b12ffa6d7
12 changed files with 25 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dashboard-ui/autoorganizetv.html
View File

@ -6,7 +6,6 @@
<p>${AutoOrganizeHelp}</p>
<p>${AutoOrganizeTvHelp}</p>
<div>
<label class="checkboxContainer">
<input type="checkbox" is="emby-checkbox" id="chkEnableTvSorting" />
@ -35,8 +34,6 @@
<div class="fieldDescription"></div>
</div>
<br />
<div is="emby-collapse" title="${HeaderEpisodeFilePattern}">
<div class="collapseContent">
<br />

8
dashboard-ui/bower_components/emby-webcomponents/.bower.json vendored
View File

@ -14,12 +14,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.4.236",
"_release": "1.4.236",
"version": "1.4.237",
"_release": "1.4.237",
"_resolution": {
"type": "version",
"tag": "1.4.236",
"commit": "d369818012719cb7fd38b052073428631937ae6f"
"tag": "1.4.237",
"commit": "41b1a7ea6d039a5e431ceb1295f7e50ba2e54c2c"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.1",

6
dashboard-ui/bower_components/emby-webcomponents/inputmanager.js vendored
View File

@ -153,6 +153,12 @@ define(['playbackManager', 'focusManager', 'embyRouter', 'dom'], function (playb
case 'togglemute':
playbackManager.toggleMute();
break;
case 'channelup':
playbackManager.nextTrack();
break;
case 'channeldown':
playbackManager.previousTrack();
break;
case 'volumedown':
playbackManager.volumeDown();
break;

2
dashboard-ui/bower_components/emby-webcomponents/metadataeditor/personeditor.js vendored
View File

@ -20,7 +20,7 @@
if (layoutManager.tv) {
dialogOptions.size = 'fullscreen';
} else {
dialogOptions.size = 'medium';
dialogOptions.size = 'medium-tall';
}
var dlg = dialogHelper.createDialog(dialogOptions);

8
dashboard-ui/bower_components/polymer/.bower.json vendored
View File

@ -32,14 +32,14 @@
"iron-component-page": "polymerElements/iron-component-page#^1.1.6"
},
"private": true,
"homepage": "https://github.com/Polymer/polymer",
"homepage": "https://github.com/polymer/polymer",
"_release": "1.6.1",
"_resolution": {
"type": "version",
"tag": "v1.6.1",
"commit": "1f197d9d7874b1e5808b2a5c26f34446a7d912fc"
},
"_source": "git://github.com/Polymer/polymer.git",
"_target": "^1.2.0",
"_originalSource": "Polymer/polymer"
"_source": "git://github.com/polymer/polymer.git",
"_target": "^1.1.0",
"_originalSource": "polymer/polymer"
}

7
dashboard-ui/components/guestinviter/guestinviter.js
View File

@ -1,10 +1,10 @@
define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'paper-checkbox', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, $) {
define(['dialogHelper', 'jQuery', 'emby-input', 'emby-button', 'emby-collapse', 'emby-checkbox', 'paper-icon-button-light', 'formDialogStyle'], function (dialogHelper, $) {
function renderLibrarySharingList(context, result) {
var folderHtml = '';
folderHtml += '<div class="paperCheckboxList">';
folderHtml += '<div class="checkboxList">';
folderHtml += result.Items.map(function (i) {
@ -13,8 +13,7 @@
var isChecked = true;
var checkedHtml = isChecked ? ' checked="checked"' : '';
currentHtml += '<paper-checkbox class="chkShareFolder" data-folderid="' + i.Id + '" type="checkbox"' + checkedHtml + '>' + i.Name + '</paper-checkbox>';
currentHtml += '<label><input is="emby-checkbox" class="chkShareFolder" type="checkbox" data-folderid="' + i.Id + '"' + checkedHtml + '/><span>' + i.Name + '</span></label>';
return currentHtml;
}).join('');

6
dashboard-ui/connectlogin.html
View File

@ -61,11 +61,11 @@
</div>
<br />
<button is="emby-button" type="submit" class="raised accent block">
<button is="emby-button" type="submit" class="raised button-submit block">
<i class="md-icon">check</i>
<span>${ButtonConnect}</span>
</button>
<button is="emby-button" type="button" class="raised cancel block btnCancelManualServer">
<button is="emby-button" type="button" class="raised button-cancel block btnCancelManualServer">
<i class="md-icon">close</i>
<span>${ButtonCancel}</span>
</button>
@ -98,7 +98,7 @@
<button is="emby-button" type="submit" class="raised button-accent block">
<span>${ButtonSignUp}</span>
</button>
<button is="emby-button" type="button" class="raised cancel block btnCancelSignup">
<button is="emby-button" type="button" class="raised button-cancel block btnCancelSignup">
<span>${ButtonCancel}</span>
</button>
</form>

25
dashboard-ui/css/dashboard.css
View File

@ -146,26 +146,6 @@
}
}
paper-checkbox #checkboxContainer {
width: 22px !important;
height: 22px !important;
}
paper-checkbox paper-ripple {
top: -13px !important;
left: -13px !important;
}
paper-checkbox #checkmark {
border-right-width: 4px !important;
border-bottom-width: 4px !important;
}
.paperCheckboxList paper-checkbox {
display: block;
padding: .5em 0;
}
.paperListLabel {
font-size: 16px;
margin-bottom: .5em;
@ -175,11 +155,6 @@ paper-checkbox #checkmark {
font-family: monospace !important;
}
.ui-body-a paper-checkbox #checkbox.checked.paper-checkbox {
background-color: #52B54B;
border-color: #52B54B;
}
.paperList {
padding: .5em 0;
margin: 12px auto;

4
dashboard-ui/notificationsettings.html
View File

@ -4,10 +4,8 @@
<div class="content-primary">
<div class="readOnlyContent">
<p>${HeaderNotificationList}</p>
<p>${HeaderSendNotificationHelp}</p>
<div class="notificationList" style="margin-top: 2em;">
<div class="notificationList">
</div>
</div>

2
dashboard-ui/scripts/myprofile.js
View File

@ -19,6 +19,7 @@
var imageUrl;
var fldImage = page.querySelector('#fldImage');
if (user.PrimaryImageTag) {
imageUrl = ApiClient.getUserImageUrl(user.Id, {
@ -31,7 +32,6 @@
imageUrl = "css/images/logindefault.png";
}
var fldImage = page.querySelector('#fldImage');
fldImage.classList.remove('hide');
fldImage.innerHTML = "<img width='140px' src='" + imageUrl + "' />";

2
dashboard-ui/selectserver.html
View File

@ -7,7 +7,7 @@
<div style="margin:1em 0 .5em;padding-left:5px;">
<h1 style="display:inline-block;vertical-align:middle;margin: 0;">${HeaderSelectServer}</h1>
<a href="https://github.com/MediaBrowser/Wiki/wiki/Emby%20Connect" target="_blank" class="clearLink" style="margin-top: 0; display: inline-block; vertical-align: middle; margin-left: 1em;">
<button is="emby-button" type="button" class="raised secondary mini">
<button is="emby-button" type="button" class="raised button-accent mini">
<i class="md-icon">info</i>
<span>${ButtonHelp}</span>
</button>

2
dashboard-ui/thirdparty/paper-button-style.css vendored
View File

@ -92,7 +92,7 @@ div.dialogHeader {
}
.ui-body-a div.formDialogFooter {
background-color: #fff;
background-color: #f0f0f0;
border-top: 1px solid #ddd;
color: inherit;
}