You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openoffice.apache.org by wa...@apache.org on 2020/11/09 19:43:18 UTC

[openoffice-org] 01/02: Fix missed markdown extra changes. Adjust templates so that extra css is after ooo.css

This is an automated email from the ASF dual-hosted git repository.

wave pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/openoffice-org.git

commit a4c11db9c32f7376bb0e25235f7e6d1f5cf5fd1b
Author: Dave Fisher <da...@davefisher.tech>
AuthorDate: Mon Nov 9 11:34:42 2020 -0800

    Fix missed markdown extra changes. Adjust templates so that extra css is after ooo.css
---
 content/he/product/index.md                  |  3 +--
 content/he/why/why_compliance.md             |  2 +-
 content/he/why/why_foss.md                   |  4 ++--
 content/he/why/why_free.md                   |  4 ++--
 content/he/why/why_new_computers.md          |  2 +-
 content/he/why/why_nfp.md                    |  4 ++--
 content/he/why/why_odf.md                    |  4 ++--
 content/he/why/why_oem.md                    |  4 ++--
 content/he/why/why_office2003-end-of-life.md |  2 +-
 content/he/why/why_other.md                  |  2 +-
 content/he/why/why_sme.md                    |  4 ++--
 content/he/why/why_volunteers.md             |  2 +-
 content/hu/product/base.md                   |  2 +-
 content/hu/product/calc.md                   |  2 +-
 content/hu/product/draw.md                   |  2 +-
 content/hu/product/impress.md                |  2 +-
 content/hu/product/index.md                  | 18 +++++++++---------
 content/hu/product/math.md                   |  2 +-
 content/hu/product/writer.md                 |  2 +-
 content/hu/why/why_edu.md                    |  2 +-
 content/hu/why/why_great.md                  |  2 +-
 content/nl/Archive/product/base.md           |  2 +-
 content/nl/Archive/product/calc.md           |  2 +-
 content/nl/Archive/product/draw.md           |  2 +-
 content/nl/Archive/product/impress.md        |  2 +-
 content/nl/Archive/product/index.md          | 19 +++++++++----------
 content/nl/Archive/product/math.md           |  2 +-
 content/nl/Archive/product/writer.md         |  2 +-
 content/sr-cyrl/product/base.md              |  2 +-
 content/sr-cyrl/product/calc.md              |  2 +-
 content/sr-cyrl/product/draw.md              |  2 +-
 content/sr-cyrl/product/impress.md           |  2 +-
 content/sr-cyrl/product/index.md             | 12 +++---------
 content/sr-cyrl/product/math.md              |  2 +-
 content/sr-cyrl/product/writer.md            |  2 +-
 content/sr-latn/product/index.md             |  5 -----
 content/zh-cn/product/base.md                |  2 +-
 content/zh-cn/product/calc.md                |  2 +-
 content/zh-cn/product/draw.md                |  2 +-
 content/zh-cn/product/impress.md             |  2 +-
 content/zh-cn/product/index.md               | 12 +++---------
 content/zh-cn/product/math.md                |  2 +-
 content/zh-cn/product/writer.md              |  2 +-
 templates/markdown_css.gsp                   |  2 +-
 templates/page.gsp                           |  6 +++++-
 45 files changed, 74 insertions(+), 89 deletions(-)

diff --git a/content/he/product/index.md b/content/he/product/index.md
index 2399afe..320d3c1 100644
--- a/content/he/product/index.md
+++ b/content/he/product/index.md
@@ -4,14 +4,13 @@ list_css=product
 title=תיאור Apache OpenOffice
 notice=https://www.apache.org/licenses/LICENSE-2.0
 css=/product/styles.css
-css=../rtl.css
+css2=../rtl.css
 ~~~~~~
 חבילת-התוכנות Apache OpenOffice תואמת לתוכנות אחרות למשרד. אפשר להוריד אותה ולהשתמש בה בחינם, ואף לחלק אותה לאחרים. [הורדת התוכנה][1] כוללת את התוכנות הבאות: 
 
 ![מה כלול ב-Apache OpenOffice?](/images/AOO_logos/orb.jpg)
 
   - [Writer](writer.html "Wordprocessor") מאפשרת לך לעשות הכל עם טקסטים: מכתיבת מכתב קצר ועד ספר שלם.
-    # { .product-writer } 
   - [Calc](calc.html "גיליון-עבודה") מכילה את כל הכלים הדרושים לעבודה עם גליונות-עבודה, ותעזור לך לחשב, לנתח ולהציג נתונים בדו"חות, כולל  וגרפים.
   - [Impress](impress.html "תוכנת מצגות") הדרך המהירה והיעילה ליצירת מצגות.
   - [Draw](draw.html "תוכנה לאיורים וקטוריים") מאפשרת את החופש ליצור הכל, מתרשימים פשוטים ועד איורים תלת-ממדיים.
