';
+ require(['actionsheet'], function () {
- html += '
';
+ ActionSheetElement.show({
+ items: menuItems,
+ positionTo: elem,
+ callback: function (id) {
- page.append(html);
+ switch (id) {
- var flyout = $('.jobMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
+ case 'delete':
+ cancelJob(jobId);
+ break;
+ case 'cancel':
+ cancelJob(jobId);
+ break;
+ default:
+ break;
+ }
+ }
+ });
- $(this).off("popupafterclose").remove();
-
- });
-
- $('.btnCancelJob', flyout).on('click', function () {
- cancelJob(page, this.getAttribute('data-id'));
});
}
diff --git a/dashboard-ui/scripts/syncjob.js b/dashboard-ui/scripts/syncjob.js
index 3299338fc8..717b23f08f 100644
--- a/dashboard-ui/scripts/syncjob.js
+++ b/dashboard-ui/scripts/syncjob.js
@@ -2,6 +2,8 @@
function renderJob(page, job, dialogOptions) {
+ require(['paperbuttonstyle']);
+
var html = '';
html += '
';
@@ -12,7 +14,9 @@
html += ' ';
html += ' ';
- html += '';
+ html += '';
$('.syncJobForm', page).html(html).trigger('create');
SyncManager.renderForm({
@@ -131,66 +135,80 @@
var page = $(elem).parents('.page');
var listItem = $(elem).parents('li');
- var id = listItem.attr('data-itemid');
+ var jobItemId = listItem.attr('data-itemid');
var status = listItem.attr('data-status');
var remove = listItem.attr('data-remove').toLowerCase() == 'true';
- $('.jobMenu', page).popup("close").remove();
-
- var html = '
';
-
- html += '
';
- html += '
' + Globalize.translate('HeaderMenu') + '
';
+ var menuItems = [];
if (status == 'Failed') {
- html += '
';
+ require(['actionsheet'], function () {
- html += '
';
+ ActionSheetElement.show({
+ items: menuItems,
+ positionTo: elem,
+ callback: function (id) {
- page.append(html);
+ switch (id) {
- var flyout = $('.jobMenu', page).popup({ positionTo: elem || "window" }).trigger('create').popup("open").on("popupafterclose", function () {
+ case 'cancel':
+ cancelJobItem(page, jobItemId);
+ break;
+ case 'retry':
+ retryJobItem(page, jobItemId);
+ break;
+ case 'markforremoval':
+ markForRemoval(page, jobItemId);
+ break;
+ case 'unmarkforremoval':
+ unMarkForRemoval(page, jobItemId);
+ break;
+ default:
+ break;
+ }
+ }
+ });
- $(this).off("popupafterclose").remove();
-
- });
-
- $('.btnCancelJobItem', flyout).on('click', function () {
- cancelJobItem(page, this.getAttribute('data-id'));
- });
-
- $('.btnRetryJobItem', flyout).on('click', function () {
- retryJobItem(page, this.getAttribute('data-id'));
- });
-
- $('.btnUnmarkForRemoval', flyout).on('click', function () {
- unMarkForRemoval(page, this.getAttribute('data-id'));
- });
-
- $('.btnMarkForRemoval', flyout).on('click', function () {
- markForRemoval(page, this.getAttribute('data-id'));
});
}
function cancelJobItem(page, jobItemId) {
- $('.jobMenu', page).popup('close');
-
// Need a timeout because jquery mobile will not show a popup while another is in the act of closing
Dashboard.showLoadingMsg();
@@ -209,8 +227,6 @@
function markForRemoval(page, jobItemId) {
- $('.jobMenu', page).popup('close');
-
ApiClient.ajax({
type: "POST",
@@ -224,8 +240,6 @@
function unMarkForRemoval(page, jobItemId) {
- $('.jobMenu', page).popup('close');
-
ApiClient.ajax({
type: "POST",
@@ -239,8 +253,6 @@
function retryJobItem(page, jobItemId) {
- $('.jobMenu', page).popup('close');
-
ApiClient.ajax({
type: "POST",
diff --git a/dashboard-ui/themes/ios.css b/dashboard-ui/themes/ios.css
index 22b9445359..789a657fb0 100644
--- a/dashboard-ui/themes/ios.css
+++ b/dashboard-ui/themes/ios.css
@@ -49,10 +49,6 @@
color: #539FFD !important;
}
-.btn, .btn-large {
- font-family: Helvetica Neue !important;
-}
-
.pageTitle {
font-family: Helvetica Neue;
}
@@ -146,3 +142,7 @@ h1, h1 a {
.bottomFab {
bottom: 70px;
}
+
+.sidebarLinkText {
+ font-weight: 400 !important;
+}
diff --git a/dashboard-ui/thirdparty/jquery.unveil-custom.js b/dashboard-ui/thirdparty/jquery.unveil-custom.js
index c88e275f0c..4961f4f7da 100644
--- a/dashboard-ui/thirdparty/jquery.unveil-custom.js
+++ b/dashboard-ui/thirdparty/jquery.unveil-custom.js
@@ -20,7 +20,7 @@
// Need to fix those before this can be set to 0
if (window.AppInfo && AppInfo.isNativeApp && $.browser.safari) {
- return 7500;
+ return 7000;
}
var screens = $.browser.mobile ? 2.5 : 1;
diff --git a/dashboard-ui/thirdparty/paper-button-style.css b/dashboard-ui/thirdparty/paper-button-style.css
index 6138c54b6b..5459c88781 100644
--- a/dashboard-ui/thirdparty/paper-button-style.css
+++ b/dashboard-ui/thirdparty/paper-button-style.css
@@ -70,11 +70,11 @@
color: #fff;
}
- paper-button.cancel {
+ .ui-page-theme-b paper-button.cancel {
color: #444;
}
- paper-button[raised].cancel {
+ .ui-page-theme-b paper-button[raised].cancel {
background: #444;
color: #fff;
}
diff --git a/dashboard-ui/thirdparty/polymer/LICENSE.txt b/dashboard-ui/thirdparty/polymer/LICENSE.txt
deleted file mode 100644
index 95987bac86..0000000000
--- a/dashboard-ui/thirdparty/polymer/LICENSE.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-// Copyright (c) 2014 The Polymer Authors. All rights reserved.
-//
-// Redistribution and use in source and binary forms, with or without
-// modification, are permitted provided that the following conditions are
-// met:
-//
-// * Redistributions of source code must retain the above copyright
-// notice, this list of conditions and the following disclaimer.
-// * Redistributions in binary form must reproduce the above
-// copyright notice, this list of conditions and the following disclaimer
-// in the documentation and/or other materials provided with the
-// distribution.
-// * Neither the name of Google Inc. nor the names of its
-// contributors may be used to endorse or promote products derived from
-// this software without specific prior written permission.
-//
-// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/dashboard-ui/thirdparty/polymer/bower.json b/dashboard-ui/thirdparty/polymer/bower.json
deleted file mode 100644
index 055cf8a8cb..0000000000
--- a/dashboard-ui/thirdparty/polymer/bower.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
- "name": "polymer",
- "version": "1.0.0",
- "main": [
- "polymer.html"
- ],
- "license": "http://polymer.github.io/LICENSE.txt",
- "ignore": [
- "/.*",
- "/test/"
- ],
- "authors": [
- "The Polymer Authors (http://polymer.github.io/AUTHORS.txt)"
- ],
- "repository": {
- "type": "git",
- "url": "https://github.com/Polymer/polymer.git"
- },
- "dependencies": {
- "webcomponentsjs": "^0.7.2"
- },
- "devDependencies": {
- "web-component-tester": "*"
- },
- "private": true
-}
diff --git a/dashboard-ui/thirdparty/polymer/polymer-micro.html b/dashboard-ui/thirdparty/polymer/polymer-micro.html
deleted file mode 100644
index 999d2eb9bd..0000000000
--- a/dashboard-ui/thirdparty/polymer/polymer-micro.html
+++ /dev/null
@@ -1,544 +0,0 @@
-
-
diff --git a/dashboard-ui/thirdparty/polymer/polymer-mini.html b/dashboard-ui/thirdparty/polymer/polymer-mini.html
deleted file mode 100644
index 1bde7984bd..0000000000
--- a/dashboard-ui/thirdparty/polymer/polymer-mini.html
+++ /dev/null
@@ -1,1323 +0,0 @@
-
-
-
-
diff --git a/dashboard-ui/thirdparty/polymer/polymer.html b/dashboard-ui/thirdparty/polymer/polymer.html
deleted file mode 100644
index e632532d88..0000000000
--- a/dashboard-ui/thirdparty/polymer/polymer.html
+++ /dev/null
@@ -1,3776 +0,0 @@
-
-
-
diff --git a/dashboard-ui/vulcanize-out.html b/dashboard-ui/vulcanize-out.html
index 46c344ee29..e3a5404ee1 100644
--- a/dashboard-ui/vulcanize-out.html
+++ b/dashboard-ui/vulcanize-out.html
@@ -2462,7 +2462,8 @@ prevent = dy > dx;
prevent = dx > dy;
}
if (prevent) {
-ev.preventDefault();
+//This breaks scrolling in safari
+//ev.preventDefault();
}
}
},
@@ -13455,7 +13456,7 @@ iron-selector:not(.narrow-layout) #main ::content [paper-drawer-toggle] {
if (this.rightDrawer) {
this[xDirection ? 'closeDrawer' : 'openDrawer']();
} else {
- this[xDirection ? 'openDrawer' : 'closeDrawer']();
+ this[xDirection || event.detail.dx > -80 ? 'openDrawer' : 'closeDrawer']();
}
}
},