[Fusionforge-commits] r11155 - trunk/src/plugins/wiki/www/themes/fusionforge/templates

Marc-Etienne VARGENAU vargenau at libremir.placard.fr.eu.org
Fri Oct 22 21:10:12 CEST 2010


Author: vargenau
Date: 2010-10-22 21:10:11 +0200 (Fri, 22 Oct 2010)
New Revision: 11155

Modified:
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl
   trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl
Log:
Update from Phpwiki

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/actionbar.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,8 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id: actionbar.tmpl 7706 2010-09-22 14:39:24Z vargenau $');
-?>
+// $Id: actionbar.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 
-<?php 
 $curuserprefs = $user->getPreferences();
 $dbh = $request->getDbh();
 $isAdmin = $user->isAdmin();
@@ -19,7 +17,7 @@
     <?php $talk = new WikiPageName('Talk:'.$pagename); ?>
       <td class="bold">
       <?php echo Button(array(),
-                       $isActionPage ? _("Action Page") : _("Page"), 
+                       $isActionPage ? _("Action Page") : _("Page"),
                        $talk->getParent(), array('title' => "Page")) ?>
       </td>
       <td class="spacer">&nbsp;</td>
@@ -85,7 +83,7 @@
       <td class="spacer">&nbsp;</td>
       <td><?php echo Button(array('action'=>'BackLinks'), _("Back Links"),$page->getName()) ?></td>
 