diff --git a/content/he/why/why_compliance.md b/content/he/why/why_compliance.md
index 79ee646..ce06f68 100644
--- a/content/he/why/why_compliance.md
+++ b/content/he/why/why_compliance.md
@@ -1,7 +1,7 @@
 type=page
 title=Compliance Costs and the Apache License
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
 ##עלויות השמירה על רישיון תוכנה
 
diff --git a/content/he/why/why_foss.md b/content/he/why/why_foss.md
index dd9ceba..0bdfe4b 100644
--- a/content/he/why/why_foss.md
+++ b/content/he/why/why_foss.md
@@ -1,9 +1,9 @@
 type=page
 title=Why OpenOffice.org: Free/Open-Source Software
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
-![Why Apache OpenOffice: Free/Open-Source Software](/why/images/why_foss.png) # {.rfloatimg}
+![Why Apache OpenOffice: Free/Open-Source Software](/why/images/why_foss.png)
 
 Free/Open-Source Software (F/OSS) proponents are turning to Apache OpenOffice both as end-users and as contributors. With its **flexible word processor**, **powerful spreadsheet**, **dynamic graphics**, **database access** and more, OpenOffice is the office suite of choice of millions of users.
 
diff --git a/content/he/why/why_free.md b/content/he/why/why_free.md
index 11b32fb..0cb72d7 100644
--- a/content/he/why/why_free.md
+++ b/content/he/why/why_free.md
@@ -1,9 +1,9 @@
 type=page
 title=יתרונות Apache OpenOffice: תוכנה בחינם
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
-![יתרונות Apache OpenOffice: תוכנה בחינם](/why/images/why_free.png) # {.rfloatimg}
+![יתרונות Apache OpenOffice: תוכנה בחינם](/why/images/why_free.png)
 
 Apache OpenOffice מופצת בחינם.
 אפשר להוריד אותה בחינם, להתקין אותה על מספר מחשבים, ולהפיץ אותה בין חברים.
diff --git a/content/he/why/why_new_computers.md b/content/he/why/why_new_computers.md
index 5067979..bf058d4 100644
--- a/content/he/why/why_new_computers.md
+++ b/content/he/why/why_new_computers.md
@@ -1,7 +1,7 @@
 type=page
 title=Apache OpenOffice for New Computers
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
 ##Save money on your new computer
 
diff --git a/content/he/why/why_nfp.md b/content/he/why/why_nfp.md
index 053544b..ca3b29a 100644
--- a/content/he/why/why_nfp.md
+++ b/content/he/why/why_nfp.md
@@ -1,9 +1,9 @@
 type=page
 title=Why Apache OpenOffice: Not for Profit
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
-![Why Apache OpenOffice: Not for Profit](/why/images/why_nfp.png) # {.rfloatimg}
+![Why Apache OpenOffice: Not for Profit](/why/images/why_nfp.png)
 
 Not for Profit (NFP) organizations of all sizes are turning to Apache OpenOffice - software that meets their needs and shares their values. The **flexible word processor**, **powerful spreadsheet**, **dynamic graphics**, **database access** and more meet all the requirements for an office software package.
 
diff --git a/content/he/why/why_odf.md b/content/he/why/why_odf.md
index 788344f..2410e24 100644
--- a/content/he/why/why_odf.md
+++ b/content/he/why/why_odf.md
@@ -1,9 +1,9 @@
 type=page
 title=Reading ODF Documents (*.odt, *.ods, *.odp) with Apache OpenOffice
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
-![Why Apache OpenOffice: OpenDocument Format](/why/images/shell.png) # {.rfloatimg}
+![Why Apache OpenOffice: OpenDocument Format](/why/images/shell.png)
 
 ##"Windows cannot open this file"
 
diff --git a/content/he/why/why_oem.md b/content/he/why/why_oem.md
index d26e38d..2eb61bb 100644
--- a/content/he/why/why_oem.md
+++ b/content/he/why/why_oem.md
@@ -1,9 +1,9 @@
 type=page
 title=Why OpenOffice.org: IT business
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
-![Why Apache OpenOffice: IT business](/why/images/why_oem.png) # {.rfloatimg}
+![Why Apache OpenOffice: IT business](/why/images/why_oem.png)
 
 Build your business around Apache OpenOffice. If you're in the IT business, OpenOffice can mean good business for you. The **flexible word processor**, **powerful spreadsheet**, **dynamic graphics**, **database access** and more meet all the requirements for an office software package.
 
diff --git a/content/he/why/why_office2003-end-of-life.md b/content/he/why/why_office2003-end-of-life.md
index d4aabf0..f97e1b4 100644
--- a/content/he/why/why_office2003-end-of-life.md
+++ b/content/he/why/why_office2003-end-of-life.md
@@ -1,7 +1,7 @@
 type=page
 title=Office 2003 End of Life
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
 ##The April 2014 deadline
 
