[node-patches] Change in ovirt-node[master]: satellite: Let page fit on 80x24

[fabiand at redhat.com]

Fabian Deutsch has uploaded a new change for review.

Change subject: satellite: Let page fit on 80x24
......................................................................

satellite: Let page fit on 80x24

Server and port are pulled into one row, to not push the buttons out of
the page.
Additionally the rhn stuff is only imported on Red Hat - where it is
available.

Change-Id: Idc8837336ebc517140bce03dec92db5440176279
Bug-Url: https://bugzilla.redhat.com/show_bug.cgi?id=1065261
Signed-off-by: Fabian Deutsch <fabiand at fedoraproject.org>
---
M src/ovirt/node/setup/rhn/rhn_page.py
1 file changed, 8 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-node refs/changes/53/33953/1

diff --git a/src/ovirt/node/setup/rhn/rhn_page.py b/src/ovirt/node/setup/rhn/rhn_page.py
index c28f65f..36e31fa 100644
--- a/src/ovirt/node/setup/rhn/rhn_page.py
+++ b/src/ovirt/node/setup/rhn/rhn_page.py
@@ -21,7 +21,7 @@
 from ovirt.node import plugins, valid, ui, utils
 import rhn_model
 from ovirt.node.plugins import Changeset
-from ovirt.node.utils import process
+from ovirt.node.utils import process, system
 from ovirt.node.utils.network import NodeNetwork
 import os.path
 import logging
@@ -68,9 +68,10 @@
 
 
 def sam_check():
-    import rhnreg
-    if rhnreg.rhsm_registered():
-        return True
+    if system.SystemRelease().is_redhat():
+        import rhnreg
+        if rhnreg.rhsm_registered():
+            return True
     return False
 
 
@@ -202,9 +203,9 @@
                   ui.Options("rhn.type", "Type", self._rhn_types),
                   ui.Entry("rhn.url", "URL:"),
                   ui.Entry("rhn.ca", "CA URL:"),
-                  ui.Header("header[0]", "HTTP Proxy Configuration"),
-                  ui.Entry("rhn.proxyhost", "Server:"),
-                  ui.Entry("rhn.proxyport", "Port:"),
+                  ui.Header("header[1]", "HTTP Proxy Configuration"),
+                  ui.Row("row[0]", [ui.Entry("rhn.proxyhost", "Server:"),
+                                    ui.Entry("rhn.proxyport", "  Port:")]),
                   ui.Entry("rhn.proxyuser", "Username:"),
                   ui.PasswordEntry("rhn.proxypassword", "Password:"),
                   ui.Divider("divider[1]"),


-- 
To view, visit http://gerrit.ovirt.org/33953
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idc8837336ebc517140bce03dec92db5440176279
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-node
Gerrit-Branch: master
Gerrit-Owner: Fabian Deutsch <fabiand at redhat.com>