PR#50456: Issue 50454 - Fix Cockpit UI branding - 389-ds-base

389-ds-base

#50456 Issue 50454 - Fix Cockpit UI branding

Closed 3 years ago by spichugi. Opened 4 years ago by mreynolds.

mreynolds/389-ds-base issue50454 into master

Issue 50454 - Fix Cockpit UI branding

Mark Reynolds • 4 years ago

5c0198d

rpm/389-ds-base.spec.in

file modified

+4 -2

		`@@ -410,8 +410,10 @@`
		`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`

src/cockpit/389-console/src/rhds-banner.html

file removed

-16

		`@@ -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`

src/cockpit/389-console/webpack.config.js

file modified

-1

		`@@ -32,7 +32,6 @@`
		`"index.html",`
		`"replication.html",`
		`"replication.js",`
		`- "rhds-banner.html",`
		`"schema.html",`
		`"schema.js",`
		`"security.html",`

mreynolds commented 4 years ago

Bug Description:

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

Fix Description:

Create a new manifest & XML files just for RHEL and in the specfile replace the those files as needed for RHEL or non-RHEL package packages.

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

vashirov commented 4 years ago

I think it would be better to put branding files to RHEL dist-git: patch for Makefile.am plus xml and json files. Or even a single patch that will rename the xml and replace with RHDS branding. This way upstream will be distro-agnostic.

mhonek commented 4 years ago

I have to double what Viktor said. We should separate the two, even though it means a bit more burden downstream. Additionally, AFAIR there is already some branding content in place which should be moved as well, or did we already do that...?

mreynolds commented 4 years ago

After discussing with Viktor I'm going to remove all the special branding files, and simply do a sed replacement of "389 Directory Server" to "Red Hat Directory Server" in the downstream RHEL specfile.

rebased onto 33fe99a96c67fe6d21f52ed508c181efbd6bbe60

4 years ago

vashirov commented 4 years ago

Looks good on both Fedora and RHEL8. You have my ack!

rebased onto f6e24e47b5599bbf53fdbbb73dd2b7bd7d8a9fc9

4 years ago

rebased onto 5c0198d

4 years ago

Pull-Request has been merged by mreynolds

4 years ago