From ce35317652ad7df7fbe82b4b40ca442c73004105 Mon Sep 17 00:00:00 2001 From: Luke Pulverenti Date: Thu, 14 May 2015 13:16:29 -0400 Subject: [PATCH] make scripts more modular --- dashboard-ui/advanced.html | 8 +-- dashboard-ui/css/librarybrowser.css | 8 +++ dashboard-ui/css/mediaplayer-video.css | 6 +- dashboard-ui/css/search.css | 7 ++- dashboard-ui/css/site.css | 1 + dashboard-ui/dashboardhosting.html | 6 +- .../scripts/advancedconfigurationpage.js | 60 +++++++++---------- dashboard-ui/scripts/dashboardhosting.js | 56 +++++++++-------- dashboard-ui/scripts/librarybrowser.js | 10 ++-- dashboard-ui/scripts/search.js | 3 +- dashboard-ui/scripts/site.js | 30 ++++++++++ 11 files changed, 109 insertions(+), 86 deletions(-) diff --git a/dashboard-ui/advanced.html b/dashboard-ui/advanced.html index 707fc57c93..c760f2a853 100644 --- a/dashboard-ui/advanced.html +++ b/dashboard-ui/advanced.html @@ -4,7 +4,7 @@ ${TitleAdvanced} -
+
@@ -14,7 +14,7 @@ ${TabHosting} ${TabSecurity}
-
+
- -
diff --git a/dashboard-ui/css/librarybrowser.css b/dashboard-ui/css/librarybrowser.css index 5aa3524a9c..be6aa607e1 100644 --- a/dashboard-ui/css/librarybrowser.css +++ b/dashboard-ui/css/librarybrowser.css @@ -1405,6 +1405,14 @@ span.itemCommunityRating:not(:empty) + .userDataIcons { background-position: center center; } +.listViewMoreButton { + position: absolute; + right: 0; + top: 10%; + padding: 15px 20px; + font-size: 20px; +} + .ui-li-has-icon > .ui-btn { padding-left: 5.25em !important; padding-top: 5px !important; diff --git a/dashboard-ui/css/mediaplayer-video.css b/dashboard-ui/css/mediaplayer-video.css index 9de8867207..57bef94a58 100644 --- a/dashboard-ui/css/mediaplayer-video.css +++ b/dashboard-ui/css/mediaplayer-video.css @@ -93,9 +93,9 @@ vertical-align: top; color: #eee; display: inline-block; - width: 80%; + width: 70%; font-weight: normal; - font-size: 15px; + font-size: 14px; } @media all and (max-width: 1200px) { @@ -113,7 +113,7 @@ font-size: 18px; text-transform: uppercase; color: #ddd !important; - font-weight: 500 !important; + font-weight: 400 !important; text-decoration: none; } diff --git a/dashboard-ui/css/search.css b/dashboard-ui/css/search.css index 2c2299f201..fe77427502 100644 --- a/dashboard-ui/css/search.css +++ b/dashboard-ui/css/search.css @@ -145,12 +145,13 @@ border: 0; color: #ddd; border-radius: 3px; - padding: 4px 7px 3px 50px; + padding: 4px 0 3px 0; + text-indent: 50px; font-size: 16px; font-family: Roboto; outline: none; vertical-align: middle; - width: 85%; + width: 90%; } .searchInputIcon { @@ -175,7 +176,7 @@ } .viewMenuSearchForm { - max-width: initial; + max-width: none; padding: 10px; } diff --git a/dashboard-ui/css/site.css b/dashboard-ui/css/site.css index 47ee74991f..98a02339bb 100644 --- a/dashboard-ui/css/site.css +++ b/dashboard-ui/css/site.css @@ -305,6 +305,7 @@ h1 .imageLink { padding: 0; cursor: pointer; outline: none; + color: inherit; } .imageButton:hover { diff --git a/dashboard-ui/dashboardhosting.html b/dashboard-ui/dashboardhosting.html index 6958953a23..d7de4a25c2 100644 --- a/dashboard-ui/dashboardhosting.html +++ b/dashboard-ui/dashboardhosting.html @@ -4,7 +4,7 @@ ${TitleAdvanced} -
+
@@ -78,10 +78,6 @@
- -
diff --git a/dashboard-ui/scripts/advancedconfigurationpage.js b/dashboard-ui/scripts/advancedconfigurationpage.js index 0f0a4c69b0..2de0ad2db9 100644 --- a/dashboard-ui/scripts/advancedconfigurationpage.js +++ b/dashboard-ui/scripts/advancedconfigurationpage.js @@ -35,7 +35,31 @@ Dashboard.hideLoadingMsg(); } - $(document).on('pageshow', "#advancedConfigurationPage", function () { + function onSubmit() { + Dashboard.showLoadingMsg(); + + var form = this; + + ApiClient.getServerConfiguration().done(function (config) { + + config.EnableDebugLevelLogging = $('#chkDebugLog', form).checked(); + + config.RunAtStartup = $('#chkRunAtStartup', form).checked(); + config.SystemUpdateLevel = $('#selectAutomaticUpdateLevel', form).val(); + config.EnableAutomaticRestart = $('#chkEnableAutomaticRestart', form).checked(); + + config.EnableDashboardResourceMinification = $('#chkEnableMinification', form).checked(); + config.EnableDashboardResponseCaching = $('#chkEnableDashboardResponseCache', form).checked(); + config.DashboardSourcePath = $('#txtDashboardSourcePath', form).val(); + + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + }); + + // Disable default form submission + return false; + } + + $(document).on('pageshown', "#advancedConfigurationPage", function () { Dashboard.showLoadingMsg(); @@ -51,7 +75,7 @@ }); - }).on('pageinit', "#advancedConfigurationPage", function () { + }).on('pageinitdepends', "#advancedConfigurationPage", function () { var page = this; @@ -81,37 +105,7 @@ }); }); + $('.advancedConfigurationForm').off('submit', onSubmit).on('submit', onSubmit); }); - function advancedConfigurationPage() { - - var self = this; - - self.onSubmit = function () { - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getServerConfiguration().done(function (config) { - - config.EnableDebugLevelLogging = $('#chkDebugLog', form).checked(); - - config.RunAtStartup = $('#chkRunAtStartup', form).checked(); - config.SystemUpdateLevel = $('#selectAutomaticUpdateLevel', form).val(); - config.EnableAutomaticRestart = $('#chkEnableAutomaticRestart', form).checked(); - - config.EnableDashboardResourceMinification = $('#chkEnableMinification', form).checked(); - config.EnableDashboardResponseCaching = $('#chkEnableDashboardResponseCache', form).checked(); - config.DashboardSourcePath = $('#txtDashboardSourcePath', form).val(); - - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - }; - } - - window.AdvancedConfigurationPage = new advancedConfigurationPage(); - })(jQuery, document, window); diff --git a/dashboard-ui/scripts/dashboardhosting.js b/dashboard-ui/scripts/dashboardhosting.js index 783778c266..b8d548e792 100644 --- a/dashboard-ui/scripts/dashboardhosting.js +++ b/dashboard-ui/scripts/dashboardhosting.js @@ -17,7 +17,30 @@ Dashboard.hideLoadingMsg(); } - $(document).on('pageshow', "#dashboardHostingPage", function () { + function onSubmit() { + Dashboard.showLoadingMsg(); + + var form = this; + + ApiClient.getServerConfiguration().done(function (config) { + + config.HttpServerPortNumber = $('#txtPortNumber', form).val(); + config.PublicPort = $('#txtPublicPort', form).val(); + config.PublicHttpsPort = $('#txtPublicHttpsPort', form).val(); + config.EnableHttps = $('#chkEnableHttps', form).checked(); + config.HttpsPortNumber = $('#txtHttpsPort', form).val(); + config.EnableUPnP = $('#chkEnableUpnp', form).checked(); + config.WanDdns = $('#txtDdns', form).val(); + config.CertificatePath = $('#txtCertificatePath', form).val(); + + ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); + }); + + // Disable default form submission + return false; + } + + $(document).on('pageshown', "#dashboardHostingPage", function () { Dashboard.showLoadingMsg(); @@ -29,7 +52,7 @@ }); - }).on('pageinit', "#dashboardHostingPage", function () { + }).on('pageinitdepends', "#dashboardHostingPage", function () { var page = this; @@ -53,33 +76,8 @@ header: Globalize.translate('HeaderSelectCertificatePath') }); }); + + $('.dashboardHostingForm').off('submit', onSubmit).on('submit', onSubmit); }); - window.DashboardHostingPage = { - - onSubmit: function () { - Dashboard.showLoadingMsg(); - - var form = this; - - ApiClient.getServerConfiguration().done(function (config) { - - config.HttpServerPortNumber = $('#txtPortNumber', form).val(); - config.PublicPort = $('#txtPublicPort', form).val(); - config.PublicHttpsPort = $('#txtPublicHttpsPort', form).val(); - config.EnableHttps = $('#chkEnableHttps', form).checked(); - config.HttpsPortNumber = $('#txtHttpsPort', form).val(); - config.EnableUPnP = $('#chkEnableUpnp', form).checked(); - config.WanDdns = $('#txtDdns', form).val(); - config.CertificatePath = $('#txtCertificatePath', form).val(); - - ApiClient.updateServerConfiguration(config).done(Dashboard.processServerConfigurationUpdateResult); - }); - - // Disable default form submission - return false; - } - - }; - })(jQuery, document, window); diff --git a/dashboard-ui/scripts/librarybrowser.js b/dashboard-ui/scripts/librarybrowser.js index 00a54af932..34218fcb3f 100644 --- a/dashboard-ui/scripts/librarybrowser.js +++ b/dashboard-ui/scripts/librarybrowser.js @@ -714,7 +714,7 @@ var href = LibraryBrowser.getHref(item, options.context); - html += '
  • '; + html += '
  • '; var defaultAction = options.defaultAction; if (defaultAction == 'play' || defaultAction == 'playallfromhere') { @@ -848,9 +848,9 @@ } html += ''; - // Render out the jqm classes so that we don't have to call trigger create - html += ''; - html += ''; + html += ''; html += '
    • '; @@ -1558,8 +1558,6 @@ if (options.cardLayout) { html += '
    '; - // Render out the jqm classes so that we don't have to call trigger create - //html += ''; html += ''; html += "
    "; } diff --git a/dashboard-ui/scripts/search.js b/dashboard-ui/scripts/search.js index fe12f68f38..fd5e22047b 100644 --- a/dashboard-ui/scripts/search.js +++ b/dashboard-ui/scripts/search.js @@ -89,7 +89,8 @@ showTitle: true, coverImage: true, centerImage: true, - textLines: getAdditionalTextLines + textLines: getAdditionalTextLines, + cardLayout: true }); $('.itemsContainer', elem).html(html).lazyChildren(); } diff --git a/dashboard-ui/scripts/site.js b/dashboard-ui/scripts/site.js index a76750dcb4..d95dacf6f4 100644 --- a/dashboard-ui/scripts/site.js +++ b/dashboard-ui/scripts/site.js @@ -1824,6 +1824,36 @@ $(document).on('pagecreate', ".page", function () { $(document.body).addClass('removeScrollbars'); } +}).on('pageinit', ".page", function () { + + var page = this; + + var require = this.getAttribute('data-require'); + + if (require) { + requirejs([require], function() { + + $(page).trigger('pageinitdepends'); + }); + } else { + $(page).trigger('pageinitdepends'); + } + +}).on('pageshow', ".page", function () { + + var page = this; + + var require = this.getAttribute('data-require'); + + if (require) { + requirejs([require], function () { + + $(page).trigger('pageshown'); + }); + } else { + $(page).trigger('pageshown'); + } + }).on('pagebeforeshow', ".page", function () { var page = $(this);