diff --git a/content/he/why/why_other.md b/content/he/why/why_other.md
index e3a5954..ae23823 100644
--- a/content/he/why/why_other.md
+++ b/content/he/why/why_other.md
@@ -1,7 +1,7 @@
 type=page
 title=Why Apache OpenOffice: Other Reasons
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
 Here are some other reasons to use Apache OpenOffice:
 
diff --git a/content/he/why/why_sme.md b/content/he/why/why_sme.md
index 7c43781..043c6e7 100644
--- a/content/he/why/why_sme.md
+++ b/content/he/why/why_sme.md
@@ -1,9 +1,9 @@
 type=page
 title=Why Apache OpenOffice: Enterprises
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
-![Why Apache OpenOffice: Enterprises](/why/images/why_sme.png) # {.rfloatimg}
+![Why Apache OpenOffice: Enterprises](/why/images/why_sme.png)
 
 Enterprises from corner-shops to corporate giants are turning to Apache OpenOffice to power their businesses. The **flexible word processor**, **powerful spreadsheet**, **dynamic graphics**, **database access** and more meet all the requirements for an office software package.
 
diff --git a/content/he/why/why_volunteers.md b/content/he/why/why_volunteers.md
index d27460c..9661aa6 100644
--- a/content/he/why/why_volunteers.md
+++ b/content/he/why/why_volunteers.md
@@ -1,7 +1,7 @@
 type=page
 title=מתנדבים, אך לא חובבנים
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=../rtl.css
+css=../rtl.css
 ~~~~~~
 ##תוכנה מורכבת שמפותחת בידי מתנדבים?
 
diff --git a/content/hu/product/base.md b/content/hu/product/base.md
index 2bdcf90..8eeec05 100644
--- a/content/hu/product/base.md
+++ b/content/hu/product/base.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Base
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Base képernyőmentés](/product/pix/base.png)](/product/pix/base-big.png "Kattintson a kép nagyobb változatáért") # {.rfloatimg}
+[![Apache OpenOffice Base képernyőmentés](/product/pix/base.png)](/product/pix/base-big.png "Kattintson a kép nagyobb változatáért")
 
 A **Base** egy teljeskörű adatbáziskezelő rendszer, melyet a széles felhasználói kör
 sokoldalú igényeinek kielégítésére terveztek, ami lehet
diff --git a/content/hu/product/calc.md b/content/hu/product/calc.md
index 484da8c..27db99b 100644
--- a/content/hu/product/calc.md
+++ b/content/hu/product/calc.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Calc
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Calc képernyőmentése](/product/pix/calc.png)](/product/pix/calc-big.png "Kattintson a kép nagyobb változatáért") # {.rfloatimg}
+[![Apache OpenOffice Calc képernyőmentése](/product/pix/calc.png)](/product/pix/calc-big.png "Kattintson a kép nagyobb változatáért")
 
 *A minden célnak megfelelő táblázatkezelő*
 
diff --git a/content/hu/product/draw.md b/content/hu/product/draw.md
index 24ff746..616947b 100644
--- a/content/hu/product/draw.md
+++ b/content/hu/product/draw.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Draw
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Draw képernyőmentés](/product/pix/draw.png)](/product/pix/draw-big.png "Kattintson a kép nagyobb változatáért") # {.rfloatimg}
+[![Apache OpenOffice Draw képernyőmentés](/product/pix/draw.png)](/product/pix/draw-big.png "Kattintson a kép nagyobb változatáért")
 
 *Egy erőteljes grafikai csomag*
 
diff --git a/content/hu/product/impress.md b/content/hu/product/impress.md
index b81c885..9a8e225 100644
--- a/content/hu/product/impress.md
+++ b/content/hu/product/impress.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Impress
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Impress képernyőmentés](/product/pix/impress.png)](/product/pix/impress-big.png "Kattintson a kép nagyobb változatáért") # {.rfloatimg}
+[![Apache OpenOffice Impress képernyőmentés](/product/pix/impress.png)](/product/pix/impress-big.png "Kattintson a kép nagyobb változatáért")
 
 *Több energia a bemutatóiban*
 
diff --git a/content/hu/product/index.md b/content/hu/product/index.md
index 4bde92d..31417da 100644
--- a/content/hu/product/index.md
+++ b/content/hu/product/index.md
@@ -1,31 +1,31 @@
 type=page
 title=Apache OpenOffice termékismertető
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=/product/styles.css
+css=/product/styles.css
 ~~~~~~
 Az Apache OpenOffice ingyenesen letölthető, használható és terjeszthető. A piacon
 lévő főbb irodai programcsomagokkal kompatibilis. [Töltse le most!][1] és legyen Öné:
 