-    <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?> 
+    <?php if (defined('USE_EXTERNAL_HTML2PDF') and USE_EXTERNAL_HTML2PDF) { ?>
       <?php if ($curuserprefs->get('pdfMenuItem')) { ?>
         <td class="spacer">&nbsp;</td>
         <td><?php echo Button("pdf") ?></td>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/blogform.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*- php -*-
-// rcs_id('$Id: blogform.tmpl 7589 2010-07-02 07:31:33Z vargenau $');
+// $Id: blogform.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <div class="wikiblog wikiblog-form">
 <form action="<?php echo $request->getPostURL()?>" method="post" name="editpage"

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/body.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: body.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
+// $Id: body.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <table width="100%" cellpadding="0" cellspacing="0">
 <tr>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/bottom.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: bottom.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
+// $Id: bottom.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) { ?>
 <?php if (defined('DEBUG') and DEBUG) { ?>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse-footer.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,4 +1,4 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse-footer.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
+// $Id: browse-footer.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <p class="editdate"><?php echo $WikiTheme->getOwnerMessage($page) ?>  <?php echo $WikiTheme->getLastModifiedMessage($revision) ?> <?php echo $WikiTheme->getAuthorMessage($revision) ?></p>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/browse.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,7 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id: browse.tmpl 7706 2010-09-22 14:39:24Z vargenau $');
-?>
-<?php
+// $Id: browse.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+
 $curuserprefs = $user->getPreferences();
 ?>
 

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/debug.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: debug.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
+// $Id: debug.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <?php global $RUNTIMER; ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/editpage.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: editpage.tmpl 7675 2010-09-03 13:08:03Z vargenau $');
+// $Id: editpage.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <?php if (isset($PREVIEW_CONTENT)) { ?>
   <p><strong><?php echo _("Preview only!  Changes not saved.")?></strong>
@@ -17,7 +17,7 @@
         <?php echo _("Saving this page will overwrite the current version.")?></strong></p>
 <?php } ?>
 <?php /*
- * FIXME: Hack! 
+ * FIXME: Hack!
  * The funky URL used for the form action parameter is bogus.
  * This is needed, otherwise the redirect to the real browser
  * page won't work with some browsers. (NS4 and Mozilla 0.97 won't accept
@@ -33,7 +33,7 @@
     <tr><td><?php echo $EDIT_TOOLBAR ?></td>
         <td align="right"><div id="editarea-size">
     <?php echo _("Size").':'?>
-    <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?> 
+    <label for="pref-editHeight"><b><?php echo _("H")?></b></label> <?php echo $HEIGHT_PREF?>
     <label for="pref-editWidth"><b><?php echo _("W")?></b></label> <?php echo $WIDTH_PREF?>
     <noscript><?php echo Button("submit:", _("Adjust"), 'wikiaction')?></noscript>
   </div></td></tr></table>
@@ -44,12 +44,12 @@
 <table summary="Toolbar: Page editing options." class="toolbar" width="100%"
        cellpadding="0" cellspacing="0" border="0">
 <tr valign="middle">
-  <td> 
+  <td>
     <?php echo $MINOR_EDIT_CB ?> <label for="edit-minor_edit"><?php echo _("This is a minor change.")?></label><br />
   </td>
   <td align="center">
     <?php echo $PREVIEW_B ?>
-    <?php if ($SAVE_B)  { ?> 
+    <?php if ($SAVE_B)  { ?>
       <?php echo $SEP?><?php echo $SAVE_B ?>
     <?php } ?>
     <?php echo $SEP?><?php echo $CHANGES_B ?>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/html.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,7 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: html.tmpl 7666 2010-08-31 16:02:45Z vargenau $');
-?>
-<?php
+// $Id: html.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 /*
  * No header for FusionForge (already provided)
  */

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/login.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: login.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
+// $Id: login.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <?php if ($fail_message) { ?>
   <div class="error"><p><?php echo $fail_message?></p></div>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/navbar.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,7 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id: navbar.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
-?>
-<?php 
+// $Id: navbar.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+
 $curuserprefs = $user->getPreferences();
 $dbh = $request->getDbh();
 $username = $user->UserName();

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/pagelink.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,7 +1,6 @@
 <?php // -*-php-*-
-// rcs_id('$Id: pagelink.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
-?>
-<?php
+// $Id: pagelink.tmpl 7720 2010-10-22 18:38:33Z vargenau $
+
 /**
  * Themable paging "|<< <<   - i/sum - >> >>|" links
  *
@@ -25,7 +24,7 @@
       <?php echo fmt(" - %d / %d - ", $ACTPAGE, $NUMPAGES) ?>
   </td>
   <td class="wikipaging<?php echo $NEXT ? "-enabled" : "-disabled" ?>" align="right">
-      <?php echo $NEXT ?  HTML::a(array('href'=>$NEXT_LINK),_("Next >>"))  : _(">>") ?> 
+      <?php echo $NEXT ?  HTML::a(array('href'=>$NEXT_LINK),_("Next >>"))  : _(">>") ?>
       &nbsp;
       <?php echo $NEXT ?  HTML::a(array('href'=>$LAST_LINK),_(">>|")) : _(">>|") ?>
   </td>

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/ratings.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,5 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: ratings.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
+// $Id: ratings.tmpl 7720 2010-10-22 18:38:33Z vargenau $
 ?>
 <?php if (!$WikiTheme->DUMP_MODE) {
   $loader = new WikiPluginLoader();

Modified: trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl
===================================================================
--- trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl	2010-10-22 18:59:09 UTC (rev 11154)
+++ trunk/src/plugins/wiki/www/themes/fusionforge/templates/userprefs.tmpl	2010-10-22 19:10:11 UTC (rev 11155)
@@ -1,7 +1,5 @@
 <?php // -*-php-*-
-// rcs_id('$Id: userprefs.tmpl 7660 2010-08-31 15:03:30Z vargenau $');
-?>
-<?php
+// $Id: userprefs.tmpl 7720 2010-10-22 18:38:33Z vargenau $'
 // Todo: Move the logic and code to the plugin
 // This is very experimental and the read-only part an ugly hack so far.
 foreach (explode(',','errmsg,isForm') as $var) {
@@ -9,7 +7,7 @@
 }
 
 $plugin = $request->getArg('pagename');
-if (isActionPage($request->getArg('pagename')) 
+if (isActionPage($request->getArg('pagename'))
     and $isForm and $plugin == _("PreferencesInfo")) {
     $isForm = false;
 }
@@ -130,44 +128,44 @@
 $SelectThemes = ''; $SelectLanguages = '';
 $SelectThemesDesc = ''; $SelectLanguagesDesc = '';
 if ( $isForm ) {
-    $SelectOptions = HTML(); 
+    $SelectOptions = HTML();
     if (!empty($available_themes) and is_array($available_themes)) {
-	if (!$pref->get('theme') or $pref->get('theme') == THEME)
-	    $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
-	else
-	    $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
-	foreach ($available_themes as $theme) {
-	    if ($theme == $pref->get('theme') and $theme != THEME)
-		$SelectOptions->pushContent(selectedOption($theme));
-	    else
-		$SelectOptions->pushContent(unselectedOption($theme));
-	}
-	$SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
-				     $SelectOptions);
-	$SelectThemesDesc = _("Personal theme:");
+        if (!$pref->get('theme') or $pref->get('theme') == THEME)
+            $SelectOptions->pushContent(selectedOption("",_("<system theme>")));
+        else
+            $SelectOptions->pushContent(unselectedOption("",_("<system theme>")));
+        foreach ($available_themes as $theme) {
+            if ($theme == $pref->get('theme') and $theme != THEME)
+                $SelectOptions->pushContent(selectedOption($theme));
+            else
+                $SelectOptions->pushContent(unselectedOption($theme));
+        }
+        $SelectThemes = HTML::select(array('name' => "pref[theme]",'id' => 'theme'),
+                                     $SelectOptions);
+        $SelectThemesDesc = _("Personal theme:");
     }
-    
+
     $SelectOptions = HTML();
     if (!empty($available_languages) and is_array($available_languages)) {
-	if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
-	    $SelectOptions->pushContent(selectedOption("",_("<system language>")));
-	else
-	    $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
-	foreach ($available_languages as $lang) {
-	    if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
-		$SelectOptions->pushContent(selectedOption($lang));
-	    else
-		$SelectOptions->pushContent(unselectedOption($lang));
-	}
-	$SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
-					$SelectOptions);
-	$SelectLanguagesDesc = _("Personal language:");
+        if (!$pref->get('lang') or $pref->get('lang') == DEFAULT_LANGUAGE)
+            $SelectOptions->pushContent(selectedOption("",_("<system language>")));
+        else
+            $SelectOptions->pushContent(unselectedOption("",_("<system language>")));
+        foreach ($available_languages as $lang) {
+            if ($lang == $pref->get('lang') and $lang != DEFAULT_LANGUAGE)
+                $SelectOptions->pushContent(selectedOption($lang));
+            else
+                $SelectOptions->pushContent(unselectedOption($lang));
+        }
+        $SelectLanguages = HTML::select(array('name' => "pref[lang]",'id' => 'lang'),
+                                        $SelectOptions);
+        $SelectLanguagesDesc = _("Personal language:");
     } else {
-	if ($SelectThemes == '') {
-	    $appearance = false;
-	    $SelectThemesDesc = '';
-	    $SelectLanguagesDesc = '';
-	}
+        if ($SelectThemes == '') {
+            $appearance = false;
+            $SelectThemesDesc = '';
+            $SelectLanguagesDesc = '';
+        }
     }
 } else {
     $SelectThemesDesc = _("Personal theme:");




More information about the Fusionforge-commits mailing list