diff --git a/mythtv/html/css/images/ui-bg_flat_0_aaaaaa_40x100.png b/mythtv/html/css/images/ui-bg_flat_0_aaaaaa_40x100.png new file mode 100755 index 00000000000..5b5dab2ab7b Binary files /dev/null and b/mythtv/html/css/images/ui-bg_flat_0_aaaaaa_40x100.png differ diff --git a/mythtv/html/css/images/ui-bg_flat_75_ffffff_40x100.png b/mythtv/html/css/images/ui-bg_flat_75_ffffff_40x100.png new file mode 100755 index 00000000000..ac8b229af95 Binary files /dev/null and b/mythtv/html/css/images/ui-bg_flat_75_ffffff_40x100.png differ diff --git a/mythtv/html/css/images/ui-bg_glass_55_fbf9ee_1x400.png b/mythtv/html/css/images/ui-bg_glass_55_fbf9ee_1x400.png new file mode 100755 index 00000000000..ad3d6346e00 Binary files /dev/null and b/mythtv/html/css/images/ui-bg_glass_55_fbf9ee_1x400.png differ diff --git a/mythtv/html/css/images/ui-bg_glass_65_ffffff_1x400.png b/mythtv/html/css/images/ui-bg_glass_65_ffffff_1x400.png new file mode 100755 index 00000000000..42ccba269b6 Binary files /dev/null and b/mythtv/html/css/images/ui-bg_glass_65_ffffff_1x400.png differ diff --git a/mythtv/html/css/images/ui-bg_glass_75_dadada_1x400.png b/mythtv/html/css/images/ui-bg_glass_75_dadada_1x400.png new file mode 100755 index 00000000000..5a46b47cb16 Binary files /dev/null and b/mythtv/html/css/images/ui-bg_glass_75_dadada_1x400.png differ diff --git a/mythtv/html/css/images/ui-bg_glass_75_e6e6e6_1x400.png b/mythtv/html/css/images/ui-bg_glass_75_e6e6e6_1x400.png new file mode 100755 index 00000000000..86c2baa655e Binary files /dev/null and b/mythtv/html/css/images/ui-bg_glass_75_e6e6e6_1x400.png differ diff --git a/mythtv/html/css/images/ui-bg_highlight-soft_75_8c98ba_1x100.png b/mythtv/html/css/images/ui-bg_highlight-soft_75_8c98ba_1x100.png new file mode 100755 index 00000000000..d2654ae1559 Binary files /dev/null and b/mythtv/html/css/images/ui-bg_highlight-soft_75_8c98ba_1x100.png differ diff --git a/mythtv/html/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png b/mythtv/html/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png new file mode 100755 index 00000000000..0e05810fffe Binary files /dev/null and b/mythtv/html/css/images/ui-bg_inset-soft_95_fef1ec_1x100.png differ diff --git a/mythtv/html/css/images/ui-icons_222222_256x240.png b/mythtv/html/css/images/ui-icons_222222_256x240.png new file mode 100755 index 00000000000..b273ff111d2 Binary files /dev/null and b/mythtv/html/css/images/ui-icons_222222_256x240.png differ diff --git a/mythtv/html/css/images/ui-icons_2e83ff_256x240.png b/mythtv/html/css/images/ui-icons_2e83ff_256x240.png new file mode 100755 index 00000000000..09d1cdc856c Binary files /dev/null and b/mythtv/html/css/images/ui-icons_2e83ff_256x240.png differ diff --git a/mythtv/html/css/images/ui-icons_454545_256x240.png b/mythtv/html/css/images/ui-icons_454545_256x240.png new file mode 100755 index 00000000000..59bd45b907c Binary files /dev/null and b/mythtv/html/css/images/ui-icons_454545_256x240.png differ diff --git a/mythtv/html/css/images/ui-icons_888888_256x240.png b/mythtv/html/css/images/ui-icons_888888_256x240.png new file mode 100755 index 00000000000..6d02426c114 Binary files /dev/null and b/mythtv/html/css/images/ui-icons_888888_256x240.png differ diff --git a/mythtv/html/css/images/ui-icons_cd0a0a_256x240.png b/mythtv/html/css/images/ui-icons_cd0a0a_256x240.png new file mode 100755 index 00000000000..2ab019b73ec Binary files /dev/null and b/mythtv/html/css/images/ui-icons_cd0a0a_256x240.png differ diff --git a/mythtv/html/css/setup.css b/mythtv/html/css/setup.css index 29a20525b9e..deaceedc8c4 100644 --- a/mythtv/html/css/setup.css +++ b/mythtv/html/css/setup.css @@ -123,61 +123,6 @@ } /********************************************************/ - #helpWindow { - display: none; - position: absolute; - background-color: #FFFFFF; - top: 10px; - right: 10px; - height: 200px; - width: 300px; - z-index: 999; - padding: 5px 5px 5px 5px; - border-width: 6px; - border-color: #0000FF; - border-style: double; - } - - #helpContent { - height: 140; - overflow: auto; - } - - .Header { - font-size: 22px; - font-family: sans-serif; - font-weight: bold; - color: blue; - width: 100%; - text-align: center; - } - - .Footer { - font-size: 12px; - font-family: sans-serif; - font-weight: bold; - color: black; - width: 100%; - text-align: center; - position: relative; - bottom: 0px; - } - - div.helpLink { - font-size: 10px; - font-family: sans-serif; - font-weight: bold; - color: blue; - float: left; - } - - a.helpLink { - font-size: 10px; - font-family: sans-serif; - font-weight: bold; - color: blue; - } - #fileBrowser-bg { position: fixed; diff --git a/mythtv/html/html.pro b/mythtv/html/html.pro index 1c992353b17..fa2aab3534d 100644 --- a/mythtv/html/html.pro +++ b/mythtv/html/html.pro @@ -10,7 +10,7 @@ win32:QMAKE_COPY_DIR = sh ./cpsimple html.path = $${PREFIX}/share/mythtv/html/ html.files = index.html overview.html menu.qsp -html.files += css images js misc setup samples +html.files += css css/images images js misc setup samples INSTALLS += html diff --git a/mythtv/html/index.html b/mythtv/html/index.html index f857038d342..cfa6cd35524 100644 --- a/mythtv/html/index.html +++ b/mythtv/html/index.html @@ -63,20 +63,7 @@ -
-
- Help -
-
-
-
-
-
- Close [X] -
- +
diff --git a/mythtv/html/setup/js/setup.js b/mythtv/html/setup/js/setup.js index c2d5a8ae29a..ffc9df7eb7a 100644 --- a/mythtv/html/setup/js/setup.js +++ b/mythtv/html/setup/js/setup.js @@ -16,6 +16,7 @@ function setupPageName(path) { } function showHelpWindow() { + $("#helpWindow").dialog(); $("#helpWindow").show(); $("#helpWindow").draggable(); } @@ -25,8 +26,8 @@ function hideHelpWindow() { } function showHelp(title, content) { - $("#helpTitle").html(title); - $("#helpContent").html(content); + $("#helpWindow").attr('title', title); + $("#helpWindow").html(content); showHelpWindow(); }