-![Apache OpenOffice?](/images/AOO_logos/orb.jpg) # {.rfloatimg}
+![Apache OpenOffice?](/images/AOO_logos/orb.jpg)
 
   - [Writer](writer.html "Szövegszerkesztő") egy szövegszerkesztő, melyet bármire használhat,
-    egy gyors levélírástól egy teljes könyv összeállításáig. # { .product-writer }
+    egy gyors levélírástól egy teljes könyv összeállításáig.
   - [Calc](calc.html "Táblázatkezelő") egy hatékony táblázatkezelő és minden eszköz,
     amire szüksége lehet adatainak kalkulálása, analizálása illetve kimutatások és meggyőző 
-    diagramok készítése során. # { .product-calc }
+    diagramok készítése során.
   - [Impress](impress.html "Jelentéskészítő") egy jelentéskészítő, mely a leggyorsabb, 
-    legalkalmasabb eszköz hatásos multimédiás bemutatók készítésére. # { .product-impress }
+    legalkalmasabb eszköz hatásos multimédiás bemutatók készítésére.
   - [Draw](draw.html "Vektoros grafikai szerkesztő") egy grafikai szerkesztőprogram, 
     mellyel bármit elkészíthet az egyszerű diagramtól kezdve a dinamikus 3D-s 
-    illusztrációkig. # { .product-draw }
+    illusztrációkig.
   - [Base](base.html "Adatbáziskezelő") egy adatbáziskezelő, amellyel gond nélkül 
     dolgozhat adatbázisaival. Táblák, űrlapok,lekérdezések és jelentések létrehozása és módosítása - 
-    mindez együtt, az Apache OpenOffice részeként. # { .product-base }
+    mindez együtt, az Apache OpenOffice részeként.
   - [Math](math.html "Matematikai függvénykészítő") egy függvénykezelő, melyben grafikus 
     felhasználói felületen keresztül oldhat meg matematikai egyenleteket, vagy írhatja be képleteit
-    közvetlenül az egyenletszerkesztőbe. # { .product-math }
+    közvetlenül az egyenletszerkesztőbe.
 
-## Miért az Apache OpenOffice? #{ .why }
+## Miért az Apache OpenOffice?
 
 Az Apache OpenOffice a **minőség** szinonimája:
 
diff --git a/content/hu/product/math.md b/content/hu/product/math.md
index 689851e..0c2dae2 100644
--- a/content/hu/product/math.md
+++ b/content/hu/product/math.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Math
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Math képernyőmentés](/product/pix/math.png)](/product/pix/math-big.png "Kattintson a kép nagyobb változatáért") # {.rfloatimg}
+[![Apache OpenOffice Math képernyőmentés](/product/pix/math.png)](/product/pix/math-big.png "Kattintson a kép nagyobb változatáért")
 
 *Készítsen egyenleteket és képleteket dokumentumaihoz*
 
diff --git a/content/hu/product/writer.md b/content/hu/product/writer.md
index 3978e4f..49db189 100644
--- a/content/hu/product/writer.md
+++ b/content/hu/product/writer.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Writer
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Writer képernyőmentés](/product/pix/writer.png)](/product/pix/writer-big.png "Kattintson a kép nagyobb változatáért") # {.rfloatimg}
+[![Apache OpenOffice Writer képernyőmentés](/product/pix/writer.png)](/product/pix/writer-big.png "Kattintson a kép nagyobb változatáért")
 
 *Minden dokumentumhoz*
 
diff --git a/content/hu/why/why_edu.md b/content/hu/why/why_edu.md
index c435058..3178645 100644
--- a/content/hu/why/why_edu.md
+++ b/content/hu/why/why_edu.md
@@ -2,7 +2,7 @@ type=page
 title=Miért az Apache OpenOffice: Oktatás
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-![Miért az Apache OpenOffice: Oktatás](/why/images/why_edu.png) # {.rfloatimg}
+![Miért az Apache OpenOffice: Oktatás](/why/images/why_edu.png)
 
 Az oktatás valamennyi szereplője (általános iskolák, középiskolák, felsőoktatási intézmények) olyan szoftvernek találja az Apache OpenOffice csomag programjait, mely mind a tanárok, mind a diákok elvárásaiak megfelel, legyen az akár a **rugalmas szövegszerkesztő**, a **hatékony táblázatkezelő**, a **dinamikus grafikai program**, az **adatbáziskezelő** vagy más összetevő.
 
