Merge pull request #10 from LelCP/master

Removal of HTML inline styles
yast · Feb 13, 2018 · 42050a7 · 42050a7
2 parents f1ca973 + a54e21a
commit 42050a7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 9 deletions.
diff --git a/.gitignore b/.gitignore
@@ -27,3 +27,5 @@ Makefile.am.common
 .dep
 tmp.*
 *.log
+/doc/autodocs
+/.yardoc
diff --git a/.yardopts b/.yardopts
@@ -0,0 +1,7 @@
+--no-private
+--markup markdown
+--protected
+--readme README.md
+--output-dir ./doc/autodocs
+--files *.md
+src/**/*.rb
diff --git a/README.md b/README.md
@@ -1,5 +1,5 @@
 # YaST - The One Click Installer Module #
 
-[![Travis Build](https://travis-ci.org/yast/yast-metapackage.svg?branch=master)](https://travis-ci.org/yast/yast-metapackage)
-[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-metapackage-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-metapackage-master/)
+[![Travis Build](https://travis-ci.org/yast/yast-metapackage-handler.svg?branch=master)](https://travis-ci.org/yast/yast-metapackage-handler)
+[![Jenkins Build](http://img.shields.io/jenkins/s/https/ci.opensuse.org/yast-metapackage-handler-master.svg)](https://ci.opensuse.org/view/Yast/job/yast-metapackage-handler-master/)
 
diff --git a/package/yast2-metapackage-handler.changes b/package/yast2-metapackage-handler.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Tue Feb  13 11:46:30 UTC 2018 - lelcp@protonmail.com
+
+- don't use inline html styles when including package metadata
+- 4.0.0
+
 -------------------------------------------------------------------
 Mon Nov  3 14:45:57 UTC 2014 - lslezak@suse.cz
 

diff --git a/package/yast2-metapackage-handler.spec b/package/yast2-metapackage-handler.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-metapackage-handler
-Version:        3.1.4
+Version:        4.0.0
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build

diff --git a/src/modules/OneClickInstallWidgets.rb b/src/modules/OneClickInstallWidgets.rb
@@ -118,7 +118,7 @@ def PopulateRepositorySelectionUIDescription(description)
         Ops.add(
           Ops.add(
             Ops.add(
-              "<body bgcolor=\"White\">",
+              "<body>",
               HTML.Heading(_("Repository Description:"))
             ),
             NewLinesToRichText(description)
@@ -177,7 +177,7 @@ def PopulateSoftwareSelectionUIDescription(description)
         Ops.add(
           Ops.add(
             Ops.add(
-              "<body bgcolor=\"White\">",
+              "<body>",
               HTML.Heading(_("Package Description:"))
             ),
             NewLinesToRichText(description)
@@ -229,7 +229,7 @@ def PopulateSoftwareRemovalSelectionUIDescription(description)
         Ops.add(
           Ops.add(
             Ops.add(
-              "<body bgcolor=\"White\">",
+              "<body>",
               HTML.Heading(_("Package Description:"))
             ),
             NewLinesToRichText(description)
@@ -355,7 +355,7 @@ def getProposalString(repositories, packages, removals, remainSubscribed)
       end
 
       summaryStr = Ops.add(
-        "<body bgcolor=\"White\">",
+        "<body>",
         HTML.Colorize(
           _(
             "If you continue, the following changes will be made to your system:"
@@ -454,7 +454,7 @@ def PopulateDescriptionUI(name, summary, description)
         :Value,
         Ops.add(
           Ops.add(
-            "<body bgcolor=\"White\">",
+            "<body>",
             HTML.Para(NewLinesToRichText(description))
           ),
           "</body>"
@@ -481,7 +481,7 @@ def PopulateResultUI(success, failedRepositories, failedPatterns, failedPackages
       failedPatterns = deep_copy(failedPatterns)
       failedPackages = deep_copy(failedPackages)
       statusStr = Ops.add(
-        "<body bgcolor=\"White\">",
+        "<body>",
         HTML.Heading(_("Software installation"))
       )