diff --git a/dashboard-ui/bower_components/paper-icon-button/.bower.json b/dashboard-ui/bower_components/paper-icon-button/.bower.json new file mode 100644 index 0000000000..42648d462b --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/.bower.json @@ -0,0 +1,44 @@ +{ + "name": "paper-icon-button", + "private": true, + "version": "1.0.2", + "license": "http://polymer.github.io/LICENSE.txt", + "description": "A material design icon button", + "main": "paper-icon-button.html", + "author": [ + "The Polymer Authors" + ], + "keywords": [ + "web-components", + "polymer", + "button", + "icon", + "control" + ], + "dependencies": { + "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0", + "iron-icon": "polymerelements/iron-icon#^1.0.0", + "iron-icons": "polymerelements/iron-icons#^1.0.0", + "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0", + "paper-ripple": "polymerelements/paper-ripple#^1.0.0", + "paper-styles": "polymerelements/paper-styles#^1.0.0", + "polymer": "Polymer/polymer#^1.0.0" + }, + "devDependencies": { + "iron-component-page": "polymerelements/iron-component-page#^1.0.0", + "test-fixture": "polymerelements/test-fixture#^1.0.0", + "web-component-tester": "*", + "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" + }, + "homepage": "https://github.com/PolymerElements/paper-icon-button", + "_release": "1.0.2", + "_resolution": { + "type": "version", + "tag": "v1.0.2", + "commit": "b22ade2080f2527760eae41e4700c52d4689a866" + }, + "_source": "git://github.com/PolymerElements/paper-icon-button.git", + "_target": "~1.0.2", + "_originalSource": "PolymerElements/paper-icon-button", + "_direct": true +} \ No newline at end of file diff --git a/dashboard-ui/bower_components/paper-icon-button/.gitignore b/dashboard-ui/bower_components/paper-icon-button/.gitignore new file mode 100644 index 0000000000..8d4ae2536a --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/.gitignore @@ -0,0 +1 @@ +bower_components diff --git a/dashboard-ui/bower_components/paper-icon-button/bower.json b/dashboard-ui/bower_components/paper-icon-button/bower.json new file mode 100644 index 0000000000..6886757eaa --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/bower.json @@ -0,0 +1,33 @@ +{ + "name": "paper-icon-button", + "private": true, + "version": "1.0.2", + "license": "http://polymer.github.io/LICENSE.txt", + "description": "A material design icon button", + "main": "paper-icon-button.html", + "author": [ + "The Polymer Authors" + ], + "keywords": [ + "web-components", + "polymer", + "button", + "icon", + "control" + ], + "dependencies": { + "iron-flex-layout": "polymerelements/iron-flex-layout#^1.0.0", + "iron-icon": "polymerelements/iron-icon#^1.0.0", + "iron-icons": "polymerelements/iron-icons#^1.0.0", + "paper-behaviors": "polymerelements/paper-behaviors#^1.0.0", + "paper-ripple": "polymerelements/paper-ripple#^1.0.0", + "paper-styles": "polymerelements/paper-styles#^1.0.0", + "polymer": "Polymer/polymer#^1.0.0" + }, + "devDependencies": { + "iron-component-page": "polymerelements/iron-component-page#^1.0.0", + "test-fixture": "polymerelements/test-fixture#^1.0.0", + "web-component-tester": "*", + "webcomponentsjs": "webcomponents/webcomponentsjs#^0.7.0" + } +} diff --git a/dashboard-ui/bower_components/paper-icon-button/demo/index.html b/dashboard-ui/bower_components/paper-icon-button/demo/index.html new file mode 100644 index 0000000000..cbe6795146 --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/demo/index.html @@ -0,0 +1,154 @@ + + + + + paper-icon-button + + + + + + + + + + + + + + +
+
+

Enabled

+
+ + + + + + + +
+
+ +
+

Disabled

+
+ + + + + + + +
+
+ +
+

Color

+
+ + + + + + + +
+
+ +
+

Size

+
+ +


