New commit detected on ManageIQ/manageiq-ui-service/fine: https://github.com/ManageIQ/manageiq-ui-self_service/commit/ba3c05bb2cbb7471bff39221efa1262c70c6e875 commit ba3c05bb2cbb7471bff39221efa1262c70c6e875 Author: Chris Kacerguis <chriskacerguis.github.com> AuthorDate: Mon Apr 10 14:31:04 2017 -0500 Commit: Satoe Imaishi <simaishi> CommitDate: Tue Apr 11 12:38:34 2017 -0400 Merge pull request #662 from chalettu/cockpit-console-labeling (Cockpit and HTML5) are inconsistent between Service and OPS UI (cherry picked from commit 6ca29f2ddcd414741c0c68943c33c09f2b5d4c92) https://bugzilla.redhat.com/show_bug.cgi?id=1441321 client/app/services/service-details/service-details.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
Created attachment 1274080 [details] Vm and web console Changes are not there for OPS UI . SUI shows : VM console and cockpit console OPS UI : VM console and web console
This needs to be send to UI - Ops. The SUI has made the change requested. Sending to Dan.
https://github.com/ManageIQ/manageiq-ui-classic/pull/1429
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/e83c818315c35f9e86edb3299c6976431a780615 commit e83c818315c35f9e86edb3299c6976431a780615 Author: Brian McLaughlin <bmclaugh> AuthorDate: Wed May 24 14:05:17 2017 -0400 Commit: Brian McLaughlin <bmclaugh> CommitDate: Wed May 24 14:05:57 2017 -0400 Rename 'Web Console' to 'Cockpit Console' https://bugzilla.redhat.com/show_bug.cgi?id=1441321 app/helpers/application_helper/toolbar/container_node_center.rb | 2 +- app/helpers/application_helper/toolbar/x_vm_center.rb | 2 +- app/helpers/application_helper/toolbar/x_vm_cloud_center.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Proposed design is here: https://github.com/cockpit-project/cockpit/wiki/Product-Integration Please ping me with any questions.
Looks cool! @Loic - should we implement this in the SUI?
Note that there should not be any reference to "Cockpit" in the UI
A little fuzzy here, taking up the pt on the sui, we have "open vm console" and "open cockpit console". These should be renamed to "vm console" and what? I believe these are both web consoles... looking at git history maybe MartinH got some clearer vision on this?
@allen - I was more referring to the redo that @serena suggested via Comment #8
OK, current state: Service UI: client/app/services/service-details/service-details.html 289: <a href="#" translate>Open VM Console</a> 294: <a href="#" translate>Open Cockpit Console</a> Renamed from "HTML5" to "VM" in https://github.com/ManageIQ/manageiq-ui-service/pull/662 . ("Open" is still there and has not been removed yet.) Ops UI: app/helpers/application_helper/toolbar/x_vm_center.rb 260: N_('VM Console'), 283: N_('Cockpit Console'), Renamed from "Web" to "Cockpit" in https://github.com/ManageIQ/manageiq-ui-classic/pull/1429 . So, guessing this is done, with the PRs being https://github.com/ManageIQ/manageiq-ui-service/pull/662 and https://github.com/ManageIQ/manageiq-ui-classic/pull/1429 . (Unless that "Open" difference is important too..)
New commit detected on ManageIQ/manageiq-ui-service/master: https://github.com/ManageIQ/manageiq-ui-self_service/commit/50a102f5c42f42b88446f2de47cd1424e8ab554c commit 50a102f5c42f42b88446f2de47cd1424e8ab554c Author: Martin Hradil <mhradil> AuthorDate: Thu Jun 15 11:41:05 2017 +0000 Commit: Martin Hradil <mhradil> CommitDate: Thu Jun 15 11:41:05 2017 +0000 Unify console names between ops & service UI - VM Console & Web Console https://bugzilla.redhat.com/show_bug.cgi?id=1441321 client/app/services/service-details/service-details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commit detected on ManageIQ/manageiq-ui-service/fine: https://github.com/ManageIQ/manageiq-ui-self_service/commit/6ff1ce3c4a7199a1368596f9c203ee12f043f5f9 commit 6ff1ce3c4a7199a1368596f9c203ee12f043f5f9 Author: Chris Kacerguis <chriskacerguis.github.com> AuthorDate: Thu Jun 15 08:07:21 2017 -0500 Commit: Satoe Imaishi <simaishi> CommitDate: Thu Jun 15 12:07:15 2017 -0400 Merge pull request #819 from himdel/web-console Unify console names between ops & service UI - VM Console & Web Console (cherry picked from commit 077ec15363d4649cc70532498a2fea3a07dd9e25) https://bugzilla.redhat.com/show_bug.cgi?id=1441321 client/app/services/service-details/service-details.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
New commit detected on ManageIQ/manageiq-ui-classic/master: https://github.com/ManageIQ/manageiq-ui-classic/commit/71b190453bb5a75d6620d82e5eda1a5eab5d106b commit 71b190453bb5a75d6620d82e5eda1a5eab5d106b Author: Martin Hradil <mhradil> AuthorDate: Thu Jun 15 11:32:40 2017 +0000 Commit: Martin Hradil <mhradil> CommitDate: Thu Jun 15 11:34:24 2017 +0000 Rename 'Cockpit Console' to 'Web Console', per cockpit product integration guidelines See discussion in https://github.com/ManageIQ/manageiq-ui-classic/pull/1429 and https://bugzilla.redhat.com/show_bug.cgi?id=1441321 https://bugzilla.redhat.com/show_bug.cgi?id=1441321 app/helpers/application_helper/toolbar/container_node_center.rb | 2 +- app/helpers/application_helper/toolbar/x_vm_center.rb | 2 +- app/helpers/application_helper/toolbar/x_vm_cloud_center.rb | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-)
Verification blocked by https://bugzilla.redhat.com/show_bug.cgi?id=1466114
Fixed in 5.8.1.0.20170623170756_3ed4411
Since the problem described in this bug report should be resolved in a recent advisory, it has been closed with a resolution of ERRATA. For information on the advisory, and where to find the updated files, follow the link below. If the solution does not work for you, open a new bug report. https://access.redhat.com/errata/RHSA-2017:1758