page.tmpl: use OTHERLANGUAGES and PERCENTTRANSLATED

Signed-off-by: intrigeri <intrigeri@boum.org>

diff --git a/doc/plugins/po.mdwn b/doc/plugins/po.mdwn
index 1f57418b539c9f23476f886944d54eefc54e76cb..235674f3167229be19c0deaa99d70f34b8461929 100644 (file)
--- a/doc/plugins/po.mdwn
+++ b/doc/plugins/po.mdwn
@@ -150,24 +150,9 @@ display things only on translatable or translation pages.
 The `OTHERLANGUAGES` loop provides ways to display other languages'
 versions of the same page, and the translations' status.
 
 The `OTHERLANGUAGES` loop provides ways to display other languages'
 versions of the same page, and the translations' status.
 

-One typically adds the following code to `templates/page.tmpl`:
-
-       <TMPL_IF NAME="OTHERLANGUAGES">
-       <div id="otherlanguages">
-         <ul>
-         <TMPL_LOOP NAME="OTHERLANGUAGES">
-           <li>
-             <a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="LANGUAGE"></a>
-             <TMPL_UNLESS NAME="MASTER">
-               (<TMPL_VAR NAME="PERCENT">&nbsp;%)
-             </TMPL_UNLESS>
-           </li>
-         </TMPL_LOOP>
-         </ul>
-       </div>
-       </TMPL_IF>
-
-The following variables are available inside the loop (for every page in):
+An example of its use can be found in the default
+`templates/page.tmpl`. In case you want to customize it, the following
+variables are available inside the loop (for every page in):

 
 * `URL` - url to the page
 * `CODE` - two-letters language code
 
 * `URL` - url to the page
 * `CODE` - two-letters language code


@@ -178,15 +163,8 @@ The following variables are available inside the loop (for every page in):
 ### Display the current translation status
 
 The `PERCENTTRANSLATED` variable is set to the translation
 ### Display the current translation status
 
 The `PERCENTTRANSLATED` variable is set to the translation

-completeness, expressed in percent, on "slave" pages.
-
-One can use it this way:
-
-       <TMPL_IF NAME="ISTRANSLATION">
-       <div id="percenttranslated">
-         <TMPL_VAR NAME="PERCENTTRANSLATED">
-       </div>
-       </TMPL_IF>
+completeness, expressed in percent, on "slave" pages. It is used by
+the default `templates/page.tmpl`.

 
 Additional PageSpec tests
 -------------------------
 
 Additional PageSpec tests
 -------------------------

diff --git a/templates/page.tmpl b/templates/page.tmpl
index 29ba688c749de8b2823d67a465bab96be798d8a5..8622d1a013b0474d5133b387c4ad369a67b38ba2 100644 (file)
--- a/templates/page.tmpl
+++ b/templates/page.tmpl
@@ -28,6 +28,9 @@
 </span>
 <span class="title">
 <TMPL_VAR TITLE>
 </span>
 <span class="title">
 <TMPL_VAR TITLE>

+<TMPL_IF NAME="ISTRANSLATION">
+(<TMPL_VAR NAME="PERCENTTRANSLATED">&nbsp;%)
+</TMPL_IF>

 </span>
 </span><!--.header-->
 <TMPL_IF NAME="SEARCHFORM">
 </span>
 </span><!--.header-->
 <TMPL_IF NAME="SEARCHFORM">


@@ -60,6 +63,24 @@
 </ul>
 </div>
 </TMPL_IF>
 </ul>
 </div>
 </TMPL_IF>

+
+<TMPL_IF NAME="OTHERLANGUAGES">
+<div id="otherlanguages">
+<ul>
+<TMPL_LOOP NAME="OTHERLANGUAGES">
+<li>
+<a href="<TMPL_VAR NAME="URL">"><TMPL_VAR NAME="LANGUAGE"></a>
+<TMPL_IF NAME="MASTER">
+(master)
+<TMPL_ELSE>
+(<TMPL_VAR NAME="PERCENT">&nbsp;%)
+</TMPL_IF>
+</li>
+</TMPL_LOOP>
+</ul>
+</div> <!-- #otherlanguages -->
+</TMPL_IF>
+

 </div> <!-- .pageheader -->
 
 <TMPL_IF SIDEBAR>
 </div> <!-- .pageheader -->
 
 <TMPL_IF SIDEBAR>