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

update tabs

Browse Source
This commit is contained in:
Luke Pulverenti 2016-04-14 12:30:37 -04:00
parent 7a3858d368
commit 49f8917315
20 changed files with 94 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,12 +16,12 @@
},
"devDependencies": {},
"ignore": [],
"version": "1.2.23",
"_release": "1.2.23",
"version": "1.2.25",
"_release": "1.2.25",
"_resolution": {
"type": "version",
"tag": "1.2.23",
"commit": "dd2ac882405ff68e910711e43704d1adfb3100d9"
"tag": "1.2.25",
"commit": "7d3165462b584cfe4e1a76dd0afd4bade40274f5"
},
"_source": "https://github.com/MediaBrowser/emby-webcomponents.git",
"_target": "^1.2.0",

8
dashboard-ui/bower_components/emby-webcomponents/actionsheet/actionsheet.js vendored
View File

@ -178,7 +178,7 @@
if (options.showCancel) {
html += '<div class="buttons">';
html += '<paper-button dialog-dismiss>' + dialogText.get('Cancel') + '</paper-button>';
html += '<paper-button class="btnCancel">' + dialogText.get('Cancel') + '</paper-button>';
html += '</div>';
}
html += '</div>';
@ -189,6 +189,12 @@
addCenterFocus(dlg);
}
if (options.showCancel) {
dlg.querySelector('.btnCancel').addEventListener('click', function () {
dialogHelper.close(dlg);
});
}
document.body.appendChild(dlg);
// Seeing an issue in some non-chrome browsers where this is requiring a double click

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