diff --git a/content/hu/why/why_great.md b/content/hu/why/why_great.md
index c9915a7..bda92bf 100644
--- a/content/hu/why/why_great.md
+++ b/content/hu/why/why_great.md
@@ -2,7 +2,7 @@ type=page
 title=Miért az Apache OpenOffice: nagyszerű szoftver
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-![Miért az Apache OpenOffice: nagyszerű szoftver](/why/images/why_great.png) # {.rfloatimg}
+![Miért az Apache OpenOffice: nagyszerű szoftver](/why/images/why_great.png)
 
 Egy nagyszerű szoftver nagyszerű embereket kíván. Az Apache OpenOffice több, mint 20 év folyamatos, magasszintű szoftverfejlesztési munkájának az  eredménye. Kezdettől fogva **egyetlen, egységes szoftver**nek tekintjük, így az Apache OpenOffice konzisztenciája és minősége világszínvonalú. **Nyílt forrású** fejlesztési folyamatából kifolyólag nem rejteget titkokat.
 
diff --git a/content/nl/Archive/product/base.md b/content/nl/Archive/product/base.md
index 4d6248a..31fe219 100644
--- a/content/nl/Archive/product/base.md
+++ b/content/nl/Archive/product/base.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Base
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Base](/product/pix/base.png)](/product/pix/base-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Base](/product/pix/base.png)](/product/pix/base-big.png "Click for bigger version")
 
 **Base** is a fully featured desktop database management system, designed to
 meet the needs of a broad array of users, from
diff --git a/content/nl/Archive/product/calc.md b/content/nl/Archive/product/calc.md
index 3608ef5..90362f5 100644
--- a/content/nl/Archive/product/calc.md
+++ b/content/nl/Archive/product/calc.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Calc
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Calc](/product/pix/calc.png)](/product/pix/calc-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Calc](/product/pix/calc.png)](/product/pix/calc-big.png "Click for bigger version")
 
 *The all-purpose spreadsheet*
 
diff --git a/content/nl/Archive/product/draw.md b/content/nl/Archive/product/draw.md
index c0f2725..eaf9bfd 100644
--- a/content/nl/Archive/product/draw.md
+++ b/content/nl/Archive/product/draw.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Draw
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Draw](/product/pix/draw.png)](/product/pix/draw-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Draw](/product/pix/draw.png)](/product/pix/draw-big.png "Click for bigger version")
 
 *The powerful graphics package*
 
diff --git a/content/nl/Archive/product/impress.md b/content/nl/Archive/product/impress.md
index 016e7d9..73ec495 100644
--- a/content/nl/Archive/product/impress.md
+++ b/content/nl/Archive/product/impress.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Impress
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Impress](/product/pix/impress.png)](/product/pix/impress-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Impress](/product/pix/impress.png)](/product/pix/impress-big.png "Click for bigger version")
 
 *More power to your presentations*
 
diff --git a/content/nl/Archive/product/index.md b/content/nl/Archive/product/index.md
index b031e1a..0721a80 100644
--- a/content/nl/Archive/product/index.md
+++ b/content/nl/Archive/product/index.md
@@ -1,31 +1,30 @@
 type=page
 title=Apache OpenOffice Product Description
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=/product/styles.css
+css=/product/styles.css
 ~~~~~~
 Compatible with other major office suites, Apache OpenOffice is free to
 download, use, and distribute. [Download it now][1], and get:
 
-![Apache OpenOffice?](/images/AOO_logos/orb.jpg) # {.rfloatimg}
+![Apache OpenOffice?](/images/AOO_logos/orb.jpg)
 
   - [Writer](writer.html "Wordprocessor") a word processor you can use for
     anything from writing a quick letter to producing an entire book.
-    # { .product-writer }
   - [Calc](calc.html "Spreadsheet") a powerful spreadsheet with all the tools
     you need to calculate, analyse, and present your data in numerical reports
-    or sizzling graphics. # { .product-calc }
+    or sizzling graphics.
   - [Impress](impress.html "Presentation program") the fastest, most powerful
-    way to create effective multimedia presentations. # { .product-impress }
+    way to create effective multimedia presentations.
   - [Draw](draw.html "Vector drawing tool") lets you produce everything from
-    simple diagrams to dynamic 3D illustrations. # { .product-draw }
-  - [Base](base.html "Database") lets you manipulate databases seamlessly.
+    simple diagrams to dynamic 3D illustrations.
+  - [Base](base.html "Database") lets you manipulate databases seamlessly.
     Create and modify tables, forms, queries, and reports, all from within
-    Apache OpenOffice. # { .product-base }
+    Apache OpenOffice.
   - [Math](math.html "Mathematical function creator") lets you create
     mathematical equations with a graphic user interface or by directly typing
-    your formulas into the equation editor. # { .product-math }
+    your formulas into the equation editor.
 
-## Why Apache OpenOffice? #{ .why }
+## Why Apache OpenOffice?
 
 Apache OpenOffice is synonymous with **quality**
 
diff --git a/content/nl/Archive/product/math.md b/content/nl/Archive/product/math.md
index e1d047a..955630c 100644
--- a/content/nl/Archive/product/math.md
+++ b/content/nl/Archive/product/math.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Math
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Math](/product/pix/math.png)](/product/pix/math-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Math](/product/pix/math.png)](/product/pix/math-big.png "Click for bigger version")
 
 *Create equations and formulae for your documents*
 
