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

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

Revision: 45796
          http://sourceforge.net/p/tikiwiki/code/45796
Author:   lphuberdeau
Date:     2013-04-29 16:16:05 +0000 (Mon, 29 Apr 2013)
Log Message:
-----------
[MOD] Adding layout selector in admin panel, converting tiki-show_page.tpl, fixing with changes to compileid

Modified Paths:
--------------
    trunk/lib/init/smarty.php
    trunk/templates/admin/include_look.tpl
    trunk/templates/tiki-show_page.tpl
    trunk/tiki-index.php

Modified: trunk/lib/init/smarty.php
===================================================================
--- trunk/lib/init/smarty.php	2013-04-29 15:56:50 UTC (rev 45795)
+++ trunk/lib/init/smarty.php	2013-04-29 16:16:05 UTC (rev 45796)
@@ -411,6 +411,7 @@
 		}
 
 		$this->setCompileId("$lang-$tikidomain-$layout");
+		$this->initializePaths();
 	}
 
 	function initializePaths()
@@ -440,9 +441,6 @@
 		$this->addTemplateDir($this->main_template_dir.'/layouts/'.$prefs['site_layout'].'/');
 		$this->addTemplateDir($this->main_template_dir.'/layouts/');
 		$this->addTemplateDir($this->main_template_dir);
-
-		
-		$this->refreshLanguage();
 	}
 }
 

Modified: trunk/templates/admin/include_look.tpl
===================================================================
--- trunk/templates/admin/include_look.tpl	2013-04-29 15:56:50 UTC (rev 45795)
+++ trunk/templates/admin/include_look.tpl	2013-04-29 16:16:05 UTC (rev 45796)
@@ -17,6 +17,8 @@
 					{preference name=style}
 					{preference name=style_option}
 
+					{preference name=site_layout}
+
 					{preference name=style_admin}
 					{preference name=style_admin_option}
 

Modified: trunk/templates/tiki-show_page.tpl
===================================================================
--- trunk/templates/tiki-show_page.tpl	2013-04-29 15:56:50 UTC (rev 45795)
+++ trunk/templates/tiki-show_page.tpl	2013-04-29 16:16:05 UTC (rev 45796)
@@ -1,4 +1,6 @@
 {* $Id$ *}
+{extends 'layout_view.tpl'}
+
 {if !isset($pageLang)}
 	{if isset($info.lang)}
 		{assign var='pageLang' value=$info.lang}
@@ -7,6 +9,7 @@
 	{/if}
 {/if}
 		
+{block name=title}
 {if !isset($hide_page_header) or !$hide_page_header}
 	{if $prefs.feature_siteloc eq 'page' and $prefs.feature_breadcrumbs eq 'y'}
 		{if $prefs.feature_siteloclabel eq 'y'}{tr}Location : {/tr}{/if}
@@ -15,11 +18,14 @@
 			{breadcrumbs type="pagetitle" loc="page" crumbs=$crumbs machine_translate=$machine_translate_to_lang source_lang=$pageLang target_lang=$machine_translate_to_lang}
 		{/if}
 	{/if}
+{/if}
+{/block}
 
-{include file='tiki-flaggedrev_approval_header.tpl'}
+{block name=content}
+{if !isset($hide_page_header) or !$hide_page_header}
+	{include file='tiki-flaggedrev_approval_header.tpl'}
+{/if}
 
-{/if} {*hide_page_header*}
-
 {if !$prefs.wiki_topline_position or $prefs.wiki_topline_position eq 'top' or $prefs.wiki_topline_position eq 'both'}
 	{include file='tiki-wiki_topline.tpl'}
 {/if}
@@ -186,3 +192,4 @@
 		{include file='tiki-page_bar.tpl'}
 	{/if}
 {/if}
+{/block}

Modified: trunk/tiki-index.php
===================================================================
--- trunk/tiki-index.php	2013-04-29 15:56:50 UTC (rev 45795)
+++ trunk/tiki-index.php	2013-04-29 16:16:05 UTC (rev 45796)
@@ -651,9 +651,8 @@
 );
 
 $smarty->assign('info', $info);
-$smarty->assign('mid', 'tiki-show_page.tpl');
 
-$smarty->display('tiki.tpl');
+$smarty->display('tiki-show_page.tpl');
 
 // xdebug_dump_function_profile(XDEBUG_PROFILER_CPU);
 // debug: print all objects

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