diff options
| -rw-r--r-- | perl-install/any.pm | 4 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/steps_gtk.pm | 8 | ||||
| -rw-r--r-- | perl-install/install/steps_interactive.pm | 4 | ||||
| -rw-r--r-- | perl-install/security/level.pm | 2 | ||||
| -rw-r--r-- | perl-install/services.pm | 2 |
6 files changed, 12 insertions, 10 deletions
diff --git a/perl-install/any.pm b/perl-install/any.pm index a06b7e60d..b12546115 100644 --- a/perl-install/any.pm +++ b/perl-install/any.pm @@ -1239,7 +1239,7 @@ sub selectCountry { $in->ask_from_( { title => N("Country / Region"), messages => N("Please choose your country"), - interactive_help_id => 'misc-params.html#drakxid-selectCountry', + interactive_help_id => 'selectCountry.html', if_(@best, advanced_messages => N("Here is the full list of available countries")), advanced_label => @best ? N("Other Countries") : N("Advanced"), }, @@ -1556,7 +1556,7 @@ sub configure_time_more { my $tz_prefix = timezone::get_timezone_prefix(); local $ENV{TZ} = ':' . $tz_prefix . '/' . $timezone->{timezone}; - $in->ask_from_({ interactive_help_id => 'misc-params#drakxid-configureTimezoneGMT', + $in->ask_from_({ interactive_help_id => 'configureTimezoneUTC', title => N("Date, Clock & Time Zone Settings"), }, [ { label => N("Date, Clock & Time Zone Settings"), title => 1 }, diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 4807ab5f2..68d96f6e9 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- adapt to new help layout (mga#5634) + Version 15.15 - 24 December 2012 - drakx-in-chroot: diff --git a/perl-install/install/steps_gtk.pm b/perl-install/install/steps_gtk.pm index 24588cbc6..c52038fcb 100644 --- a/perl-install/install/steps_gtk.pm +++ b/perl-install/install/steps_gtk.pm @@ -313,7 +313,7 @@ sub reallyChooseDesktop { clicked => sub { interactive::gtk::display_help( $o, - { interactive_help_id => 'choosePackages#choose-graphical-env' }, $w); + { interactive_help_id => 'chooseDesktop' }, $w); }), undef, 1 ]) ])); $w->main; @@ -355,7 +355,7 @@ sub reallyChooseGroups { 0, Gtk2::HSeparator->new, 0, gtknew('HButtonBox', layout => 'edge', children_tight => [ gtknew('Install_Button', text => N("Help"), clicked => sub { - interactive::gtk::display_help($o, { interactive_help_id => 'choosePackages#choosePackagesGroups' }, $w) }), + interactive::gtk::display_help($o, { interactive_help_id => 'choosePackageGroups' }, $w) }), gtknew('Button', text => N("Unselect All"), clicked => sub { $_->set_active(0) foreach @entries }), gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }), ]), @@ -512,7 +512,7 @@ sub choosePackagesTree { interactive::gtk::display_help($o, { interactive_help_id => # FIXME: missing ref to upper window: - 'choosePackages#choosePackagesTree' }, my $w) }, + 'choosePackagesTree' }, my $w) }, ok => N("Install"), cancel => N("Previous"), @@ -791,7 +791,7 @@ It will then continue from the hard disk drive and the packages will remain avai ), 0, gtknew('HButtonBox', layout => 'edge', children_tight => [ gtknew('Install_Button', text => N("Help"), clicked => sub { - interactive::gtk::display_help($o, { interactive_help_id => 'choosePackages' }, $w) }), + interactive::gtk::display_help($o, { interactive_help_id => 'choosePackagesTree' }, $w) }), gtknew('Button', text => N("Next"), clicked => sub { Gtk2->main_quit }), ]), ]), diff --git a/perl-install/install/steps_interactive.pm b/perl-install/install/steps_interactive.pm index a0f2d203f..1c549ca4c 100644 --- a/perl-install/install/steps_interactive.pm +++ b/perl-install/install/steps_interactive.pm @@ -600,7 +600,7 @@ sub offer_minimal_options { $o->ask_from_({ title => N("Type of install"), message => N("You have not selected any group of packages. Please choose the minimal installation you want:"), - interactive_help_id => 'choosePackages#minimal-install' + interactive_help_id => 'minimal-install' }, [ { val => \$o->{rpmsrate_flags_chosen}{CAT_X}, type => 'bool', text => N("With X"), disabled => sub { $minimal } }, @@ -631,7 +631,7 @@ sub reallyChooseGroups { my ($path, $all); $o->ask_from_({ messages => N("Package Group Selection"), - interactive_help_id => 'choosePackages', + interactive_help_id => 'choosePackageGroups', }, [ { val => \$size_text, type => 'label' }, {}, (map { diff --git a/perl-install/security/level.pm b/perl-install/security/level.pm index 9b91067ff..5f109a4e5 100644 --- a/perl-install/security/level.pm +++ b/perl-install/security/level.pm @@ -61,7 +61,7 @@ connections from many clients. Note: if your machine is only a client on the Int my @l = 1 .. 2; $in->ask_from_({ title => $::isInstall ? N("Security") : N("DrakSec Basic Options"), - interactive_help_id => 'misc-params#draxid-miscellaneous', + interactive_help_id => 'securityLevel', }, [ { label => N("Please choose the desired security level"), title => 1 }, { val => $security, list => \@l, diff --git a/perl-install/services.pm b/perl-install/services.pm index 51bf21792..2b73673d0 100644 --- a/perl-install/services.pm +++ b/perl-install/services.pm @@ -211,7 +211,7 @@ sub ask_ { interactive_help => sub { interactive::gtk::display_help($in, { interactive_help_id => - 'misc-params#drakxid-configureServices' }, $::main_window) }, + 'configureServices' }, $::main_window) }, }) or return $l, $on_services; #- no change on cancel. [ grep { $services{$_} } @$l ]; } |