diff --git a/content/nl/Archive/product/writer.md b/content/nl/Archive/product/writer.md
index 7acd497..9c26766 100644
--- a/content/nl/Archive/product/writer.md
+++ b/content/nl/Archive/product/writer.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Writer
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Writer](/product/pix/writer.png)](/product/pix/writer-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Writer](/product/pix/writer.png)](/product/pix/writer-big.png "Click for bigger version")
 
 *For all your documents*
 
diff --git a/content/sr-cyrl/product/base.md b/content/sr-cyrl/product/base.md
index 6307693..d05c528 100644
--- a/content/sr-cyrl/product/base.md
+++ b/content/sr-cyrl/product/base.md
@@ -2,7 +2,7 @@ type=page
 title=База Apache OpenOffice-а
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Base](/product/pix/base.png)](/product/pix/base-big.png "Kliknite za veću sliku") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Base](/product/pix/base.png)](/product/pix/base-big.png "Kliknite za veću sliku")
 
 **База** (engl. Base) је потпуно заокружен систем управљања базом података, дизајниран да
 задовољи потребе великог броја корисника, од
diff --git a/content/sr-cyrl/product/calc.md b/content/sr-cyrl/product/calc.md
index 1b5183d..b244dc0 100644
--- a/content/sr-cyrl/product/calc.md
+++ b/content/sr-cyrl/product/calc.md
@@ -2,7 +2,7 @@ type=page
 title=Рачун Apache OpenOffice-а
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Calc](/product/pix/calc.png)](/product/pix/calc-big.png "Kliknite za veću sliku") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Calc](/product/pix/calc.png)](/product/pix/calc-big.png "Kliknite za veću sliku")
 
 *Прорачунска табела (енгл. spreadsheet) за све сврхе*
 
diff --git a/content/sr-cyrl/product/draw.md b/content/sr-cyrl/product/draw.md
index d0174c9..a0be50c 100644
--- a/content/sr-cyrl/product/draw.md
+++ b/content/sr-cyrl/product/draw.md
@@ -2,7 +2,7 @@ type=page
 title=Цртеж Apache OpenOffice-а
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Draw](/product/pix/draw.png)](/product/pix/draw-big.png "Kliknite za veću sliku") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Draw](/product/pix/draw.png)](/product/pix/draw-big.png "Kliknite za veću sliku")
 
 *Моћан графички пакет*
 
diff --git a/content/sr-cyrl/product/impress.md b/content/sr-cyrl/product/impress.md
index db6eb28..0be57c0 100644
--- a/content/sr-cyrl/product/impress.md
+++ b/content/sr-cyrl/product/impress.md
@@ -2,7 +2,7 @@ type=page
 title=Презентација Apache OpenOffice-а
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Impress](/product/pix/impress.png)](/product/pix/impress-big.png "Kliknite za veću sliku") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Impress](/product/pix/impress.png)](/product/pix/impress-big.png "Kliknite za veću sliku")
 
 *Још снажније перформансе за ваше презентације*
 
diff --git a/content/sr-cyrl/product/index.md b/content/sr-cyrl/product/index.md
index b24ed58..649d603 100644
--- a/content/sr-cyrl/product/index.md
+++ b/content/sr-cyrl/product/index.md
@@ -1,36 +1,30 @@
 type=page
 title=Опис производа Apache OpenOffice-а
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=/product/styles.css
+css=/product/styles.css
 ~~~~~~
 Компатибилан са осталим главним канцеларијским пакетима, Apache OpenOffice је бесплатан за
 преузимање, коришћење и дистрибуцију. [Преузмите га одмах][1], и имајте:
 
-![Apache OpenOffice?](/images/AOO_logos/orb.jpg) # {.rfloatimg}
+![Apache OpenOffice?](/images/AOO_logos/orb.jpg)
 
   - [Писац](writer.html "Wordprocessor") - програм за обраду текста можете да користите за
     било какво писање, од на брзину писаног писма до стварања читаве књиге.
-    # { .product-writer }
   - [Рачун](calc.html "Spreadsheet") - моћна прорачунска табела са свим алатима
     потребним за рачунање, анализирање, и приказом ваших података у бројним извештајима   
     или одличиним графиконима.
-	# { .product-calc }  
   - [Презентација](impress.html "Presentation program") - најснажнији, најмоћнији начин
     да се направе ефективне мултимедијалне презентације. 
-	# { .product-impress }
   - [Цртеж](draw.html "Vector drawing tool") - омогућава да произведете све: од 
     једноставних дијаграма до динамичних 3Д илустрација.  
-	# { .product-draw }
   - [База](base.html "Database") - омогућава вам да лако манипулишете базама података.
     Прављење и мењање табела, образаца, упита и извештаја, све то унутар
     Apache OpenOffice-а. 
