From 5c0198d998a66fad123231dbb103812c1e16046f Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Jun 19 2019 19:41:04 +0000
Subject: Issue 50454 - Fix Cockpit UI branding


Bug Description:  On RHEL we still displayed "389 Directory Server" in
                  the Cockpit vertical navigation panel instead of
                  "Red Hat Directory Server".

Fix Description:  Instead of using separate files, just do a "sed" replacement
                  in the specfile to handle the branding

https://pagure.io/389-ds-base/issue/50454

Reviewed by: viktor & mhonek (Thanks!!)

---

diff --git a/rpm/389-ds-base.spec.in b/rpm/389-ds-base.spec.in
index 988fc0e..596c843 100644
--- a/rpm/389-ds-base.spec.in
+++ b/rpm/389-ds-base.spec.in
@@ -410,8 +410,10 @@ mkdir -p %{buildroot}%{_datadir}/cockpit
 make DESTDIR="$RPM_BUILD_ROOT" install
 
 # Cockpit branding, and directory and file list
-%if 0%{?rhel} > 7
-mv -f %{buildroot}%{_datadir}/cockpit/389-console/rhds-banner.html %{buildroot}%{_datadir}/cockpit/389-console/banner.html
+%if 0%{?rhel}
+sed -i  "s/389 Directory Server/Red Hat Directory Server/" %{buildroot}%{_datadir}/cockpit/389-console/banner.html
+sed -i  "s/389 Directory Server/Red Hat Directory Server/" %{buildroot}%{_datadir}/cockpit/389-console/manifest.json
+sed -i  "s/389 Directory Server/Red Hat Directory Server/" %{buildroot}%{_datadir}/metainfo/389-console/org.port389.cockpit_console.metainfo.xml
 %endif
 find %{buildroot}%{_datadir}/cockpit/389-console -type d | sed -e "s@%{buildroot}@@" | sed -e 's/^/\%dir /' > cockpit.list
 find %{buildroot}%{_datadir}/cockpit/389-console -type f | sed -e "s@%{buildroot}@@" >> cockpit.list
diff --git a/src/cockpit/389-console/src/rhds-banner.html b/src/cockpit/389-console/src/rhds-banner.html
deleted file mode 100644
index fef8826..0000000
--- a/src/cockpit/389-console/src/rhds-banner.html
+++ /dev/null
@@ -1,16 +0,0 @@
-Red Hat Directory Server Management <div class="dropdown ds-server-action"> <select class="btn btn-default dropdown ds-dropdown-server"
-      title="Directory Server Instance List" id="select-server">
-      </select></div><div class="dropdown ds-float-right"><button class="btn btn-primary dropdown-toggle ds-action-btn"
-       type="button" id="server-list-menu" data-toggle="dropdown">Actions<span class="caret"></span>
-      </button><ul class="dropdown-menu pull-right" role="menu">
-        <li role=""><a role="menuitem" id="start-server-btn" href="#">Start Instance</a></li>
-        <li role=""><a role="menuitem" id="stop-server-btn" href="#">Stop Instance</a></li>
-        <li role=""><a role="menuitem" id="restart-server-btn" href="#">Restart Instance</a></li>
-        <li role=""><a role="menuitem" id="backup-server-btn" data-toggle="modal" data-target="#backup-form" href="#">Perform Backup</a></li>
-        <li role=""><a role="menuitem" id="restore-server-btn" data-toggle="modal" data-target="#restore-form" href="#">Manage Backups</a></li>
-        <li role=""><a role="menuitem" id="reload-schema-btn" data-toggle="modal" data-target="#schema-reload-form" href="#">Reload Schema Files</a></li>
-        <li class="divider"></li>
-        <li role=""><a role="menuitem" id="remove-server-btn" href="#">Remove Instance</a></li>
-        <li role=""><a role="menuitem" id="create-server-btn" data-toggle="modal" data-target="#create-inst-form" href="#">Create Instance</a></li>
-      </ul>
-    </div>
\ No newline at end of file
diff --git a/src/cockpit/389-console/webpack.config.js b/src/cockpit/389-console/webpack.config.js
index d4ac364..8c0b433 100644
--- a/src/cockpit/389-console/webpack.config.js
+++ b/src/cockpit/389-console/webpack.config.js
@@ -32,7 +32,6 @@ var info = {
         "index.html",
         "replication.html",
         "replication.js",
-        "rhds-banner.html",
         "schema.html",
         "schema.js",
         "security.html",