File webui-branding-suse.patch of Package bareos
diff '--color=auto' -ru a/webui/config/autoload/global.php.in b/webui/config/autoload/global.php.in
--- a/webui/config/autoload/global.php.in 2022-08-05 11:40:11.000000000 +0200
+++ b/webui/config/autoload/global.php.in 2022-11-21 10:14:16.089206447 +0100
@@ -124,6 +124,13 @@
$arr['restore']['filetree_refresh_timeout'] = 120000;
}
+ if( array_key_exists('suse', $configuration) && array_key_exists('extra-navhtml', $configuration['suse']) && isset($configuration['suse']['extra-navhtml']) ) {
+ $arr['suse']['extra-navhtml'] = $configuration['suse']['extra-navhtml'];
+ }
+ else {
+ $arr['suse']['extra-navhtml'] = '';
+ }
+
return $arr;
}
diff '--color=auto' -ru a/webui/module/Application/view/layout/layout.phtml.in b/webui/module/Application/view/layout/layout.phtml.in
--- a/webui/module/Application/view/layout/layout.phtml.in 2022-08-05 11:40:11.000000000 +0200
+++ b/webui/module/Application/view/layout/layout.phtml.in 2022-11-21 10:16:05.341830613 +0100
@@ -1,5 +1,4 @@
<?php
-
/**
*
* bareos-webui - Bareos Web-Frontend
@@ -134,16 +133,19 @@
<span class="icon-bar"></span>
<span class="icon-bar"></span>
</button>
- <a href="<?php echo $this->url('dashboard', array('action' => 'index')); ?>" target="_self"><img src="<?php echo $this->basePath('img/bareos-logo-small.png') ?>" alt="Bareos" /></a>
+ <a class="navbar-brand" href="<?php echo $this->url('dashboard', array('action' => 'index')); ?>" target="_self"><img src="<?php echo $this->basePath('img/chameleon-neg.svg') ?>" alt="Bareos" id="navlogo" /></a>
</div>
<div class="collapse navbar-collapse">
<?php echo $this->navigation('navigation')->menu()->setMinDepth(0)->setMaxDepth(0)->setUlClass('nav navbar-nav'); ?>
<ul class="nav navbar-nav navbar-right">
+ <!--li class="dropdown">
+ <a href="https://www.bareos.com/en/Subscription.html" title="https://www.bareos.com/en/Subscription.html" target="_blank">Get official binaries and support on bareos.com</a>
+ </li-->
<li class="dropdown">
- <a href="@BareosComSubscriptionLink@" title="@BareosComSubscriptionLink@" target="_blank">@BareosGetOfficialBinariesAndSupportOnBareosComMainPage@</a>
+ <?php echo $_SESSION['bareos']['suse_extra-navhtml']; ?>
</li>
<li class="dropdown">
- <a href="#"><?php echo 'Version: ' . $bareos_full_version; ?></a>
+ <a href="#"><?php echo 'Bareos Version: ' . $bareos_full_version; ?></a>
</li>
<li class="dropdown">
<?php echo $this->UpdateAlert($_SESSION['bareos']['product-updates-status'],$_SESSION['bareos']['dird-update-available']); ?>
@@ -162,10 +164,10 @@
</a>
<ul class="dropdown-menu" role="menu">
<li><a href="https://docs.bareos.org" target="_blank"><?php echo $this->translate("Documentation"); ?></a></li>
- <li><a href="https://www.bareos.org/en/howto-contribute.html#mailinglists" target="_blank"><?php echo $this->translate("Mailinglists"); ?></a></li>
+ <!--li><a href="https://www.bareos.org/en/howto-contribute.html#mailinglists" target="_blank"><?php echo $this->translate("Mailinglists"); ?></a></li>
<li><a href="https://bugs.bareos.org/" target="_blank"><?php echo $this->translate("Bugtracker"); ?></a></li>
<li><a href="http://www.bareos.com/en/Support.html" target="_blank"><?php echo $this->translate("Support"); ?></a></li>
- <li><a href="http://www.bareos.com/en/Subscription.html" target="_blank"><?php echo $this->translate("Subscription"); ?></a></li>
+ <li><a href="http://www.bareos.com/en/Subscription.html" target="_blank"><?php echo $this->translate("Subscription"); ?></a></li-->
<li role="separator" class="divider"></li>
<li><a href="<?php echo $this->url('auth', array('action' => 'logout')); ?>"><?php echo $this->translate("Logout"); ?></a></li>
</ul>
diff '--color=auto' -ru a/webui/module/Application/view/layout/login.phtml.in b/webui/module/Application/view/layout/login.phtml.in
--- a/webui/module/Application/view/layout/login.phtml.in 2022-08-05 11:40:11.000000000 +0200
+++ b/webui/module/Application/view/layout/login.phtml.in 2022-11-21 06:52:59.243517340 +0100
@@ -74,7 +74,7 @@
min-height: 100%;
}
body {
- background: linear-gradient(#0075be 50%, #ffd700 50%);
+ background: #0C322C;
}
p, a:link, a:visited, a:hover, a:active {
color: #000;
@@ -86,15 +86,17 @@
?>
<div class="container text-center">
- <img src="<?php echo $this->basePath() . '/img/bareos.png'; ?>" />
+ <img id="frontlogo" src="<?php echo $this->basePath() . '/img/chameleon-neg.png'; ?>" />
+ <h4>Welcome to the SUSE internal Bareos backup system!</h4>
+ <p id="infotext">Please log in with your IDP credentials.</p>
<br /><br /><br />
<?php echo $this->content; ?>
<br />
- <p>
- <a href="@BareosComSubscriptionLink@" title="@BareosComSubscriptionLink@" target="_blank">@BareosGetOfficialBinariesAndSupportOnBareosComLoginPage@</a><br/>
+ <!--p>
+ <a href="https://www.bareos.com/en/Subscription.html" title="https://www.bareos.com/en/Subscription.html" target="_blank">Get official binaries and support on bareos.com</a><br/>
Version <?php echo $bareos_full_version; ?> © 2013 - <?php echo date('Y') ?> <a href="http://www.bareos.com/" target="_blank">Bareos GmbH & Co. KG</a>,<br />
GNU Affero General Public License Version 3
- </p>
+ </p-->
</div>
<?php echo $this->inlineScript() ?>
diff '--color=auto' -ru a/webui/module/Auth/src/Auth/Controller/AuthController.php b/webui/module/Auth/src/Auth/Controller/AuthController.php
--- a/webui/module/Auth/src/Auth/Controller/AuthController.php 2022-08-05 11:40:11.000000000 +0200
+++ b/webui/module/Auth/src/Auth/Controller/AuthController.php 2022-11-21 10:15:01.693466986 +0100
@@ -124,6 +124,7 @@
$session->offsetSet('dt_statesave', ($configuration['configuration']['tables']['save_previous_state']) ? 'true' : 'false');
$session->offsetSet('dashboard_autorefresh_interval', $configuration['configuration']['dashboard']['autorefresh_interval']);
$session->offsetSet('filetree_refresh_timeout', $configuration['configuration']['restore']['filetree_refresh_timeout']);
+ $session->offsetSet('suse_extra-navhtml', $configuration['configuration']['suse']['extra-navhtml']);
if(isset($configuration['configuration']['autochanger']['labelpooltype'])) {
$session->offsetSet('ac_labelpooltype', $configuration['configuration']['autochanger']['labelpooltype']);
diff '--color=auto' -ru a/webui/public/css/style.css b/webui/public/css/style.css
--- a/webui/public/css/style.css 2022-08-05 11:40:11.000000000 +0200
+++ b/webui/public/css/style.css 2022-11-21 07:47:43.235587201 +0100
@@ -120,3 +120,32 @@
.fixed-table-container.table-no-bordered {
border: 1px solid transparent!important;
}
+
+/* Custom CSS for SUSE branding below */
+#infotext, h4 {
+ color: white;
+}
+#frontlogo {
+ width: 20%;
+}
+#navlogo {
+ width: 110px;
+ height: 80px;
+ margin-top: -33px;
+}
+.navbar, .dropdown-menu {
+ background: #0C322C;
+}
+.dropdown-menu > li > a:hover {
+ background-color: #30BA78;
+}
+.navbar .navbar-nav>.open>a:focus, .navbar .navbar-nav>.open>a:hover {
+ background-color: #30BA78;
+}
+.nav.navbar-nav li a, .nav.navbar-nav li:hover a:hover {
+ color: white;
+}
+.bg-primary {
+ background: #0C322C;
+}
+
