fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-02-01 01:29:58 +09:00
Code Issues Projects Releases Packages Wiki Activity

reverse merge from 1.6.0 (r10594)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@10688 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
ovclas 2012-05-16 07:29:36 +00:00
parent 8dea2fd567
commit 2b7a348eae
2 changed files with 55 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

20
common/tpl/common_layout.html
View file

@ -43,20 +43,20 @@
{Context::getHtmlHeader()} {Context::getHtmlHeader()}
</head> </head>
<body{Context::getBodyClass()}> <body{Context::getBodyClass()}>
<script type="text/javascript"|cond="$db_info->use_html5!='Y'"> <script type="text/javascript"|cond="$db_info->use_html5!='Y'">
//<![CDATA[ //<![CDATA[
var current_url = "{$current_url}"; var current_url = "{$current_url}";
var request_uri = "{$request_uri}"; var request_uri = "{$request_uri}";
<block cond="$vid">var xeVid = "{$vid}";</block> <block cond="$vid">var xeVid = "{$vid}";</block>
var current_mid = "{$mid}"; var current_mid = "{$mid}";
var waiting_message = "{$lang->msg_call_server}"; var waiting_message = "{$lang->msg_call_server}";
var ssl_actions = new Array(<block cond="count($ssl_actions)">"{implode('","',$ssl_actions)}"</block>); var ssl_actions = new Array(<block cond="count($ssl_actions)">"{implode('","',$ssl_actions)}"</block>);
var default_url = "{Context::getDefaultUrl()}"; var default_url = "{Context::getDefaultUrl()}";
<block cond="Context::get('_http_port')">var http_port = {Context::get("_http_port")};</block> <block cond="Context::get('_http_port')">var http_port = {Context::get("_http_port")};</block>
<block cond="Context::get('_https_port')">var https_port = {Context::get("_https_port")};</block> <block cond="Context::get('_https_port')">var https_port = {Context::get("_https_port")};</block>
<block cond="Context::get('_use_ssl') && Context::get('_use_ssl') == 'always'">var enforce_ssl = true;</block> <block cond="Context::get('_use_ssl') && Context::get('_use_ssl') == 'always'">var enforce_ssl = true;</block>
//]]> //]]>
</script> </script>
{Context::getBodyHeader()} {Context::getBodyHeader()}

92
common/tpl/mobile_layout.html
View file

