Author: aschnell Date: Wed Jul 29 15:06:33 2009 New Revision: 58205 URL: http://svn.opensuse.org/viewcvs/yast?rev=58205&view=rev Log: - use HTML module - consistent heading style Modified: trunk/storage/storage/src/include/ep-summary.ycp trunk/storage/storage/src/modules/StorageSettings.ycp Modified: trunk/storage/storage/src/include/ep-summary.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-summary.ycp?rev=58205&r1=58204&r2=58205&view=diff ============================================================================== --- trunk/storage/storage/src/include/ep-summary.ycp (original) +++ trunk/storage/storage/src/include/ep-summary.ycp Wed Jul 29 15:06:33 2009 @@ -10,17 +10,20 @@ textdomain "storage"; + import "HTML"; + + void CreateSummaryPanel(any user_data) { string part_summary = Storage::ChangeText(); - string config_summary = ( StorageSettings::GetModified() ? - StorageSettings::Summary() : - _("<p>No changes to storage settings.</p>") ); - if (isempty(part_summary)) - { - part_summary = _("<p>No changes to partitioning.</p>"); - } + part_summary = HTML::Heading(_("<p>No changes to partitioning.</p>")); + else + part_summary = HTML::Heading(_("<p>Changes to partitioning:</p>")) + part_summary; + + string config_summary = HTML::Heading(_("<p>No changes to storage settings.</p>")); + if (StorageSettings::GetModified()) + config_summary = HTML::Heading(_("<p>Storage settings:</p>")) + StorageSettings::Summary(); UI::ReplaceWidget(`tree_panel, Greasemonkey::Transform( Modified: trunk/storage/storage/src/modules/StorageSettings.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/StorageSettings.ycp?rev=58205&r1=58204&r2=58205&view=diff ============================================================================== --- trunk/storage/storage/src/modules/StorageSettings.ycp (original) +++ trunk/storage/storage/src/modules/StorageSettings.ycp Wed Jul 29 15:06:33 2009 @@ -14,6 +14,7 @@ import "Storage"; import "Partitions"; import "Integer"; + import "HTML"; symbol display_name = nil; @@ -145,31 +146,19 @@ } + global string Summary() { - string ListOfVisibleFields( list <string> labels) - { - string ret = "<ul>"; - - foreach(string lab, labels, { - ret = ret + "<li>" + lab + "</li>"; - }); - - return ret + "</ul>"; + list<string> tmp = [ + _("Default Mount-by:") + " " + substring(tostring(Storage::GetDefaultMountBy()), 1), + _("Default Filesystem:") + " " + substring(tostring(Partitions::DefaultFs()), 1), + _("Show Storage Devices by:") + " " + substring(tostring(display_name), 1), + _("Visible Information on Storage Devices:") + " " + HTML::List(visible_fields) + ]; + return HTML::List(tmp); } - string new_summary = "<h1>Storage Settings</h1>" + "<ul>"; - - new_summary = new_summary + "<li>" + _("<b>Default Mount-by:</b> ") + substring(tostring(Storage::GetDefaultMountBy()), 1) + "</li>"; - new_summary = new_summary + "<li>" + _("<b>Default Filesystem:</b> ") + substring(tostring(Partitions::DefaultFs()), 1) + "</li>"; - new_summary = new_summary + "<li>" + _("<b>Show Storage Devices by:</b> ") + substring(tostring(display_name), 1) + "</li>"; - new_summary = new_summary + "<li>" + _("<b>Visible Information on Storage Devices:</b> ") + ListOfVisibleFields(visible_fields) + "</li>"; - - new_summary = new_summary + "</ul>"; - - return new_summary; - } global void Save() { -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org