From 9bc0fe84e915fe2d24532418abe292185b5f4b6e Mon Sep 17 00:00:00 2001
From: Denis Shakhov <denis.shakhov@gmail.com>
Date: Tue, 18 Jun 2013 16:38:02 +0700
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D0=B8?=
 =?UTF-8?q?=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=B8=D1=8F=20?=
 =?UTF-8?q?=D0=B2=20=D0=B4=D0=B5=D1=84=D0=BE=D0=BB=D1=82=D0=BD=D1=8B=D1=85?=
 =?UTF-8?q?=20=D0=BF=D0=BB=D0=B0=D0=B3=D0=B8=D0=BD=D0=B0=D1=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../skin/default/actions/ActionPage/admin.tpl         |  6 +++---
 .../skin/default/actions/ActionPage/page.tpl          |  9 +++++++--
 .../skin/default/actions/ActionProfiler/report.tpl    | 11 ++++++-----
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/plugins/page/templates/skin/default/actions/ActionPage/admin.tpl b/plugins/page/templates/skin/default/actions/ActionPage/admin.tpl
index eb48512b..1001278d 100644
--- a/plugins/page/templates/skin/default/actions/ActionPage/admin.tpl
+++ b/plugins/page/templates/skin/default/actions/ActionPage/admin.tpl
@@ -4,9 +4,9 @@
 	{$bNoSidebar = true}
 {/block}
 
+{block name='layout_page_title'}{$aLang.plugin.page.admin}{/block}
+
 {block name='layout_content'}
-	<h2 class="page-header">{$aLang.plugin.page.admin}</h2>
-	
 	{if $aParams.0=='new'}
 		<h3 class="h6">{$aLang.plugin.page.create}</h3>
 		{include file=$aTemplatePathPlugin.page|cat:'actions/ActionPage/add.tpl'}
@@ -14,7 +14,7 @@
 		<h3 class="h6">{$aLang.plugin.page.edit} «{$oPageEdit->getTitle()}»</h3>
 		{include file=$aTemplatePathPlugin.page|cat:'actions/ActionPage/add.tpl'}
 	{else}
-		<a href="{router page='page'}admin/new/" class="button">{$aLang.plugin.page.new}</a><br /><br />
+		<a href="{router page='page'}admin/new/" class="button button-primary">{$aLang.plugin.page.new}</a><br /><br />
 	{/if}
 
 
diff --git a/plugins/page/templates/skin/default/actions/ActionPage/page.tpl b/plugins/page/templates/skin/default/actions/ActionPage/page.tpl
index 6eaf1c61..ec83b0b4 100644
--- a/plugins/page/templates/skin/default/actions/ActionPage/page.tpl
+++ b/plugins/page/templates/skin/default/actions/ActionPage/page.tpl
@@ -4,9 +4,9 @@
 	{$bNoSidebar = true}
 {/block}
 
+{block name='layout_page_title'}{$oPage->getTitle()}{/block}
+
 {block name='layout_content'}
-	<h2 class="page-header">{$oPage->getTitle()}</h2>
-	
 	<div class="text">
 		{if $oConfig->GetValue('view.tinymce')}
 			{$oPage->getText()}
@@ -18,4 +18,9 @@
 			{/if}
 		{/if}
 	</div>
+
+	{if $oUserCurrent and $oUserCurrent->isAdministrator()}
+		<br />
+		<a href="{router page='page'}admin/edit/{$oPage->getId()}/">{$aLang.plugin.page.admin_action_edit}</a>
+	{/if}
 {/block}
\ No newline at end of file
diff --git a/plugins/profiler/templates/skin/default/actions/ActionProfiler/report.tpl b/plugins/profiler/templates/skin/default/actions/ActionProfiler/report.tpl
index 5fe369e4..4ad40c00 100644
--- a/plugins/profiler/templates/skin/default/actions/ActionProfiler/report.tpl
+++ b/plugins/profiler/templates/skin/default/actions/ActionProfiler/report.tpl
@@ -4,16 +4,18 @@
 	{$noShowSystemMessage = false}
 {/block}
 
-{block name='layout_content'}
+{block name='layout_page_title'}{$aLang.plugin.profiler.reports_title}{/block}
+
+{block name='layout_head_end'}
 	<script>
-		var DIR_PLUGIN_SKIN='{$aTemplateWebPathPlugin.profiler}';
+		var DIR_PLUGIN_SKIN = '{$aTemplateWebPathPlugin.profiler}';
 	</script>
 
 	<script type="text/javascript" src="{$aTemplateWebPathPlugin.profiler}js/profiler.js"></script>
 	<link rel="stylesheet" type="text/css" href="{$aTemplateWebPathPlugin.profiler}css/style.css" media="all" />
+{/block}
 
-	<h2 class="page-header">{$aLang.plugin.profiler.reports_title}</h2>
-
+{block name='layout_content'}
 	<form action="{router page='profiler'}" method="post" id="form_report_list">
 		<input type="hidden" name="security_ls_key" value="{$LIVESTREET_SECURITY_KEY}" /> 
 		
@@ -52,6 +54,5 @@
 		{/if}
 	</form>
 
-					
 	{include file='paging.tpl' aPaging="$aPaging"}
 {/block}
\ No newline at end of file