@ -1,33 +1,37 @@
{@
$db_info = Context::getDBInfo();
$lang_type = Context::getLangType();
}
<!--@if($db_info->use_html5=='Y')--> <!--@if($db_info->use_html5=='Y')-->
<!DOCTYPE html> <!DOCTYPE html>
<!--@else--> <!--@else-->
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
<!--@end--> <!--@end-->
<html xmlns="http://www.w3.org/1999/xhtml" lang="{Context::getLangType()}" xml:lang="{Context::getLangType()}"> <html lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml"|cond="$db_info->use_html5!='Y'">
<head> <head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> {@$css_files=Context::getCssFile()}
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=1, user-scalable=yes, target-densitydpi=medium-dpi" /> {@$js_files=Context::getJsFile()}
<!-- META -->
<meta charset="UTF-8" cond="$db_info->use_html5=='Y'"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" cond="$db_info->use_html5!='Y'" />
<meta name="Generator" content="XpressEngine" />
<meta name="viewport" content="width=device-width, initial-scale=1, minimum-scale=1, maximum-scale=2, user-scalable=yes, target-densitydpi=medium-dpi" />
<!-- TITLE -->
<title>{Context::getBrowserTitle()}</title> <title>{Context::getBrowserTitle()}</title>
{@ $css_files = Context::getCssFile() } <!-- CSS -->
<!--@foreach($css_files as $key => $css_file)--> <block loop="$css_files=>$key,$css_file">
<!--@if($css_file['targetie'])--> <block cond="$css_file['targetie']"><!--[if {$css_file['targetie']}]></block>
<!--[if {$css_file['targetie']}]> <link rel="stylesheet" href="{$css_file['file']}" type="text/css"|cond="$db_info->use_html5!='Y'" media="{$css_file['media']}" />
<!--@end--> <block cond="$css_file['targetie']"><![endif]--></block>
<link rel="stylesheet" href="{$css_file['file']}" type="text/css" charset="UTF-8" media="{$css_file['media']}" /> </block>
<!--@if($css_file['targetie'])--> <!-- JS -->
<![endif]--> <block loop="$js_files=>$key,$js_file">
<!--@end--> <block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block>
<!--@end--> <script type="text/javascript"|cond="$db_info->use_html5!='Y'" src="{$js_file['file']}"></script>
{@ $js_files = Context::getJsFile() } <block cond="$js_file['targetie']"><![endif]--></block>
<!--@foreach($js_files as $key => $js_file)--> </block>
<!--@if($js_file['targetie'])--> <!-- RSS -->
<!--[if {$js_file['targetie']}]>
<!--@end-->
<script type="text/javascript" src="{$js_file['file']}"></script>
<!--@if($js_file['targetie'])-->
<![endif]-->
<!--@end-->
<!--@end-->
<!--@if($rss_url)--> <!--@if($rss_url)-->
<link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" /> <link rel="alternate" type="application/rss+xml" title="RSS" href="{$rss_url}" />
<link rel="alternate" type="application/atom+xml" title="Atom" href="{$atom_url}" /> <link rel="alternate" type="application/atom+xml" title="Atom" href="{$atom_url}" />
@ -36,25 +40,22 @@
<link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" /> <link rel="alternate" type="application/rss+xml" title="Site RSS" href="{$general_rss_url}" />
<link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" /> <link rel="alternate" type="application/atom+xml" title="Site Atom" href="{$general_atom_url}" />
<!--@end--> <!--@end-->
<!-- ICON -->
<link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" /> <link cond="$favicon_url" rel="shortcut icon" href="{$favicon_url}" />
<link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" /> <link cond="$mobicon_url" rel="apple-touch-icon" href="{$mobicon_url}" />
<!--[if lt IE 9]>
<script type="text/javascript" src="../js/html5.js" cond="$db_info->use_html5=='Y'"></script>
<![endif]-->
{@ $ssl_actions = Context::getSSLActions() } {@ $ssl_actions = Context::getSSLActions() }
<script type="text/javascript">//<![CDATA[ <script type="text/javascript"|cond="$db_info->use_html5!='Y'">//<![CDATA[
var current_url = "{$current_url}"; var current_url = "{$current_url}";
var request_uri = "{$request_uri}"; var request_uri = "{$request_uri}";
<!--@if($vid)-->var xeVid = "{$vid}";<!--@end--> <!--@if($vid)-->var xeVid = "{$vid}";<!--@end-->
var current_mid = "{$mid}"; var current_mid = "{$mid}";
var waiting_message = "{$lang->msg_call_server}"; var waiting_message = "{$lang->msg_call_server}";
var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->); var ssl_actions = new Array(<!--@if(count($ssl_actions))-->"{implode('","',$ssl_actions)}"<!--@end-->);
var default_url = "{Context::getDefaultUrl()}"; var default_url = "{Context::getDefaultUrl()}";
<!--@if(Context::get("_http_port"))-->var http_port = {Context::get("_http_port")};<!--@end--> <!--@if(Context::get("_http_port"))-->var http_port = {Context::get("_http_port")};<!--@end-->
<!--@if(Context::get("_https_port"))-->var https_port = {Context::get("_https_port")};<!--@end--> <!--@if(Context::get("_https_port"))-->var https_port = {Context::get("_https_port")};<!--@end-->
<!--@if(Context::get("_use_ssl") && Context::get("_use_ssl") == "always")-->var enforce_ssl = true;<!--@end--> <!--@if(Context::get("_use_ssl") && Context::get("_use_ssl") == "always")-->var enforce_ssl = true;<!--@end-->
//]]></script> //]]></script>
{Context::getHtmlHeader()} {Context::getHtmlHeader()}
</head> </head>
<body{Context::getBodyClass()}> <body{Context::getBodyClass()}>
@ -65,14 +66,11 @@
{Context::getHtmlFooter()} {Context::getHtmlFooter()}
{@ $js_body_files = Context::getJsFile('body') } {@ $js_body_files = Context::getJsFile('body') }
<!--@foreach($js_body_files as $key => $js_file)--> <block loop="$js_body_files => $key, $js_file">
<!--@if($js_file['targetie'])--> <block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block>
<!--[if {$js_file['targetie']}]> <script type="text/javascript"|cond="$db_info->use_html5!='Y'" src="{$js_file['file']}"></script>
<!--@end--> <block cond="$js_file['targetie']"><![endif]--></block>
<script type="text/javascript" src="{$js_file['file']}"></script>
<!--@if($js_file['targetie'])--> </block>
<![endif]-->
<!--@end-->
<!--@end-->
</body> </body>
</html> </html>