+ +
+
+
+ + + + diff --git a/dashboard-ui/bower_components/paper-icon-button/index.html b/dashboard-ui/bower_components/paper-icon-button/index.html new file mode 100644 index 0000000000..94c3720cd7 --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/index.html @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-icon-button/paper-icon-button.html b/dashboard-ui/bower_components/paper-icon-button/paper-icon-button.html new file mode 100644 index 0000000000..f4164ce06d --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/paper-icon-button.html @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-icon-button/test/a11y.html b/dashboard-ui/bower_components/paper-icon-button/test/a11y.html new file mode 100644 index 0000000000..f6bf6fd448 --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/test/a11y.html @@ -0,0 +1,94 @@ + + + + + + paper-icon-button a11y tests + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-icon-button/test/basic.html b/dashboard-ui/bower_components/paper-icon-button/test/basic.html new file mode 100644 index 0000000000..e98689c6cc --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/test/basic.html @@ -0,0 +1,77 @@ + + + + + + paper-icon-button basic tests + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/dashboard-ui/bower_components/paper-icon-button/test/index.html b/dashboard-ui/bower_components/paper-icon-button/test/index.html new file mode 100644 index 0000000000..321c261243 --- /dev/null +++ b/dashboard-ui/bower_components/paper-icon-button/test/index.html @@ -0,0 +1,26 @@ + + + + + + + paper-icon-button tests + + + + + + diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 1604b75eb5..0e2994d71b 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -423,7 +423,7 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { } .lnkNextItem { - right: 0; + right: 10px; } .detailImageContainer { diff --git a/dashboard-ui/itemdetails.html b/dashboard-ui/itemdetails.html index 096cdafb38..53bbf1d676 100644 --- a/dashboard-ui/itemdetails.html +++ b/dashboard-ui/itemdetails.html @@ -151,8 +151,8 @@ - ${ButtonPrevious} - ${ButtonNext} + +
@@ -260,10 +260,11 @@
+ diff --git a/dashboard-ui/scripts/actionsheet.js b/dashboard-ui/scripts/actionsheet.js index 1fe1886574..2a129a30c1 100644 --- a/dashboard-ui/scripts/actionsheet.js +++ b/dashboard-ui/scripts/actionsheet.js @@ -13,7 +13,7 @@ var id = 'dlg' + new Date().getTime(); var html = ''; - html += ''; + html += ''; if (options.title) { html += '

'; @@ -26,7 +26,10 @@ var option = options.items[i]; - html += '' + option.name + ''; + html += ''; + //html += ''; + html += '' + option.name + ''; + html += ''; } html += ''; diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 895fd193e9..2284a6aea7 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -373,66 +373,95 @@ showMoreCommands: function (positionTo, itemId, commands) { - $('.playFlyout').popup("close").remove(); - - var html = '
'; - - html += ''; + require(['actionsheet'], function () { - html += '
'; + ActionSheetElement.show({ + items: items, + callback: function (id) { - $($.mobile.activePage).append(html); + switch (id) { - var elem = $('.playFlyout').popup({ positionTo: positionTo || "window" }).trigger('create').popup("open").on("popupafterclose", function () { + case 'addtocollection': + BoxSetEditor.showPanel(itemId); + break; + case 'icon': + PlaylistManager.showPanel(itemId); + break; + case 'delete': + LibraryBrowser.deleteItem(itemId); + break; + case 'download': + { + var downloadHref = ApiClient.getUrl("Items/" + itemId + "/Download", { + api_key: ApiClient.accessToken() + }); + window.location.href = downloadHref; - $(this).off("popupafterclose").remove(); - - }); - - $('.btnMoreMenuRefresh', elem).on('click', function () { - - $('.playFlyout').popup('close'); - - ApiClient.refreshItem(itemId, { - - Recursive: true, - ImageRefreshMode: 'FullRefresh', - MetadataRefreshMode: 'FullRefresh', - ReplaceAllImages: false, - ReplaceAllMetadata: true - }).done(function () { + break; + } + case 'edit': + Dashboard.navigate('edititemmetadata.html?id=' + itemId); + break; + case 'refresh': + ApiClient.refreshItem(itemId, { + Recursive: true, + ImageRefreshMode: 'FullRefresh', + MetadataRefreshMode: 'FullRefresh', + ReplaceAllImages: false, + ReplaceAllMetadata: true + }); + break; + default: + break; + } + } }); + }); }, diff --git a/dashboard-ui/thirdparty/browser.js b/dashboard-ui/thirdparty/browser.js index 79ac6932c8..0f4c291633 100644 --- a/dashboard-ui/thirdparty/browser.js +++ b/dashboard-ui/thirdparty/browser.js @@ -966,13 +966,13 @@ } if (browser.ipad || browser.iphone) { - if (userAgent.toLowerCase().indexOf('CPU OS 9') != -1) { + if (userAgent.toLowerCase().indexOf('cpu os 9') != -1) { browser.iOSVersion = 9; } - else if (userAgent.toLowerCase().indexOf('CPU OS 8') != -1) { + else if (userAgent.toLowerCase().indexOf('cpu os 8') != -1) { browser.iOSVersion = 8; } - else if (userAgent.toLowerCase().indexOf('CPU OS 7') != -1) { + else if (userAgent.toLowerCase().indexOf('cpu os 7') != -1) { browser.iOSVersion = 7; } } diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css index ed0770e9c2..c84fc5c911 100644 --- a/dashboard-ui/thirdparty/paper-button-style.css +++ b/dashboard-ui/thirdparty/paper-button-style.css @@ -137,6 +137,7 @@ paper-button .fa { text-decoration: none; font-weight: inherit !important; vertical-align: middle; + color: inherit !important; } paper-button.mini { @@ -183,3 +184,7 @@ paper-button.notext { .bottomFab { bottom: 30px; } + +iron-overlay-backdrop { + z-index: 999998 !important; +}