From: Marcin Haba Date: Mon, 27 Nov 2017 20:06:50 +0000 (+0100) Subject: baculum: Wizards view improvements X-Git-Tag: Release-9.0.7~26 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=d53f8f0cf02d0d1980873ab32e10dde51e40feae;p=bacula%2Fbacula baculum: Wizards view improvements --- diff --git a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page index bc0e7f4f9d..92d43f394a 100644 --- a/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page +++ b/gui/baculum/protected/API/Pages/Panel/APIInstallWizard.page @@ -68,10 +68,10 @@

<%[ Do you want to setup and to share the Bacula Catalog Database access for this API instance? ]%>

-
+
-
+
@@ -233,10 +233,10 @@

<%[ Do you want to setup and share the Bacula Bconsole interface to execute commands in this API instance? ]%>

-
+
-
+
@@ -286,25 +286,25 @@
-
+
<%[ NOTE! ]%>
<%[ Baculum needs access to bconsole by the web server. ]%>

<%[ Do you want to setup and share the Bacula configuration interface to configure Bacula components via this API instance? ]%>

-
+
-
+
-
+
<%[ General configuration ]%>
-
+
@@ -312,7 +312,7 @@
-
+
@@ -326,14 +326,14 @@
Director
-
+
-
+
@@ -348,14 +348,14 @@
Storage Daemon
-
+
-
+
@@ -370,14 +370,14 @@
File Daemon/Client
-
+
-
+
@@ -392,14 +392,14 @@
Bconsole
-
+
-
+
@@ -426,7 +426,7 @@
-
+
-
+
+ + /> + /> /> + /> diff --git a/gui/baculum/protected/Web/Pages/WebConfigWizard.page b/gui/baculum/protected/Web/Pages/WebConfigWizard.page index eed2fbea3f..9195849259 100644 --- a/gui/baculum/protected/Web/Pages/WebConfigWizard.page +++ b/gui/baculum/protected/Web/Pages/WebConfigWizard.page @@ -3,7 +3,7 @@ -
+
diff --git a/gui/baculum/themes/Baculum-v1/step-head.png b/gui/baculum/themes/Baculum-v1/step-head.png new file mode 100644 index 0000000000..e7c0902814 Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/step-head.png differ diff --git a/gui/baculum/themes/Baculum-v1/step-last-1.png b/gui/baculum/themes/Baculum-v1/step-last-1.png new file mode 100644 index 0000000000..c8dde10ba0 Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/step-last-1.png differ diff --git a/gui/baculum/themes/Baculum-v1/step-last-active-1.png b/gui/baculum/themes/Baculum-v1/step-last-active-1.png new file mode 100644 index 0000000000..ad409c2f48 Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/step-last-active-1.png differ diff --git a/gui/baculum/themes/Baculum-v1/step-last-active.png b/gui/baculum/themes/Baculum-v1/step-last-active.png deleted file mode 100644 index b6f2882cb0..0000000000 Binary files a/gui/baculum/themes/Baculum-v1/step-last-active.png and /dev/null differ diff --git a/gui/baculum/themes/Baculum-v1/step-last.png b/gui/baculum/themes/Baculum-v1/step-last.png deleted file mode 100644 index 9fbc6b65a1..0000000000 Binary files a/gui/baculum/themes/Baculum-v1/step-last.png and /dev/null differ diff --git a/gui/baculum/themes/Baculum-v1/style.css b/gui/baculum/themes/Baculum-v1/style.css index 49badceabc..7f6234296f 100644 --- a/gui/baculum/themes/Baculum-v1/style.css +++ b/gui/baculum/themes/Baculum-v1/style.css @@ -174,7 +174,7 @@ a.big { div.configuration { width: 45%; - height: 575px; + height: 100%; margin: 12px; float: right; background-color: #898889; @@ -187,6 +187,7 @@ div.configuration { #configuration { position: absolute; width: 100%; + height: 99%; } #configuration div.field select { @@ -200,7 +201,7 @@ div.configuration { div.configuration-progress { background: rgba(182,182,182,0.7) url('progress.gif') no-repeat center center; width: 45%; - height: 575px; + height: 100%; z-index: 10; position: absolute; top: 12px; @@ -542,31 +543,21 @@ tr.file-browser-element { tr.file-browser-element td { font-style: italic; - padding: 3px 0; + min-height: 36px; vertical-align: middle; } -tr.file-browser-element:hover { +tr.file-browser-element td:hover { cursor: move; } -tr.file-browser-element:hover td{ +tr.file-browser-element td:hover { background-color: #aeb2b6; } -tr.file-browser-header { - height: 25px; - text-align: left; - font-family: monospace; - font-size: 9px -} - -tr.file-browser-header th { - padding-left: 9px; -} - .draggable { cursor: move; + min-height: 30px; } div.slide-window-bar { @@ -1065,13 +1056,18 @@ span.tab_active { } .config_lines { - width: 533px; + width: 590px; float: left; } + +.config_lines div.field { + width: 280px !important; +} + #config_fields { width: 732px; - margin-left: 8px; + margin: 0 auto; padding-top: 7px; } @@ -1246,3 +1242,10 @@ label.normal { .error { color: red; } + +/* START Overwrite opentip styles */ +.ot-header h1 { + font-size: 16px; + word-wrap: break-word; +} +/* END Overwrite opentip styles */ diff --git a/gui/baculum/themes/Baculum-v1/wizard-bottom-1.png b/gui/baculum/themes/Baculum-v1/wizard-bottom-1.png new file mode 100644 index 0000000000..c8f9e11c38 Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/wizard-bottom-1.png differ diff --git a/gui/baculum/themes/Baculum-v1/wizard-bottom.png b/gui/baculum/themes/Baculum-v1/wizard-bottom.png deleted file mode 100644 index e3b991fab0..0000000000 Binary files a/gui/baculum/themes/Baculum-v1/wizard-bottom.png and /dev/null differ diff --git a/gui/baculum/themes/Baculum-v1/wizard-content.png b/gui/baculum/themes/Baculum-v1/wizard-content.png deleted file mode 100644 index 01bdfb58ef..0000000000 Binary files a/gui/baculum/themes/Baculum-v1/wizard-content.png and /dev/null differ diff --git a/gui/baculum/themes/Baculum-v1/wizard-header-1.png b/gui/baculum/themes/Baculum-v1/wizard-header-1.png new file mode 100644 index 0000000000..9101fa17ae Binary files /dev/null and b/gui/baculum/themes/Baculum-v1/wizard-header-1.png differ diff --git a/gui/baculum/themes/Baculum-v1/wizard-header.png b/gui/baculum/themes/Baculum-v1/wizard-header.png deleted file mode 100644 index 0bfda5fc90..0000000000 Binary files a/gui/baculum/themes/Baculum-v1/wizard-header.png and /dev/null differ diff --git a/gui/baculum/themes/Baculum-v1/wizard.css b/gui/baculum/themes/Baculum-v1/wizard.css index 98a99d9daf..dd0ea6f68f 100644 --- a/gui/baculum/themes/Baculum-v1/wizard.css +++ b/gui/baculum/themes/Baculum-v1/wizard.css @@ -1,28 +1,40 @@ .wizard { + min-height: 547px; + width: 1024px; margin: 50px auto; - height: 547px; - width: 752px; font-family: Arial; color: white; - } - + background-color: #585756; + background-image: url('step-head.png'); + background-repeat: repeat-x; + border: 1px solid black; + border-radius: 15px; +} + .steps { padding: 8px 20px; - min-height: 435px; - background-image: url('wizard-content.png'); - background-repeat: repeat-y; - } +} -.steps-bar { - background-image: url('step-bar.png'); - background-repeat: no-repeat; - } +.steps div.line { + text-align: center; +} +.steps div.text, .steps div.field { + display: inline-block; + text-align: left; +} + +.steps div.field { + width: 420px; +} + .navigation { text-align: center; padding: 5px 0; - background-image: url('wizard-bottom.png'); - background-repeat: no-repeat; + background-image: url('wizard-bottom-1.png'); + background-repeat: repeat-x; + border-bottom-left-radius: 14px; + border-bottom-right-radius: 14px; } .step { @@ -59,12 +71,12 @@ .step-last { width: 130px; - background-image: url('step-last.png'); + background-image: url('step-last-1.png'); } .step-last-active { width: 130px; - background-image: url('step-last-active.png'); + background-image: url('step-last-active-1.png'); } .step-last-next-active{ @@ -84,78 +96,13 @@ background-image: url('step-prev-active.png'); } -#licence { - width: 650px; - height: 300px; - overflow: auto; - border: 1px solid gray; - margin: auto; - padding: 5px; -} - #title { clear: left; font-size: 14px; font-weight: bold; - background-image: url('wizard-header.png'); - background-repeat: no-repeat; - padding: 4px; -} - -#licence-agree { - width: 670px; - margin: 10px auto; -} - -#restore-browser { - width: 100%; - height: 100%; -} - -#restore-browser-files { - width: 315px; - height: 434px; -} - -#restore-browser-files, #restore-browser-versions, #restore-browser-selected { - overflow: auto; - width: 339px; - background-color: white; - -webkit-border-radius: 4px; - -moz-border-radius: 4px; - border-radius: 4px; + background-image: url('wizard-header-1.png'); + background-repeat: repeat-x; padding: 4px; - -moz-user-select: -moz-none; - -webkit-user-select: none; - -ms-user-select: none; -} - -#restore-browser-files { - height: 430px; -} - -#restore-browser-versions { - height: 206px; -} - -#restore-browser-selected { - height: 206px; -} - -#restore-browser-files-loading { - position: absolute; - z-index: 10; - width: 347px; - height: 438px; - border-radius: 4px; - background: rgba(182,182,182,0.7) url('progress.gif') no-repeat center center; -} - -.file-browser-watermark { - padding: 64px 10px; - text-align: center; - font-size: 21px; - color: rgb(185, 184, 184); } div.button-cancel {