[Tikiwiki-cvs/svn] SF.net SVN: tikiwiki:[45797] trunk

[<lph...@us...>]

Revision: 45797
          http://sourceforge.net/p/tikiwiki/code/45797
Author:   lphuberdeau
Date:     2013-04-29 16:43:39 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
[MOD]?\194?\160Converting tiki-editpage.php

Modified Paths:
--------------
    trunk/lib/init/smarty.php
    trunk/templates/tiki-choose_page_language.tpl
    trunk/templates/tiki-editpage.tpl
    trunk/tiki-editpage.php

Modified: trunk/lib/init/smarty.php
===================================================================
--- trunk/lib/init/smarty.php	2013-04-29 16:16:05 UTC (rev 45796)
+++ trunk/lib/init/smarty.php	2013-04-29 16:43:39 UTC (rev 45797)
@@ -230,17 +230,18 @@
 
 			$this->assign('mid_data', $data);
 
-			include_once('tiki-modules.php');
-
 		} elseif ($_smarty_tpl_file == 'confirm.tpl' || $_smarty_tpl_file == 'error.tpl' || $_smarty_tpl_file == 'error_ticket.tpl' || $_smarty_tpl_file == 'error_simple.tpl') {
 			ob_end_clean(); // Empty existing Output Buffer that may have been created in smarty before the call of this confirm / error* template
 			if ( $prefs['feature_obzip'] == 'y' ) {
 				ob_start('ob_gzhandler');
 			}
 
-			include_once('tiki-modules.php');
+		}
 
+		if (! defined('TIKI_IN_INSTALLER')) {
+			require 'tiki-modules.php';
 		}
+		
 		if (isset($style_base)) {
 			if ($tikidomain and file_exists("templates/$tikidomain/styles/$style_base/$_smarty_tpl_file")) {
 				$_smarty_tpl_file = "$tikidomain/styles/$style_base/$_smarty_tpl_file";

Modified: trunk/templates/tiki-choose_page_language.tpl
===================================================================
--- trunk/templates/tiki-choose_page_language.tpl	2013-04-29 16:16:05 UTC (rev 45796)
+++ trunk/templates/tiki-choose_page_language.tpl	2013-04-29 16:43:39 UTC (rev 45797)
@@ -1,4 +1,10 @@
+{extends 'layout_edit.tpl'}
+
+{block name=title}
 <h1>{tr}Please choose the language for this page:{/tr}</h1>
+{/block}
+
+{block name=content}
 <div class="cbox-data">
 	<p>
 		<strong>{tr _0=$page|escape}Page: "%0"{/tr}</strong>
@@ -16,3 +22,4 @@
 		<input type="submit" name="select_language" value="{tr}Choose language{/tr}" onclick="needToConfirm=false;">
 	</form>
 </div>
+{/block}

Modified: trunk/templates/tiki-editpage.tpl
===================================================================
--- trunk/templates/tiki-editpage.tpl	2013-04-29 16:16:05 UTC (rev 45796)
+++ trunk/templates/tiki-editpage.tpl	2013-04-29 16:43:39 UTC (rev 45797)
@@ -1,4 +1,15 @@
 {* $Id$ *}
+{extends 'layout_edit.tpl'}
+
+{block name=title}
+{if $translation_mode eq 'n'}
+	{title}{if isset($hdr) && $prefs.wiki_edit_section eq 'y'}{tr}Edit Section:{/tr}{else}{tr}Edit:{/tr}{/if} {$page}{if $pageAlias ne ''} ({$pageAlias}){/if}{/title}
+{else}
+   {title}{tr}Update '{$page}'{/tr}{/title}
+{/if}
+{/block}
+
+{block name=content}
 {if $page|lower neq 'sandbox' and $prefs.feature_contribution eq 'y' and $prefs.feature_contribution_mandatory eq 'y'}
 	{remarksbox type='tip' title="{tr}Tip{/tr}"}
 		<strong class='mandatory_note'>{tr}Fields marked with a * are mandatory.{/tr}</strong>
@@ -30,11 +41,6 @@
 	return false;
 });{/jq}
 {/if}
-{if $translation_mode eq 'n'}
-	{title}{if isset($hdr) && $prefs.wiki_edit_section eq 'y'}{tr}Edit Section:{/tr}{else}{tr}Edit:{/tr}{/if} {$page}{if $pageAlias ne ''} ({$pageAlias}){/if}{/title}
-{else}
-   {title}{tr}Update '{$page}'{/tr}{/title}
-{/if}
    
 {if isset($data.draft)}
 	{tr}Draft written on{/tr} {$data.draft.lastModif|tiki_long_time}<br/>
@@ -556,3 +562,4 @@
 	</table>
 </form>
 {include file='tiki-page_bar.tpl'}
+{/block}

Modified: trunk/tiki-editpage.php
===================================================================
--- trunk/tiki-editpage.php	2013-04-29 16:16:05 UTC (rev 45796)
+++ trunk/tiki-editpage.php	2013-04-29 16:43:39 UTC (rev 45797)
@@ -1496,16 +1496,15 @@
 // disallow robots to index page:
 $smarty->assign('metatag_robots', 'NOINDEX, NOFOLLOW');
 // Display the Edit Template or language check
-if ($need_lang) {
-	$smarty->assign('mid', 'tiki-choose_page_language.tpl');
-} else {
-	$smarty->assign('mid', 'tiki-editpage.tpl');
-}
 $smarty->assign('showtags', 'n');
 $smarty->assign('qtnum', '1');
 $smarty->assign('qtcycle', '');
-$smarty->display("tiki.tpl");
 
+if ($need_lang) {
+	$smarty->display('tiki-choose_page_language.tpl');
+} else {
+	$smarty->display('tiki-editpage.tpl');
+}
 /**
  * @param $chkURL
  * @return bool

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.