@ -1,4 +1,4 @@
define(['focusManager'], function (focusManager) {
define(['focusManager', 'scrollStyles'], function (focusManager) {
function getOffsets(elems) {

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

@ -1,6 +1,6 @@
{
"name": "iron-input",
"version": "1.0.9",
"version": "1.0.10",
"description": "An input element with data binding",
"authors": [
"The Polymer Authors"
@ -32,11 +32,11 @@
"web-component-tester": "^4.0.0",
"webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0"
},
"_release": "1.0.9",
"_release": "1.0.10",
"_resolution": {
"type": "version",
"tag": "v1.0.9",
"commit": "6565b5d1b5f7030eb05378718163def8e9c709b7"
"tag": "1.0.10",
"commit": "01d17407672ad8033ee447c9c7a65162f13c8f49"
},
"_source": "git://github.com/PolymerElements/iron-input.git",
"_target": "^1.0.0",

33
dashboard-ui/bower_components/iron-input/.github/ISSUE_TEMPLATE.md vendored Normal file
View File

@ -0,0 +1,33 @@
<!-- Instructions: https://github.com/PolymerElements/iron-input/CONTRIBUTING.md#filing-issues -->
### Description
<!-- Example: The `paper-foo` element causes the page to turn pink when clicked. -->
### Expected outcome
<!-- Example: The page stays the same color. -->
### Actual outcome
<!-- Example: The page turns pink. -->
### Live Demo
<!-- Example: https://jsbin.com/cagaye/edit?html,output -->
### Steps to reproduce
<!-- Example
1. Put a `paper-foo` element in the page.
2. Open the page in a web browser.
3. Click the `paper-foo` element.
-->
### Browsers Affected
<!-- Check all that apply -->
- [ ] Chrome
- [ ] Firefox
- [ ] Safari 9
- [ ] Safari 8
- [ ] Safari 7
- [ ] Edge
- [ ] IE 11
- [ ] IE 10

6
dashboard-ui/bower_components/iron-input/.travis.yml vendored
View File

@ -1,5 +1,5 @@
language: node_js
sudo: false
sudo: required
before_script:
- npm install -g bower polylint web-component-tester
- bower install
@ -8,18 +8,16 @@ env:
global:
- secure: AnFRDBxxASn2RP4u+CHJS04g2klVTM+YL1fgNfkNIiECChymGRkeBiF7zvWPfodqPGKWhBZPAMxVuFKbztawQ95kWlbPSTNJtWhHhPcRarV5AYvjhyUV372E3REZ4CGt+T8nghD9bdJiMX5x0pXAz+wfBPPpiHwbiSPPjFLFvTs=
- secure: SvsE+VQL35CZ967ZVy0+7o5xclnBM8egjhsjNRG7WxVPZQboCQ3Xwm8tIDQSWeagM3ZQRkTGca4ta91F1ZEhm4Jdt5CwKhhSNC6JgS3CX819r9UKgUnSS3nvWdqcZq4GXcMoOZm4qE9ttd3xdoKCfkLRQlEGAvM2TEw69mBhj24=
- CXX=g++-4.8
node_js: stable
addons:
firefox: latest
apt:
sources:
- google-chrome
- ubuntu-toolchain-r-test
packages:
- google-chrome-stable
- g++-4.8
sauce_connect: true
script:
- xvfb-run wct
- "if [ \"${TRAVIS_PULL_REQUEST}\" = \"false\" ]; then wct -s 'default'; fi"
dist: trusty

2
dashboard-ui/bower_components/iron-input/bower.json vendored
View File

@ -1,6 +1,6 @@
{
"name": "iron-input",
"version": "1.0.9",
"version": "1.0.10",
"description": "An input element with data binding",
"authors": [
"The Polymer Authors"

1
dashboard-ui/bower_components/iron-input/iron-input.html vendored
View File

@ -108,6 +108,7 @@ is separate from validation, and `allowed-pattern` does not affect how the input
'keypress': '_onKeypress'
},
/** @suppress {checkTypes} */
registered: function() {
// Feature detect whether we need to patch dispatchEvent (i.e. on FF and IE).
if (!this._canDispatchEventOnDisabled()) {

1
dashboard-ui/bower_components/iron-input/test/index.html vendored
View File

@ -1,4 +1,5 @@
<!DOCTYPE html><!--
@license
Copyright (c) 2014 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt

1
dashboard-ui/bower_components/iron-input/test/iron-input.html vendored
View File

@ -1,5 +1,6 @@
<!doctype html>
<!--
@license
Copyright (c) 2015 The Polymer Project Authors. All rights reserved.
This code may only be used under the BSD style license found at http://polymer.github.io/LICENSE.txt
The complete set of authors may be found at http://polymer.github.io/AUTHORS.txt

4
dashboard-ui/bower_components/iron-selector/.bower.json vendored
View File

@ -36,7 +36,7 @@
"tag": "v1.4.0",
"commit": "554f7418fdbd97688eb21518b5f8172167d53a95"
},
"_source": "git://github.com/polymerelements/iron-selector.git",
"_source": "git://github.com/PolymerElements/iron-selector.git",
"_target": "^1.0.0",
"_originalSource": "polymerelements/iron-selector"
"_originalSource": "PolymerElements/iron-selector"
}

1
dashboard-ui/css/librarymenu.css
View File

@ -205,6 +205,7 @@
.dashboardDocument .viewMenuBar #selectionBar {
background: #fff !important;
height: 3px;
}
.viewMenuBarTabs {

2
dashboard-ui/css/site.css
View File

@ -783,7 +783,7 @@ paper-input + .fieldDescription {
}
.mainDrawerPanel:not([narrow]) .withTabs .content-primary {
padding-top: 128px!important;
padding-top: 135px!important;
}
.mainDrawerPanel:not([narrow]) .content-primary ul:first-child {

2
dashboard-ui/library.html
View File

@ -1,4 +1,4 @@
<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/medialibrarypage,scripts/taskbutton">
<div id="mediaLibraryPage" data-role="page" class="page type-interior mediaLibraryPage librarySectionPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/medialibrarypage,scripts/taskbutton">
<div data-role="content">
<div class="content-primary">

2
dashboard-ui/librarypathmapping.html
View File

@ -1,4 +1,4 @@
<div id="libraryPathMappingPage" data-role="page" class="page type-interior librarySectionPage" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/librarypathmapping">
<div id="libraryPathMappingPage" data-role="page" class="page type-interior librarySectionPage withTabs" data-helpurl="https://github.com/MediaBrowser/Wiki/wiki/Library%20setup" data-require="scripts/librarypathmapping">
<div data-role="content">
<div class="content-primary">

2
dashboard-ui/librarysettings.html
View File

@ -1,4 +1,4 @@
<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="jqmcollapsible,scripts/librarysettings,paper-input,paper-checkbox">
<div id="librarySettingsPage" data-role="page" class="page type-interior librarySectionPage" data-require="emby-collapsible,scripts/librarysettings,paper-input,paper-checkbox">
<div data-role="content">
<div class="content-primary">

4
dashboard-ui/scripts/librarymenu.js
View File

@ -744,7 +744,9 @@
require(['paper-tabs'], function () {
viewMenuBarTabs.innerHTML = '<paper-tabs selected="' + selectedIndex + '" hidescrollbuttons noink>' + builder().map(function (t) {
var noInk = browserInfo.animate ? '' : ' noink';
viewMenuBarTabs.innerHTML = '<paper-tabs selected="' + selectedIndex + '" hidescrollbuttons ' + noInk + '>' + builder().map(function (t) {
return '<paper-tab link><a class="clearLink paperTabLink" href="' + t.href + '"><div>' + t.name + '</div></a></paper-tab>';

13
dashboard-ui/scripts/librarypathmapping.js
View File

@ -112,6 +112,18 @@
return false;
}
function getTabs() {
return [
{
href: 'library.html',
name: Globalize.translate('TabFolders')
},
{
href: 'librarypathmapping.html',
name: Globalize.translate('TabPathSubstitution')
}];
}
$(document).on('pageinit', "#libraryPathMappingPage", function () {
var page = this;
@ -122,6 +134,7 @@
}).on('pageshow', "#libraryPathMappingPage", function () {
LibraryMenu.setTabs('librarysetup', 1, getTabs);
Dashboard.showLoadingMsg();
var page = this;

14
dashboard-ui/scripts/medialibrarypage.js
View File

@ -452,6 +452,19 @@
});
}
};
function getTabs() {
return [
{
href: 'library.html',
name: Globalize.translate('TabFolders')
},
{
href: 'librarypathmapping.html',
name: Globalize.translate('TabPathSubstitution')
}];
}
pageClassOn('pageshow', "mediaLibraryPage", function () {
var page = this;
@ -461,6 +474,7 @@
pageIdOn('pageshow', "mediaLibraryPage", function () {
LibraryMenu.setTabs('librarysetup', 0, getTabs);
var page = this;
// on here

11
dashboard-ui/scripts/site.js
View File

@ -741,11 +741,9 @@ var Dashboard = {
icon: 'people'
}, {
divider: true,
name: Globalize.translate('TabLibrary')
}, {
name: Globalize.translate('TabFolders'),
name: Globalize.translate('TabLibrary'),
href: "library.html",
pageIds: ['mediaLibraryPage'],
pageIds: ['mediaLibraryPage', 'libraryPathMappingPage'],
icon: 'folder',
color: '#009688'
}, {
@ -754,11 +752,6 @@ var Dashboard = {
pageIds: ['metadataConfigurationPage', 'metadataImagesConfigurationPage', 'metadataNfoPage'],
icon: 'insert-drive-file',
color: '#FF9800'
}, {
name: Globalize.translate('TabPathSubstitution'),
href: "librarypathmapping.html",
pageIds: ['libraryPathMappingPage'],
icon: 'mode-edit'
}, {
name: Globalize.translate('TabSubtitles'),
href: "metadatasubtitles.html",