fix some wikipedia styling

i.e. remove disambiguation links and push tables to the right
Edirom · Jul 5, 2018 · 483c58a · 483c58a
1 parent 97cd503
commit 483c58a
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 4 deletions.
diff --git a/modules/app.xqm b/modules/app.xqm
@@ -1002,7 +1002,7 @@ declare
     %templates:wrap
     %templates:default("lang", "en")
     function app:wikipedia-text($node as node(), $model as map(*), $lang as xs:string) as item()* {
-        let $wikiText := wega-util:transform($model('wikiContent')//xhtml:div[@id='bodyContent'], doc(concat($config:xsl-collection-path, '/wikipedia.xsl')), config:get-xsl-params(()))/node()
+        let $wikiText := wega-util:transform($model('wikiContent')//xhtml:div[@id='bodyContent'], doc(concat($config:xsl-collection-path, '/wikipedia.xsl')), config:get-xsl-params(()))
         return 
             if(exists($wikiText)) then $wikiText
             else lang:get-language-string('failedToLoadExternalResource', $lang)

diff --git a/resources/less/gui.less b/resources/less/gui.less
@@ -380,6 +380,17 @@ div.table-wrapper {
     padding: 0 0.5em 0 0;
 }
 
+/* Some Wikipedia styling rules*/
+#wikipediaText {
+    .float-right {
+        float:right;
+        margin: 0em 0em 2em 2em;
+    }
+    .wikipediaOrigin {
+        font-style: italic;
+    }
+}
+
 /* settings for "What happened on?" on start page */
 .history {
 	p {

diff --git a/xsl/wikipedia.xsl b/xsl/wikipedia.xsl
@@ -38,12 +38,14 @@
             </xsl:otherwise>
         </xsl:choose>
     </xsl:template>
-    <xsl:template match="div[@id='siteSub']">
-        <xsl:element name="span">
+
+    <xsl:template match="div[@id='siteSub']" priority="1">
+        <xsl:element name="div">
             <xsl:attribute name="class" select="'wikipediaOrigin'"/>
             <xsl:apply-templates/>
         </xsl:element>
     </xsl:template>
+
     <!--<xsl:template match="p[1]">
         <xsl:element name="p">
             <xsl:attribute name="class" select="'shortInfo'"/>
@@ -74,7 +76,7 @@
     <xsl:template match="li[ancestor::div[@id='toc']]">
         <xsl:copy>
             <xsl:apply-templates select="@*"/>
-            <span class="toggle-toc-item"><i class="fa fa-plus-square" aria-hidden="true" style="display:none;"></i><i class="fa fa-minus-square" aria-hidden="true"></i></span>
+            <span class="toggle-toc-item"><i class="fa fa-plus-square" aria-hidden="true" style="display:none;"/><i class="fa fa-minus-square" aria-hidden="true"/></span>
             <xsl:apply-templates/>
         </xsl:copy>
     </xsl:template>
@@ -114,4 +116,7 @@
     <xsl:template match="div[@id='contentSub']"/>
     <xsl:template match="div[@id='NavContent']"/>
     <xsl:template match="div[matches(@class, 'haudio')]" priority="1"/>
+    <xsl:template match="a[following-sibling::div/@id='mw-content-text']"/>
+    <xsl:template match="table[@id='Vorlage_Begriffsklärungshinweis']"/>
+    <xsl:template match="div[@class='hatnote navigation-not-searchable']"/>
 </xsl:stylesheet>