Merge branch 'sync-stylesheets'

yast · Apr 4, 2016 · 2531325 · 2531325
2 parents 7515408 + 729c94b
commit 2531325
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 15 deletions.
diff --git a/SLED/slideshow.xml b/SLED/slideshow.xml
@@ -123,7 +123,7 @@
    </listitem>
    <listitem>
     <para>
-     Basis for OpenStack-based SUSE® Cloud
+     Basis for SUSE OpenStack Cloud
     </para>
    </listitem>
     </itemizedlist>
@@ -356,7 +356,7 @@
    </listitem>
    <listitem>
     <para>
-     SUSE Cloud
+     SUSE OpenStack Cloud
     </para>
    </listitem>
    <listitem>

diff --git a/SLED/slideshow.xsl b/SLED/slideshow.xsl
@@ -63,15 +63,28 @@
 </xsl:template>
 
 <xsl:template match="section/section/title">
-    <h2>
-     <xsl:apply-templates />
-    </h2>
+ <h2>
+  <xsl:apply-templates />
+ </h2>
 </xsl:template>
 
 <xsl:template match="para">
-    <p>
-      <xsl:apply-templates />
-    </p>
+ <p>
+  <xsl:apply-templates />
+ </p>
+</xsl:template>
+
+<xsl:template match="itemizedlist">
+ <ul><xsl:apply-templates /></ul>
+</xsl:template>
+<xsl:template match="orderedlist">
+ <ol><xsl:apply-templates /></ol>
+</xsl:template>
+<xsl:template match="listitem">
+ <li><xsl:apply-templates /></li>
+</xsl:template>
+<xsl:template match="emphasis">
+ <em><xsl:apply-templates /></em>
 </xsl:template>
 
 </xsl:stylesheet>

diff --git a/SuSELinux/slideshow.xsl b/SuSELinux/slideshow.xsl
@@ -63,15 +63,28 @@
 </xsl:template>
 
 <xsl:template match="section/section/title">
-    <h2>
-     <xsl:apply-templates />
-    </h2>
+ <h2>
+  <xsl:apply-templates />
+ </h2>
 </xsl:template>
 
 <xsl:template match="para">
-    <p>
-      <xsl:apply-templates />
-    </p>
+ <p>
+  <xsl:apply-templates />
+ </p>
+</xsl:template>
+
+<xsl:template match="itemizedlist">
+ <ul><xsl:apply-templates /></ul>
+</xsl:template>
+<xsl:template match="orderedlist">
+ <ol><xsl:apply-templates /></ol>
+</xsl:template>
+<xsl:template match="listitem">
+ <li><xsl:apply-templates /></li>
+</xsl:template>
+<xsl:template match="emphasis">
+ <em><xsl:apply-templates /></em>
 </xsl:template>
 
 </xsl:stylesheet>

diff --git a/package/yast2-slide-show.changes b/package/yast2-slide-show.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Fri Apr  1 14:29:45 CEST 2016 - fcrozat@suse.com
+
+- 3.1.23
+- Ensure SLED stylesheet is updated (bsc#973609).
+
 -------------------------------------------------------------------
 Fri Nov  6 09:40:02 UTC 2015 - ke@suse.de
 

diff --git a/package/yast2-slide-show.spec b/package/yast2-slide-show.spec
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-slide-show
-Version:        3.1.22
+Version:        3.1.23
 Release:        0
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build