client/rhel
by StephenHerr
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 6f29fb68190e3e518a3e2d3532ff55bff2886bf0
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Sep 13 16:35:38 2012 -0400
823551 - fixing problem with firstboot
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
index c4e9f93..517965a 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
@@ -63,7 +63,7 @@ class moduleClass(Module):
try:
self.rhsmActive = False
if self.chooseServerPage.chooseServerPageApply() is False:
- interface.moveToPage(moduleTitle=_("Red Hat Login"))
+ interface.moveToPage(moduleTitle=_("Red Hat Account"))
return RESULT_JUMP
else:
return RESULT_FAILURE
11 years, 7 months
client/rhel
by StephenHerr
client/rhel/rhn-client-tools/data/progress.glade | 4
client/rhel/rhn-client-tools/data/rh_register.glade | 396 +++++++---
client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py | 4
client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py | 4
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 18
client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 46 -
6 files changed, 321 insertions(+), 151 deletions(-)
New commits:
commit 0e0748e24aab0b5b03eb6a7308bd98a277ef319a
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Sep 13 15:49:25 2012 -0400
823551 - gui and text changes for firstboot and rhn_register
diff --git a/client/rhel/rhn-client-tools/data/progress.glade b/client/rhel/rhn-client-tools/data/progress.glade
index 23ada9a..9b358be 100644
--- a/client/rhel/rhn-client-tools/data/progress.glade
+++ b/client/rhel/rhn-client-tools/data/progress.glade
@@ -5,7 +5,7 @@
<widget class="GtkWindow" id="progressWindow">
<property name="visible">True</property>
- <property name="title" translatable="yes">Progress Dialog</property>
+ <property name="title" translatable="yes">Sending Information</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER_ON_PARENT</property>
<property name="modal">True</property>
@@ -21,7 +21,7 @@
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Progress Dialog</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Sending Information</atkproperty>
</accessibility>
<child>
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index c769a68..2d6d48a 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -146,7 +146,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkWindow" id="chooseServerWindow">
<property name="visible">True</property>
- <property name="title" translatable="yes">Choose Server</property>
+ <property name="title" translatable="yes">Choose Service</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -176,7 +176,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="chooseServerLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">You may connect your system to <b>Red Hat Network</b> (https://rhn.redhat.com/) or to a <b>Red Hat Network Satellite</b> or <b>Red Hat Network Proxy</b> in order to receive software updates.</property>
+ <property name="label" translatable="yes" context="yes">I'd like to register with:</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -190,6 +190,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">I'd like to register with:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -225,6 +228,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkRadioButton" id="rhsmButton">
+ <property name="tooltip" translatable="yes">Red Hat Subscription Management offers improved management and tracking of subscriptions and access to content. It is the recommended and default registration option.</property>
<property name="visible">False</property>
<property name="no_show_all">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
@@ -239,7 +243,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkLabel" id="label143">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">I'd like to receive updates from <b>Red Hat Network</b> or <b>Subscription Asset Manager</b> (using next-generation of entitlement management).</property>
+ <property name="label" translatable="yes" context="yes">Red Hat Subscription Management</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -253,6 +257,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Red Hat Subscription Management</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -265,6 +272,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkRadioButton" id="hostedButton">
+ <property name="tooltip" translatable="yes">RHN Classic provides system-level support and management of Red Hat systems and networks. Red Hat Subscription Management is the recommended service to use, but RHN Classic is still available.</property>
<property name="visible">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -277,7 +285,7 @@ You may access the software update tool by running <b>Software Update</
<widget class="GtkLabel" id="label96">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">I'd like to receive updates from <b>Red Hat Network Classic</b>. (I don't have access to a Red Hat Network Satellite or Proxy.)</property>
+ <property name="label" translatable="yes" context="yes">Red Hat Network (RHN) Classic</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -291,6 +299,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Red Hat Network (RHN) Classic</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -304,6 +315,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkRadioButton" id="satelliteButton">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Satellite users have the benefits of RHN Classic without having to provide Internet access to connected systems. Proxy users enjoy reduced bandwidth requirements for RHN Classic and can deploy custom packages.</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="active">False</property>
@@ -315,7 +327,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="label97">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">I have access to a <b>Red Hat Network Satellite</b> or <b>Red Hat Network Proxy</b>. I'd like to receive software updates from the Satellite or Proxy below:</property>
+ <property name="label" translatable="yes" context="yes">An RHN Satellite or RHN Proxy</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -329,6 +341,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">An RHN Satellite or RHN Proxy</atkproperty>
+ </accessibility>
</widget>
</child>
</widget>
@@ -352,46 +367,44 @@ You may access the software update tool by running <b>Software Update</
<property name="right_padding">1</property>
<child>
- <widget class="GtkTable" id="customServerTable">
+ <widget class="GtkHBox" id="customServerTable">
<property name="visible">True</property>
- <property name="sensitive">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
<property name="homogeneous">False</property>
- <property name="row_spacing">0</property>
- <property name="column_spacing">0</property>
+ <property name="spacing">0</property>
<child>
<widget class="GtkLabel" id="label93">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">RHN _Location:</property>
- <property name="use_underline">True</property>
+ <property name="label" translatable="yes" context="yes">Location:</property>
+ <property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0</property>
+ <property name="xalign">0.5</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
- <property name="mnemonic_widget">satelliteServerEntry</property>
<property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Location:</atkproperty>
+ </accessibility>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_options"></property>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
<widget class="GtkEntry" id="satelliteServerEntry">
<property name="visible">True</property>
+ <property name="tooltip" translatable="yes">Example: https://satellite.example.com/XMLRPC</property>
+ <property name="can_focus">True</property>
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
@@ -399,77 +412,14 @@ You may access the software update tool by running <b>Software Update</
<property name="has_frame">True</property>
<property name="invisible_char">•</property>
<property name="activates_default">False</property>
- <property name="width_chars">35</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">satellite server location</atkproperty>
</accessibility>
- <signal name="changed" handler="onSatelliteServerEntryChanged"/>
- <signal name="focus_in_event" handler="onSatelliteServerEntryFocused"/>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">0</property>
- <property name="bottom_attach">1</property>
- <property name="x_padding">10</property>
- <property name="x_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <widget class="GtkImage" id="image1">
- <property name="visible">True</property>
- <property name="stock">gtk-info</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">True</property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkLabel" id="label94">
- <property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><small><b>Example:</b> https://satellite.example.com</small></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
- <property name="width_chars">-1</property>
- <property name="single_line_mode">False</property>
- <property name="angle">0</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
- </widget>
- <packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
+ <property name="padding">5</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -500,12 +450,12 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkButton" id="advancedNetworkConfigurationButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Advanced _Network Configuration ...</property>
+ <property name="label" translatable="yes" context="yes">_Proxy Setup</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Advanced Network Configuration button</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Proxy Setup Button</atkproperty>
</accessibility>
<signal name="clicked" handler="onAdvancedNetworkConfigurationButtonClicked"/>
</widget>
@@ -546,6 +496,9 @@ You may access the software update tool by running <b>Software Update</
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Red Hat Account</atkproperty>
+ </accessibility>
<child>
<widget class="GtkVBox" id="initialLoginWindowVbox">
@@ -557,7 +510,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="instructionsLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Please enter your account information for <b>Red Hat Network</b> (http://rhn.redhat.com/)</property>
+ <property name="label" translatable="yes" context="yes">Please enter your Red Hat account information:</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -571,6 +524,9 @@ You may access the software update tool by running <b>Software Update</
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Please enter your Red Hat account information:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -627,8 +583,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkLabel" id="forgotInfoHosted">
<property name="visible">True</property>
- <property name="label" translatable="yes"><small>Tip: Forgot your login or password? Look it up at
-https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
+ <property name="label" translatable="yes"><small>Tip: Forgot your login or password? Look it up at http://red.ht/lost_password</small></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -643,6 +598,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
<property name="no_show_all">True</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Tip: Forgot your login or password? Look it up at http://red.ht/lost_password</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1422,7 +1380,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label98">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">This assistant will guide you through connecting your system to Red Hat Network (RHN) to receive software updates, including security updates, to keep your system supported and compliant. You will need the following at this time:</property>
+ <property name="label" translatable="yes" context="yes">This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1436,6 +1394,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">This assistant will guide you through the process of registering your system with Red Hat to receive software updates and other benefits. You will need the following to register:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1490,7 +1451,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label36">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• Your Red Hat Network or Red Hat Network Satellite login </property>
+ <property name="label" translatable="yes" context="yes">• Your Red Hat account login</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1504,6 +1465,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Your Red Hat account login</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1515,7 +1479,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">• The location of your Red Hat Network Satellite or Proxy (optional)</property>
+ <property name="label" translatable="yes" context="yes">• A Red Hat subscription that covers your product</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -1529,6 +1493,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">A Red Hat subscription that covers your product</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -1536,6 +1503,64 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="fill">True</property>
</packing>
</child>
+ <child>
+ <widget class="GtkHBox" id="hbox34">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label143">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" context="yes">• (optional) The address of an alternate service</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">(optional) The address of an alternate service</atkproperty>
+ </accessibility>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="MoreInfoButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">_More Info</property>
+ <property name="use_underline">True</property>+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">More Info</atkproperty>
+ </accessibility>
+ <signal name="clicked" handler="onMoreInfoButtonClicked"/>
+ </widget>
+ <packing>
+ <property name="padding">20</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
</child>
</widget>
@@ -1556,10 +1581,13 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<widget class="GtkButton" id="whyRegisterButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">_Why Should I Connect to RHN? ...</property>
+ <property name="label" translatable="yes" context="yes">_Why Should I Register?</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Why Should I Register?</atkproperty>
+ </accessibility>
<signal name="clicked" handler="onWhyRegisterButtonClicked"/>
</widget>
<packing>
@@ -2359,7 +2387,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label115">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">You'll want to choose a name for this system so you'll be able to identify it in the Red Hat Network interface.</property>
+ <property name="label" translatable="yes" context="yes">A recognizable name will help you identify this system in a management interface.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2373,6 +2401,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">A recognizable name will help you identify this system in a management interface.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -2510,7 +2541,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label118">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">You'll need to send us a profile of what packages and hardware are installed on your system so we can determine what updates are available.</property>
+ <property name="label" translatable="yes" context="yes">Send us a profile of your current hardware and packages so we can determine what updates are available.</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2524,6 +2555,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Send us a profile of your current hardware and packages so we can determine what updates are available.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -2691,7 +2725,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label119">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Connecting your system to Red Hat Network allows you to take full advantage of the benefits of a paid subscription, including:</property>
+ <property name="label" translatable="yes" context="yes">Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -2705,6 +2739,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_request">600</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Registering your system with Red Hat allows you to take full advantage of the benefits of a paid subscription, including:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -2727,12 +2764,12 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<widget class="GtkButton" id="backToRegistrationButton">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">_Take me back to the registration</property>
+ <property name="label" translatable="yes" context="yes">_Close</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Take me back to the registration</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Close</atkproperty>
</accessibility>
<signal name="clicked" handler="onBackToRegistrationButtonClicked"/>
</widget>
@@ -3055,7 +3092,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label67">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Compliance:</b></property>
+ <property name="label" translatable="yes" context="yes"><b>Management:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3069,6 +3106,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Management</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -3115,7 +3155,7 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<child>
<widget class="GtkLabel" id="label68">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Stay in compliance with your subscription agreement and manage subscriptions for systems connected to your account at http://rhn.redhat.com/.</property>
+ <property name="label" translatable="yes" context="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -3129,6 +3169,9 @@ https://www.redhat.com/wapps/sso/rhn/lostPassword.html</small></property>
<property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -3554,7 +3597,7 @@ You may access the software update tool by running <b>Software Update</
</widget>
<widget class="GtkDialog" id="networkConfigDialog">
- <property name="title" translatable="yes">Advanced Network Configuration</property>
+ <property name="title" translatable="yes">Proxy Configuration</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_CENTER</property>
<property name="modal">False</property>
@@ -3655,7 +3698,7 @@ You may access the software update tool by running <b>Software Update</
<child>
<widget class="GtkCheckButton" id="enableProxyButton">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">I would like to connect to Red Hat Network via an _HTTP proxy.</property>
+ <property name="label" translatable="yes" context="yes">I would like to connect via an _HTTP proxy.</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
@@ -4180,7 +4223,7 @@ Are you sure you would like to continue?</property>
</widget>
<widget class="GtkDialog" id="confirmQuitDialog">
- <property name="title" translatable="yes"></property>
+ <property name="title" translatable="yes">Are you Sure?</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -4209,13 +4252,13 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button1">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_Take me back to the setup process.</property>
+ <property name="label" translatable="yes" context="yes">_Go Back and Register</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">0</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Take me back to the setup process.</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Go Back and Register</atkproperty>
</accessibility>
</widget>
</child>
@@ -4223,13 +4266,13 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkButton" id="button2">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">_No thanks, I'll connect later.</property>
+ <property name="label" translatable="yes" context="yes">Register _Later</property>
<property name="use_underline">True</property>
<property name="relief">GTK_RELIEF_NORMAL</property>
<property name="focus_on_click">True</property>
<property name="response_id">1</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">No thanks, I'll connect later.</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Register Later</atkproperty>
</accessibility>
</widget>
</child>
@@ -4252,7 +4295,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label25">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">Are you sure you don't want to connect your system to Red Hat Network? You'll miss out on the benefits of a Red Hat Enterprise Linux subscription:</property>
+ <property name="label" translatable="yes" context="yes">Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription:</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4266,6 +4309,9 @@ Are you sure you would like to continue?</property>
<property name="width_request">600</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Are you sure you don't want to register your system with Red Hat? You'll miss out on the benefits of a Red Hat Enterprise Linux Subscription:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4577,7 +4623,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label30">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes"><b>Compliance:</b></property>
+ <property name="label" translatable="yes" context="yes"><b>Management:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4591,6 +4637,9 @@ Are you sure you would like to continue?</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Management:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4638,7 +4687,7 @@ Are you sure you would like to continue?</property>
<widget class="GtkLabel" id="label42">
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="label" translatable="yes" context="yes">Stay in compliance with your subscription agreement and manage subscriptions for systems connected to your account at http://rhn.redhat.com/.</property>
+ <property name="label" translatable="yes" context="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4652,6 +4701,9 @@ Are you sure you would like to continue?</property>
<property name="width_request">460</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Manage subscriptions and systems registered to Customer Portal via access.redhat.com or through one of our other subscription management services.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -4681,7 +4733,7 @@ Are you sure you would like to continue?</property>
<child>
<widget class="GtkLabel" id="label26">
<property name="visible">True</property>
- <property name="label" translatable="yes" context="yes">You will <b>not</b> be able to take advantage of these subscriptions privileges without connecting your system to Red Hat Network.</property>
+ <property name="label" translatable="yes" context="yes">You will not be able to take advantage of these benefits without registering.</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -4695,6 +4747,9 @@ Are you sure you would like to continue?</property>
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">You will not be able to take advantage of these benefits without registering.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5364,7 +5419,7 @@ You'll know when software updates are available when a package icon appears in t
<widget class="GtkWindow" id="chooseChannelWindow">
<property name="visible">True</property>
- <property name="title" translatable="yes">Choose Channel</property>
+ <property name="title" translatable="yes">Operating System Release Version</property>
<property name="type">GTK_WINDOW_TOPLEVEL</property>
<property name="window_position">GTK_WIN_POS_NONE</property>
<property name="modal">False</property>
@@ -5377,6 +5432,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
<property name="focus_on_map">True</property>
<property name="urgency_hint">False</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Operating System Release Version</atkproperty>
+ </accessibility>
<child>
<widget class="GtkVBox" id="chooseChannelWindowVbox">
@@ -5388,7 +5446,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkLabel" id="channelLabelVbox">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Operating system version:</property>
+ <property name="label" translatable="yes">Select how your system will receive updates:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5402,6 +5460,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Select how your system will receive updates:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5441,7 +5502,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkLabel" id="limitedLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>_Limited updates</b> will be provided to this system to maintain compatibility with the following eligible Red Hat Enterprise Linux minor release software channel:</property>
+ <property name="label" translatable="yes"><b>_Limited updates</b> will be provided to this system, maintaining compatibility with the selected minor release software channel:</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5455,6 +5516,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Limited updates will be provided to this system, maintaining compatibility with the selected minor release software channel:</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5637,7 +5701,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkLabel" id="allUpdatesLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>_All available updates</b> will be provided to this system. This system, if kept updated, will always be equivalent to the latest available minor release of Red Hat Enterprise Linux 6. It will be registered to the main 'Red Hat Enterprise Linux 6' software channel.</property>
+ <property name="label" translatable="yes"><b>_All available updates</b> will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Red Hat Enterprise Linux x' software channel.</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5651,6 +5715,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">All available updates will be provided to this system. If kept updated, this system will always be equivalent to the latest minor release in the main 'Red Hat Enterprise Linux x' software channel.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5717,7 +5784,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkLabel" id="label137">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Warning:</b> You will <b>not</b> be able to limit this system to a minor release that is older than the most recent minor release if you select this option.</property>
+ <property name="label" translatable="yes"><b>Warning:</b> Using this option, your system will always be the most recent minor release and <b>cannot</b> be limited to an older release version.</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -5731,6 +5798,9 @@ You'll know when software updates are available when a package icon appears in t
<property name="width_chars">-1</property>
<property name="single_line_mode">False</property>
<property name="angle">0</property>
+ <accessibility>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Warning: Using this option, your system will always be the most recent minor release and cannot be limited to an older release version.</atkproperty>
+ </accessibility>
</widget>
<packing>
<property name="padding">0</property>
@@ -5757,6 +5827,96 @@ You'll know when software updates are available when a package icon appears in t
</child>
</widget>
+<widget class="GtkWindow" id="moreInfoDialog">
+ <property name="visible">True</property>
+ <property name="title" translatable="yes">More Info</property>
+ <property name="type">GTK_WINDOW_TOPLEVEL</property>
+ <property name="window_position">GTK_WIN_POS_CENTER</property>
+ <property name="modal">False</property>
+ <property name="default_width">100</property>
+ <property name="default_height">100</property>
+ <property name="resizable">True</property>
+ <property name="destroy_with_parent">False</property>
+ <property name="decorated">True</property>
+ <property name="skip_taskbar_hint">False</property>
+ <property name="skip_pager_hint">False</property>
+ <property name="type_hint">GDK_WINDOW_TYPE_HINT_DIALOG</property>
+ <property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
+
+ <child>
+ <widget class="GtkVBox" id="vbox33">
+ <property name="border_width">20</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">10</property>
+
+ <child>
+ <widget class="GtkLabel" id="label152">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes" context="yes">Alternate services include: CloudForms System Engine, Subscription Asset Manager, Red Hat Network (RHN) Satellite, and RHN Proxy.</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">True</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox37">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <widget class="GtkButton" id="closeMoreInfoButton">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes" context="yes">_Close</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <signal name="clicked" handler="onCloseMoreInfoButtonClicked"/>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ <property name="pack_type">GTK_PACK_END</property>
+ </packing>
+ </child>
+ </widget>
+ </child>
+</widget>
+
+
<widget class="GtkWindow" id="ksRegisteredFirstbootWindow">
<property name="visible">True</property>
<property name="title">Registered during installation</property>
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
index 26ab09b..c4e9f93 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_choose_server_gui.py
@@ -38,8 +38,8 @@ class moduleClass(Module):
def __init__(self):
Module.__init__(self)
self.priority = 106.5
- self.sidebarTitle = _("Choose Server")
- self.title = _("Choose Server")
+ self.sidebarTitle = _("Choose Service")
+ self.title = _("Choose Service")
self.support_sm = False
self.rhsmActive = True
diff --git a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
index 3b8eeed..145224f 100644
--- a/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
+++ b/client/rhel/rhn-client-tools/src/firstboot/rhn_login_gui.py
@@ -37,8 +37,8 @@ class moduleClass(Module):
def __init__(self):
Module.__init__(self)
self.priority = 108.5
- self.sidebarTitle = _("Red Hat Login")
- self.title = _("Red Hat Login")
+ self.sidebarTitle = _("Red Hat Account")
+ self.title = _("Red Hat Account")
def needsNetwork(self):
return True
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
index 193e266..158a7d5 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py
@@ -217,6 +217,7 @@ class StartPage:
domain="rhn-client-tools")
self.startXml.signal_autoconnect({
"onWhyRegisterButtonClicked" : self.startPageWhyRegisterButton,
+ "onMoreInfoButtonClicked" : self.startPageMoreInfoButton,
})
self.registerNowButton = self.startXml.get_widget("registerNowButton")
if not firstboot:
@@ -230,6 +231,9 @@ class StartPage:
def startPageWhyRegisterButton(self, button):
WhyRegisterDialog()
+ def startPageMoreInfoButton(self, button):
+ MoreInfoDialog()
+
def startPageRegisterNow(self):
"""Returns True if the user has selected to register now. False if
they've selected to register later.
@@ -755,7 +759,7 @@ class CreateProfilePage:
"""Returns False if everything's ok or True if something's wrong."""
setBusyCursor()
pwin = progress.Progress()
- pwin.setLabel(_("Sending your profile information to Red Hat Network. Please wait."))
+ pwin.setLabel(_("Registering system and sending profile information to Red Hat. Please wait."))
self.systemId = None
global username, password, hw_activation_code, \
_hasBaseChannelAndUpdates, chosen_channel
@@ -1143,6 +1147,18 @@ class ConfirmQuitDialog:
error)
self.dialog.destroy()
+class MoreInfoDialog:
+ def __init__(self):
+ self.moreInfoXml = gtk.glade.XML(gladefile,
+ "moreInfoDialog", domain="rhn-client-tools")
+ self.dlg = self.moreInfoXml.get_widget("moreInfoDialog")
+ self.moreInfoXml.signal_autoconnect({
+ "onCloseMoreInfoButtonClicked" : self.finish,
+ })
+
+ def finish(self, button):
+ self.dlg.hide()
+ self.rc = 1 # What does this do? Is it needed?
class WhyRegisterDialog:
def __init__(self):
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index e87fc90..86905e8 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -160,29 +160,23 @@ SUB_NUM = _("The installation number %s was activated during "
"this system's initial connection to Red Hat Network.")
SUB_NUM_RESULT = _("Subscriptions have been activated for the following "
"Red Hat products/services:")
-CHANNELS_TITLE = _("Software channel subscriptions:")
+CHANNELS_TITLE = _("Software Channel Subscriptions:")
OK_CHANNELS = _("This system will receive updates from the "
- "following Red Hat Network software channels:")
-CHANNELS_SAT_WARNING = _("Warning: If an installed product on this system "
- "is not listed above, you "
- "will not receive updates or support for that "
- "product. If you would like "
- "to receive updates for that product, please "
+ "following RHN Classic software channels:")
+CHANNELS_SAT_WARNING = _("Warning: Only installed product listed above will receive "
+ "updates and support. If you would like "
+ "to receive updates for additional products, please "
"login to your satellite web interface "
"and subscribe this system to the appropriate "
- "software channels to get updates for that "
- "product. See Kbase article 11313 "
+ "software channels. See Kbase article"
"for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)")
-CHANNELS_HOSTED_WARNING = _("Warning: If an installed product on this system "
- "is not listed above, you "
- "will not receive updates or support for that "
- "product. If you would like "
- "to receive updates for that product, please "
- "visit http://rhn.redhat.com/ "
+CHANNELS_HOSTED_WARNING = _("Warning: Only installed products listed above "
+ "will receive updates and support. If you would "
+ "like to receive updates for additional products, "
+ "please visit http://access.redhat.com/ "
"and subscribe this system to the appropriate "
- "software channels to get updates for that "
- "product. See Kbase article 11313 "
+ "software channels. See Kbase article "
"for more details. "
"(http://kbase.redhat.com/faq/docs/DOC-11313)")
YUM_PLUGIN_WARNING = _("Warning: yum-rhn-plugin is not present, could not enable it.\n"
@@ -206,10 +200,10 @@ NO_BASE_CHANNEL = _(
"appropriate active subscriptions available in your account, you may browse "
"to this system's profile in the RHN web interface and subscribe this system "
"to software channels via the software > software channels tab.")
-SLOTS_TITLE = _("RHN service level:")
-OK_SLOTS = _("Depending on what RHN modules are associated with a system, you'll "
- "enjoy different benefits of Red Hat Network. The following are the "
- "RHN modules associated with this system:")
+SLOTS_TITLE = _("RHN Classic Service Level:")
+OK_SLOTS = _("Depending on what RHN Classic modules are associated with a system, you'll "
+ "enjoy different benefits. The following are the "
+ "RHN Classic modules associated with this system:")
SLOTS = SLOTS_TITLE + "\n" + OK_SLOTS + "\n%s"
FAILED_SLOTS = _("This system was unable to be associated with the "
"following RHN module(s) because there were "
@@ -252,14 +246,14 @@ NO_SYS_ENTITLEMENT = _("This system was unable to be associated with "
"to this system's profile in the RHN web interface, delete the profile, and "
"re-connect this system to Red Hat Network.")
ACTIVATION_KEY = _("Universal default activation key detected\n"
- "A universal default activation key was detected in your RHN organization. "
- "What this means is that a set of properties (software channel subscriptions, "
- "Red Hat Network service, package installations, system group memberships, etc.) "
- "for your system's connection to Red Hat Network "
+ "A universal default activation key was detected in your RHN Classic account. "
+ "This means that a set of properties (software channel subscriptions, "
+ "package installations, system group memberships, etc.) "
+ "for your system's connection to RHN Classic "
"have been determined by the activation key rather than your "
"installation number. "
"You may also refer to the RHN Reference Guide, section 6.4.6 for more details "
- "about activation keys (http://rhn.redhat.com/rhn/help/reference/)\n"
+ "about activation keys (http://access.redhat.com/knowledge/docs/Red_Hat_Network/)\n"
"Universal Default activation key: %s")
# Error Messages.
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 2427c189bc91957dfa6cdd490eb250a175c5c4a0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 13 16:55:04 2012 +0200
856449 - validate session key for system.getSystemCurrencyMultipliers API
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index f643525..072e62e 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -4902,6 +4902,7 @@ public class SystemHandler extends BaseHandler {
* @xmlrpc.returntype Map of score multipliers
*/
public Map getSystemCurrencyMultipliers(String sessionKey) {
+ getLoggedInUser(sessionKey);
Map multipliers = new HashMap();
multipliers.put("scCrit", ConfigDefaults.get().getSCCrit());
multipliers.put("scImp", ConfigDefaults.get().getSCImp());
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit fe73d131f6e156fad886e5090815954237933784
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 13 16:43:53 2012 +0200
856458 - fix system.getSystemCurrencyScores API doc
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index 469d5e8..f643525 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -4919,7 +4919,7 @@ public class SystemHandler extends BaseHandler {
* bug fix and enhancement errata counts plus a score based on the default
* system currency multipliers.
*
- * @xmlrpc.doc Get the System Currency score multipliers
+ * @xmlrpc.doc Get the System Currency scores for all servers the user has access to
* @xmlrpc.param #param("string", "sessionKey")
* @xmlrpc.returntype
* #array()
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 893004aec4a22d22129d3983cde7d6a5eead077e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Sep 13 11:46:24 2012 +0200
856553 - display error messages only once on admin/config/GeneralConfig.do page
diff --git a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
index 53cb5f2..257d296 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/satellite/GeneralConfigAction.java
@@ -110,7 +110,6 @@ public class GeneralConfigAction extends BaseConfigAction {
if (!errors.isEmpty()) {
getStrutsDelegate().saveMessages(request, errors);
- addErrors(request, errors);
return mapping.findForward("failure");
}
11 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.8.145-1'
by Tomas Lestach
Tag 'spacewalk-java-1.8.145-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-09-12 15:39 +0000
Tagging package [spacewalk-java] version [1.8.145-1] in directory [java/].
Changes since oracle-rhnsat-selinux-10.2.0.23-1:
Tomas Lestach (2):
855884 - fixing NumberFormatException
Automatic commit of package [spacewalk-java] release [1.8.145-1].
---
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java | 48 ++++++----
java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java | 1
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 48 +++++-----
java/spacewalk-java.spec | 5 -
rel-eng/packages/spacewalk-java | 2
5 files changed, 62 insertions(+), 42 deletions(-)
---
11 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit df9cc65d836a9366c43c176ad526bc385f59df42
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Sep 12 17:39:51 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.145-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 95530ea..fd3fffc 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.144
+Version: 1.8.145
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -616,6 +616,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Wed Sep 12 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.145-1
+- 855884 - fixing NumberFormatException
+
* Tue Sep 11 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.144-1
- 713684 - localize strings after import
- 855845 - escaping system name
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 5e2bc02..19b3d32 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.144-1 java/
+1.8.145-1 java/
11 years, 7 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java | 48 ++++++----
java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java | 1
java/code/src/com/redhat/rhn/manager/system/SystemManager.java | 48 +++++-----
3 files changed, 57 insertions(+), 40 deletions(-)
New commits:
commit e61536a7202e5e66b252e4aa8ed629cd2f326b5d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Sep 11 17:27:10 2012 +0200
855884 - fixing NumberFormatException
and couple of issues with information messages
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
index 38b8d6e..c7bccea 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/virtualization/VirtualGuestsListAction.java
@@ -28,6 +28,7 @@ import com.redhat.rhn.frontend.struts.RequestContext;
import com.redhat.rhn.frontend.struts.RhnHelper;
import com.redhat.rhn.frontend.struts.RhnValidationHelper;
import com.redhat.rhn.frontend.struts.StrutsDelegate;
+import com.redhat.rhn.manager.kickstart.ProvisionVirtualInstanceCommand;
import com.redhat.rhn.manager.rhnset.RhnSetDecl;
import com.redhat.rhn.manager.system.SystemManager;
@@ -166,28 +167,41 @@ public class VirtualGuestsListAction extends BaseSystemListAction {
List<ValidatorError> validationErrors = new LinkedList<ValidatorError>();
List<ValidatorWarning> validationWarnings = new LinkedList<ValidatorWarning>();
if (dispatchAction.equals("setVcpu")) {
- Iterator it = set.getElements().iterator();
- while (it.hasNext()) {
- RhnSetElement element = (RhnSetElement)it.next();
- ValidatorResult result = SystemManager.validateVcpuSetting(
- element.getElement(), Integer.parseInt(guestSettingValue));
- validationErrors.addAll(result.getErrors());
- validationWarnings.addAll(result.getWarnings());
+ try {
+ Iterator it = set.getElements().iterator();
+ while (it.hasNext()) {
+ RhnSetElement element = (RhnSetElement)it.next();
+ ValidatorResult result = SystemManager.validateVcpuSetting(
+ element.getElement(), Integer.parseInt(guestSettingValue));
+ validationErrors.addAll(result.getErrors());
+ validationWarnings.addAll(result.getWarnings());
+ }
+ }
+ catch (NumberFormatException e) {
+ validationErrors.add(new ValidatorError(
+ "frontend.actions.systems.virt.invalidcpuvalue",
+ new Object [] {ProvisionVirtualInstanceCommand.MAX_CPU + 1}));
}
}
else if (dispatchAction.equals("setMemory")) {
- Iterator it = set.getElements().iterator();
- List virtInstanceIds = new LinkedList();
- while (it.hasNext()) {
- RhnSetElement element = (RhnSetElement)it.next();
- virtInstanceIds.add(element.getElement());
+ try {
+ Iterator it = set.getElements().iterator();
+ List virtInstanceIds = new LinkedList();
+ while (it.hasNext()) {
+ RhnSetElement element = (RhnSetElement)it.next();
+ virtInstanceIds.add(element.getElement());
- }
+ }
- ValidatorResult result = SystemManager.validateGuestMemorySetting(
- virtInstanceIds, Integer.parseInt(guestSettingValue));
- validationErrors.addAll(result.getErrors());
- validationWarnings.addAll(result.getWarnings());
+ ValidatorResult result = SystemManager.validateGuestMemorySetting(
+ virtInstanceIds, Integer.parseInt(guestSettingValue));
+ validationErrors.addAll(result.getErrors());
+ validationWarnings.addAll(result.getWarnings());
+ }
+ catch (NumberFormatException e) {
+ validationErrors.add(new ValidatorError(
+ "frontend.actions.systems.virt.invalidmemvalue"));
+ }
}
strutsDelegate.saveMessages(request,
validationErrors, validationWarnings);
diff --git a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
index 95819ec..1dda079 100644
--- a/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
+++ b/java/code/src/com/redhat/rhn/frontend/struts/StrutsDelegate.java
@@ -390,6 +390,7 @@ public class StrutsDelegate {
}
else {
request.setAttribute(key, requestMsg);
+ request.getSession().setAttribute(key, requestMsg);
}
}
diff --git a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
index b0368fb..3a73472 100644
--- a/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
+++ b/java/code/src/com/redhat/rhn/manager/system/SystemManager.java
@@ -2108,36 +2108,38 @@ public class SystemManager extends BaseManager {
// Technically the limit is 32 for 32-bit architectures and 64 for 64-bit,
// but the kernel is currently set to only accept 32 in either case. This may
// need to change down the road.
- if (proposedVcpuSetting > 32) {
+ if (0 > proposedVcpuSetting || proposedVcpuSetting > 32) {
result.addError(new ValidatorError(
"systems.details.virt.vcpu.limit.msg",
new Object [] {"32", guest.getName()}));
}
- // Warn the user if the proposed vCPUs exceeds the physical CPUs on the
- // host:
- CPU hostCpu = host.getCpu();
- if (hostCpu != null && hostCpu.getNrCPU() != null) {
- if (proposedVcpuSetting > hostCpu.getNrCPU().intValue()) {
- result.addWarning(new ValidatorWarning(
- "systems.details.virt.vcpu.exceeds.host.cpus",
- new Object [] {host.getCpu().getNrCPU(), guest.getName()}));
+ if (result.getErrors().isEmpty()) {
+ // Warn the user if the proposed vCPUs exceeds the physical CPUs on the
+ // host:
+ CPU hostCpu = host.getCpu();
+ if (hostCpu != null && hostCpu.getNrCPU() != null) {
+ if (proposedVcpuSetting > hostCpu.getNrCPU().intValue()) {
+ result.addWarning(new ValidatorWarning(
+ "systems.details.virt.vcpu.exceeds.host.cpus",
+ new Object [] {host.getCpu().getNrCPU(), guest.getName()}));
+ }
}
- }
- // Warn the user if the proposed vCPUs is an increase for this guest.
- // If the new value exceeds the setting the guest was started with, a
- // reboot will be required for the setting to take effect.
- VirtualInstanceState running = VirtualInstanceFactory.getInstance().
- getRunningState();
- if (guest.getState() != null &&
- guest.getState().getId().equals(running.getId())) {
- Integer currentGuestCpus = guest.getNumberOfCPUs();
- if (currentGuestCpus != null && proposedVcpuSetting >
- currentGuestCpus.intValue()) {
- result.addWarning(new ValidatorWarning(
- "systems.details.virt.vcpu.increase.warning",
- new Object [] {new Integer(proposedVcpuSetting), guest.getName()}));
+ // Warn the user if the proposed vCPUs is an increase for this guest.
+ // If the new value exceeds the setting the guest was started with, a
+ // reboot will be required for the setting to take effect.
+ VirtualInstanceState running = VirtualInstanceFactory.getInstance().
+ getRunningState();
+ if (guest.getState() != null &&
+ guest.getState().getId().equals(running.getId())) {
+ Integer currentGuestCpus = guest.getNumberOfCPUs();
+ if (currentGuestCpus != null && proposedVcpuSetting >
+ currentGuestCpus.intValue()) {
+ result.addWarning(new ValidatorWarning(
+ "systems.details.virt.vcpu.increase.warning",
+ new Object [] {new Integer(proposedVcpuSetting), guest.getName()}));
+ }
}
}
11 years, 7 months
Changes to 'refs/tags/oracle-rhnsat-selinux-10.2.0.23-1'
by Jan Pazdziora
Tag 'oracle-rhnsat-selinux-10.2.0.23-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-09-12 14:06 +0000
Tagging package [oracle-rhnsat-selinux] version [10.2.0.23-1] in directory [selinux/oracle-rhnsat-selinux/].
Changes since spacewalk-java-1.8.144-1:
Jan Pazdziora (2):
768097 - ignore Postfix smtpd parsing /proc/mounts.
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.23-1].
Stephen Herr (2):
810315 - New "updates availabe" screenshot for firstboot
810389 - rhn_register / firstboot gui minor updates
---
client/rhel/rhn-client-tools/data/puplet-screenshot.png |binary
client/rhel/rhn-client-tools/data/rh_register.glade | 4 +++-
rel-eng/packages/oracle-rhnsat-selinux | 1 -
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
selinux/oracle-rhnsat-selinux/oracle-rhnsat.te | 8 ++++++++
5 files changed, 15 insertions(+), 3 deletions(-)
---
11 years, 7 months
rel-eng/packages selinux/oracle-rhnsat-selinux
by Jan Pazdziora
rel-eng/packages/oracle-rhnsat-selinux | 2 +-
selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit bf4e101a44ac942113f7f067f1a607273a632dce
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Sep 12 16:06:54 2012 +0200
Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.23-1].
diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/oracle-rhnsat-selinux
index 3bca041..f44ee7f 100644
--- a/rel-eng/packages/oracle-rhnsat-selinux
+++ b/rel-eng/packages/oracle-rhnsat-selinux
@@ -1 +1 @@
-10.2.0.22-1 selinux/oracle-rhnsat-selinux/
+10.2.0.23-1 selinux/oracle-rhnsat-selinux/
diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
index 07a07c4..4d41eec 100644
--- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
+++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec
@@ -5,7 +5,7 @@
%define modulename oracle-rhnsat
Name: oracle-rhnsat-selinux
-Version: 10.2.0.22
+Version: 10.2.0.23
Release: 1%{?dist}
Summary: SELinux policy module supporting Oracle
Group: System Environment/Base
@@ -106,6 +106,9 @@ fi
%attr(0755,root,root) %{_sbindir}/%{name}-enable
%changelog
+* Wed Sep 12 2012 Jan Pazdziora 10.2.0.23-1
+- 768097 - ignore Postfix smtpd parsing /proc/mounts.
+
* Wed Aug 22 2012 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.22-1
- 799131 - allow oracle db to read logs/*.aud files
11 years, 7 months