From 45436618e2859a8d2a5b7970d0149241217b5fb7 Mon Sep 17 00:00:00 2001 From: Chris Pinkham Date: Tue, 29 Mar 2011 01:35:38 -0400 Subject: [PATCH] HTML Setup: Allow a different size for the popup based on class. Previously the CSS was tied to the ID of the div, instead tie it to the class and set the class when we display the popup div so that different areas can use the same routines but different size popups. --- mythtv/html/index.html | 3 -- mythtv/html/setup/css/setup.css | 53 +++++++++++++++++++------------- mythtv/html/setup/js/jobqueue.js | 1 + mythtv/html/setup/js/wizard.js | 1 + 4 files changed, 34 insertions(+), 24 deletions(-) diff --git a/mythtv/html/index.html b/mythtv/html/index.html index 55067f0f89b..e4e268183ee 100644 --- a/mythtv/html/index.html +++ b/mythtv/html/index.html @@ -59,9 +59,6 @@
Close [X]
- diff --git a/mythtv/html/setup/css/setup.css b/mythtv/html/setup/css/setup.css index 150b0f11656..bf243bc2842 100644 --- a/mythtv/html/setup/css/setup.css +++ b/mythtv/html/setup/css/setup.css @@ -24,23 +24,9 @@ filter: alpha(opacity=50); } - #editborder { - display: none; - position: absolute; - background-color: #FFFFFF; - top: 30px; - right: 30px; - bottom: 30px; - left: 30px; - z-index: 101; - border-width: 6px; - border-color: #0000FF; - border-style: double; - } - #editcontent { position: absolute; - top: 45px; + top: 25px; width: 100%; } @@ -50,17 +36,38 @@ right: 5px; } - #editlogo { + /************************************************************/ + /* various classes for 'popup' edit div */ + div.editborder-fullscreen { + display: none; position: absolute; - top: 5px; - left: 5px; + background-color: #FFFFFF; + top: 30px; + right: 30px; + bottom: 30px; + left: 30px; + z-index: 101; + border-width: 6px; + border-color: #0000FF; + border-style: double; } - #setuptabs { - width: 100%; + div.editborder-wizard { + display: none; + position: absolute; + background-color: #FFFFFF; + top: 30px; + right: 30px; + left: 30px; + height: 420px; + z-index: 101; + border-width: 6px; + border-color: #0000FF; + border-style: double; } + /************************************************************/ - #Title { + #editTitle { font-size: 18px; font-family: sans-serif; font-weight: bold; @@ -69,6 +76,10 @@ text-align: center; } + #setuptabs { + width: 100%; + } + #jobEditTitle { font-size: 14px; font-family: sans-serif; diff --git a/mythtv/html/setup/js/jobqueue.js b/mythtv/html/setup/js/jobqueue.js index 2fb365c0e76..a9b03f3f215 100644 --- a/mythtv/html/setup/js/jobqueue.js +++ b/mythtv/html/setup/js/jobqueue.js @@ -1,5 +1,6 @@ function editJob(title, descKey, commandKey) { + $('#editborder').attr({ class: 'editborder-fullscreen' }); loadEditWindow("/setup/jobqueue-job-editor.html"); $("#jobEditTitle").html(title); diff --git a/mythtv/html/setup/js/wizard.js b/mythtv/html/setup/js/wizard.js index 86e38192220..9b7219dba75 100644 --- a/mythtv/html/setup/js/wizard.js +++ b/mythtv/html/setup/js/wizard.js @@ -30,5 +30,6 @@ function testDBSettings() { return result; } +$('#editborder').attr({ class: 'editborder-wizard' }); $("#wizardtabs").tabs({ cache: true }); showEditWindow();