Author: jsrain Date: Thu Mar 20 12:53:38 2008 New Revision: 45640 URL: http://svn.opensuse.org/viewcvs/yast?rev=45640&view=rev Log: updated the way section list is displayed in the installation proposal (fate#120376) Modified: trunk/bootloader/package/yast2-bootloader.changes trunk/bootloader/src/modules/BootCommon.ycp trunk/bootloader/src/modules/BootELILO.ycp trunk/bootloader/src/modules/BootGRUB.ycp trunk/bootloader/src/modules/BootPOWERLILO.ycp Modified: trunk/bootloader/package/yast2-bootloader.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/package/yast2-bootloader.changes?rev=45640&r1=45639&r2=45640&view=diff ============================================================================== --- trunk/bootloader/package/yast2-bootloader.changes (original) +++ trunk/bootloader/package/yast2-bootloader.changes Thu Mar 20 12:53:38 2008 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Mar 20 12:45:20 CET 2008 - jsrain@suse.cz + +- updated the way section list is displayed in the installation + proposal (fate#120376) + +------------------------------------------------------------------- Tue Mar 18 10:07:57 CET 2008 - jsrain@suse.cz - keep the 'linux' section name if product name is empty Modified: trunk/bootloader/src/modules/BootCommon.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootCommon.ycp?rev=45640&r1=45639&r2=45640&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootCommon.ycp (original) +++ trunk/bootloader/src/modules/BootCommon.ycp Thu Mar 20 12:53:38 2008 @@ -825,11 +825,11 @@ string title = s["name"]:""; // section name "suffix" for default section string def = title == globals["default"]:"" ? _(" (default)") : ""; - sects = add (sects, sformat ("%1%2", title, def)); + sects = add (sects, String::EscapeTags (sformat ("+ %1%2", title, def))); }); // summary text. %1 is list of bootloader sections - result = add (result, sformat (_("Sections: %1"), - String::EscapeTags (mergestring (sects, ", ")))); + result = add (result, sformat (_("Sections:<br>%1"), + mergestring (sects, "<br>"))); if (loader_device == "/dev/null") // summary text result = add (result, _("Do not install boot loader; just create Modified: trunk/bootloader/src/modules/BootELILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootELILO.ycp?rev=45640&r1=45639&r2=45640&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootELILO.ycp (original) +++ trunk/bootloader/src/modules/BootELILO.ycp Thu Mar 20 12:53:38 2008 @@ -375,11 +375,11 @@ string def = title == BootCommon::globals["default"]:"" ? _(" (default)") : ""; - sects = add (sects, sformat ("%1%2", title, def)); + sects = add (sects, String::EscapeTags (sformat ("+ %1%2", title, def))); }); // summary text. %1 is list of bootloader sections - result = add (result, sformat (_("Sections: %1"), - mergestring (sects, ", "))); + result = add (result, sformat (_("Sections:<br>%1"), + mergestring (sects, "<br>"))); return result; } Modified: trunk/bootloader/src/modules/BootGRUB.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootGRUB.ycp?rev=45640&r1=45639&r2=45640&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootGRUB.ycp (original) +++ trunk/bootloader/src/modules/BootGRUB.ycp Thu Mar 20 12:53:38 2008 @@ -937,11 +937,11 @@ string title = s["name"]:""; // section name "suffix" for default section string def = title == BootCommon::globals["default"]:"" ? _(" (default)") : ""; - sects = add (sects, sformat ("%1%2", title, def)); + sects = add (sects, String::EscapeTags (sformat ("+ %1%2", title, def))); }); - ret = add (ret, sformat (_("Sections: %1"), - String::EscapeTags (mergestring (sects, ", ")))); + ret = add (ret, sformat (_("Sections:<br>%1"), + mergestring (sects, "<br>"))); if (size(locations) == 0) { // summary text Modified: trunk/bootloader/src/modules/BootPOWERLILO.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/bootloader/src/modules/BootPOWERLILO.ycp?rev=45640&r1=45639&r2=45640&view=diff ============================================================================== --- trunk/bootloader/src/modules/BootPOWERLILO.ycp (original) +++ trunk/bootloader/src/modules/BootPOWERLILO.ycp Thu Mar 20 12:53:38 2008 @@ -950,11 +950,11 @@ string def = (title == BootCommon::globals["default"]:"") ? _(" (default)") : ""; - sects = add (sects, sformat ("%1%2", title, def)); + sects = add (sects, String::EscapeTags (sformat ("+ %1%2", title, def))); }); // summary text. %1 is list of bootloader sections - result = add (result, sformat (_("Sections: %1"), - String::EscapeTags (mergestring (sects, ", ")))); + result = add (result, sformat (_("Sections:<br>%1"), + mergestring (sects, "<br>"))); // FIXME: does the following code make any sense for ppc? (see also #163387) // It seems not. (We do not do this, cf. jplack.) Keeping the code cadaver -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org