-	# { .product-base }
   - [Математика](math.html "Mathematical function creator") - омогућава вам да креирате
     математичке једначине са графичким корисничким интерфејсом или директно куцајући
     формуле унутар уређивача за једначине. 
-	# { .product-math }
 
-## Зашто Apache OpenOffice? #{ .why }
+## Зашто Apache OpenOffice?
 
 Apache OpenOffice је синоним за **квалитет**:
 
diff --git a/content/sr-cyrl/product/math.md b/content/sr-cyrl/product/math.md
index 78827b0..b12ef98 100644
--- a/content/sr-cyrl/product/math.md
+++ b/content/sr-cyrl/product/math.md
@@ -2,7 +2,7 @@ type=page
 title=Математика Apache OpenOffice-a
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Math](/product/pix/math.png)](/product/pix/math-big.png "Kliknite za veću sliku") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Math](/product/pix/math.png)](/product/pix/math-big.png "Kliknite za veću sliku")
 
 *Направите једначине и формуле за документе*
 
diff --git a/content/sr-cyrl/product/writer.md b/content/sr-cyrl/product/writer.md
index b6ec3c5..4c05f26 100644
--- a/content/sr-cyrl/product/writer.md
+++ b/content/sr-cyrl/product/writer.md
@@ -2,7 +2,7 @@ type=page
 title=Писац Apache OpenOffice-a
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Writer](/product/pix/writer.png)](/product/pix/writer-big.png "Kliknite za veću sliku") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Writer](/product/pix/writer.png)](/product/pix/writer-big.png "Kliknite za veću sliku")
 
 *За сва ваша документа*
 
diff --git a/content/sr-latn/product/index.md b/content/sr-latn/product/index.md
index f22a8e9..579a30e 100644
--- a/content/sr-latn/product/index.md
+++ b/content/sr-latn/product/index.md
@@ -15,21 +15,16 @@ preuzimanje, korišćenje i distribuciju. [Preuzmite ga odmah][1], i imajte:
   - [Račun](calc.html "Spreadsheet") - moćna proračunska tabela sa svim alatima
     potrebnim za računanje, analiziranje, i prikazom vaših podataka u brojnim izveštajima   
     ili odličinim grafikonima. 
-	# { .product-calc }  
   - [Prezentacija](impress.html "Presentation program") - najsnažniji, najmoćniji način
     da se naprave efektivne multimedijalne prezentacije. 
-	# { .product-impress }
   - [Crtež](draw.html "Vector drawing tool") - omogućava da proizvedete sve: od 
     jednostavnih dijagrama do dinamičnih 3D ilustracija. 
-	# { .product-draw }
   - [Baza](base.html "Database") - omogućava vam da lako manipulišete bazama podataka.
     Pravljenje i menjanje tabela, obrazaca, upita i izveštaja, sve to unutar
     Apache OpenOffice-a. 
-	# { .product-base }
   - [Matematika](math.html "Mathematical function creator") - omogućava vam da kreirate
     matematičke jednačine sa grafičkim korisničkim interfejsom ili direktno kucajući
     formule unutar uređivača za jednačine. 
-	# { .product-math }
 
 ## Zašto Apache OpenOffice?
 
diff --git a/content/zh-cn/product/base.md b/content/zh-cn/product/base.md
index 4d6248a..31fe219 100644
--- a/content/zh-cn/product/base.md
+++ b/content/zh-cn/product/base.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Base
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Base](/product/pix/base.png)](/product/pix/base-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Base](/product/pix/base.png)](/product/pix/base-big.png "Click for bigger version")
 
 **Base** is a fully featured desktop database management system, designed to
 meet the needs of a broad array of users, from
diff --git a/content/zh-cn/product/calc.md b/content/zh-cn/product/calc.md
index 0d805d8..73c4000 100644
--- a/content/zh-cn/product/calc.md
+++ b/content/zh-cn/product/calc.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Calc
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Calc界面截图](/product/pix/calc.png)](/product/pix/calc-big.png "点击查看大图") # {.rfloatimg}
+[![Apache OpenOffice Calc界面截图](/product/pix/calc.png)](/product/pix/calc-big.png "点击查看大图")
 
 *通用的电子表格*
 
diff --git a/content/zh-cn/product/draw.md b/content/zh-cn/product/draw.md
index c0f2725..eaf9bfd 100644
--- a/content/zh-cn/product/draw.md
+++ b/content/zh-cn/product/draw.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Draw
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Draw](/product/pix/draw.png)](/product/pix/draw-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Draw](/product/pix/draw.png)](/product/pix/draw-big.png "Click for bigger version")
 
 *The powerful graphics package*
 
