From 2b7a348eae2074b4f1a0660c4840f36b4ca36ad8 Mon Sep 17 00:00:00 2001 From: ovclas Date: Wed, 16 May 2012 07:29:36 +0000 Subject: [PATCH] reverse merge from 1.6.0 (r10594) git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10688 201d5d3c-b55e-5fd7-737f-ddc643e51545 --- common/tpl/common_layout.html | 20 ++++---- common/tpl/mobile_layout.html | 92 +++++++++++++++++------------------ 2 files changed, 55 insertions(+), 57 deletions(-) diff --git a/common/tpl/common_layout.html b/common/tpl/common_layout.html index 75be1b9dc..09c960272 100644 --- a/common/tpl/common_layout.html +++ b/common/tpl/common_layout.html @@ -43,20 +43,20 @@ {Context::getHtmlHeader()} - +//]]> + {Context::getBodyHeader()} diff --git a/common/tpl/mobile_layout.html b/common/tpl/mobile_layout.html index 6eb8c5181..13385d474 100644 --- a/common/tpl/mobile_layout.html +++ b/common/tpl/mobile_layout.html @@ -1,33 +1,37 @@ +{@ + $db_info = Context::getDBInfo(); + $lang_type = Context::getLangType(); +} - + - - +{@$css_files=Context::getCssFile()} +{@$js_files=Context::getJsFile()} + + + + + + + {Context::getBrowserTitle()} -{@ $css_files = Context::getCssFile() } - - - - - - - - -{@ $js_files = Context::getJsFile() } - - - - - - - - + + + + + + + + + @@ -36,25 +40,22 @@ - + - {@ $ssl_actions = Context::getSSLActions() } - + var current_mid = "{$mid}"; + var waiting_message = "{$lang->msg_call_server}"; + var ssl_actions = new Array("{implode('","',$ssl_actions)}"); + var default_url = "{Context::getDefaultUrl()}"; + var http_port = {Context::get("_http_port")}; + var https_port = {Context::get("_https_port")}; + var enforce_ssl = true; +//]]> {Context::getHtmlHeader()} @@ -65,14 +66,11 @@ {Context::getHtmlFooter()} {@ $js_body_files = Context::getJsFile('body') } - - - - - - - - + + + +