diff --git a/content/zh-cn/product/impress.md b/content/zh-cn/product/impress.md
index 016e7d9..73ec495 100644
--- a/content/zh-cn/product/impress.md
+++ b/content/zh-cn/product/impress.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Impress
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Impress](/product/pix/impress.png)](/product/pix/impress-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Impress](/product/pix/impress.png)](/product/pix/impress-big.png "Click for bigger version")
 
 *More power to your presentations*
 
diff --git a/content/zh-cn/product/index.md b/content/zh-cn/product/index.md
index fd9dfac..697f547 100644
--- a/content/zh-cn/product/index.md
+++ b/content/zh-cn/product/index.md
@@ -1,26 +1,20 @@
 type=page
 title=Apache OpenOffice 产品描述
 notice=https://www.apache.org/licenses/LICENSE-2.0
-css=/product/styles.css
+css=/product/styles.css
 ~~~~~~
 兼容其他主流办公套件,Apache OpenOffice是自由下载、使用和分发的。 [现在就去下载][1], 并获得:
 
-![Apache OpenOffice?](/images/AOO_logos/orb.jpg) # {.rfloatimg}
+![Apache OpenOffice?](/images/AOO_logos/orb.jpg)
 
   - [Writer](writer.html "文字处理") 一个文字处理软件,您可以用它做任何事。无论是一条便签还是整本书。
-    # { .product-writer }
   - [Calc](calc.html "电子表格") 一个强大的电子表格软件,拥有几乎所有必要功能:计算、统计和用数字或图形呈现您的数据.
-    # { .product-calc }
   - [Impress](impress.html "演示程序") 最快最强大的途径来创建令人记忆犹新的多媒体演示.
-    # { .product-impress }
   - [Draw](draw.html "矢量绘图工具") 让您的产品包罗万象,绘制从简单的图表到动态三维的插图.
-    # { .product-draw }
   - [Base](base.html "数据库") 让您无缝操纵数据库.从Apache OpenOffice中创建和修改表、表单、查询和报告. 
-    # { .product-base }
   - [Math](math.html "数学函数创建") 允许您从图形界面创建数学方程式或直接输入公式编辑器的方程。
-    # { .product-math }
 
-## 为什么要用 Apache OpenOffice? #{ .why }
+## 为什么要用 Apache OpenOffice?
 
 Apache OpenOffice 等同于 **质量**
 
diff --git a/content/zh-cn/product/math.md b/content/zh-cn/product/math.md
index 9842590..ed05504 100644
--- a/content/zh-cn/product/math.md
+++ b/content/zh-cn/product/math.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Math
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Apache OpenOffice Math屏幕截图](/product/pix/math.png)](/product/pix/math-big.png "点击看大图") # {.rfloatimg}
+[![Apache OpenOffice Math屏幕截图](/product/pix/math.png)](/product/pix/math-big.png "点击看大图")
 
 *为你的文档创建方程和公式*
 
diff --git a/content/zh-cn/product/writer.md b/content/zh-cn/product/writer.md
index 2fb85b9..21c523c 100644
--- a/content/zh-cn/product/writer.md
+++ b/content/zh-cn/product/writer.md
@@ -2,7 +2,7 @@ type=page
 title=Apache OpenOffice Writer
 notice=https://www.apache.org/licenses/LICENSE-2.0
 ~~~~~~
-[![Screendump of Apache OpenOffice Writer](/product/pix/writer.png)](/product/pix/writer-big.png "Click for bigger version") # {.rfloatimg}
+[![Screendump of Apache OpenOffice Writer](/product/pix/writer.png)](/product/pix/writer-big.png "Click for bigger version")
 
 *给您的所有文档*
 
diff --git a/templates/markdown_css.gsp b/templates/markdown_css.gsp
index e1e4e06..ed6ab5b 100644
--- a/templates/markdown_css.gsp
+++ b/templates/markdown_css.gsp
@@ -22,4 +22,4 @@
          }
      }
   }
-%>
+%>
\ No newline at end of file
diff --git a/templates/page.gsp b/templates/page.gsp
index 31990b2..c720f62 100644
--- a/templates/page.gsp
+++ b/templates/page.gsp
@@ -19,14 +19,18 @@
   <head>
     <% if (content.header) { %>
     ${content.header}
+    <link href="/css/ooo.css" rel="stylesheet" type="text/css">
     <% }  else { %>
     <title>${content.title}</title>
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+    <link href="/css/ooo.css" rel="stylesheet" type="text/css">
     <% if (content.css) { %>
     <link href="${content.css}" rel="stylesheet" type="text/css">
     <% } %>
+    <% if (content.css2) { %>
+    <link href="${content.css2}" rel="stylesheet" type="text/css">
+    <% } %>
     <% } %>
-    <link href="/css/ooo.css" rel="stylesheet" type="text/css">
     <!--#include virtual="/scripts/google-analytics.js" --> 
     <!--#include virtual="/scripts/entourage.js" -->
   </head>