fanbinit/rhymix
1
0
Fork 0
mirror of https://github.com/Lastorder-DC/rhymix.git synced 2026-05-03 17:22:20 +09:00
Code Issues Projects Releases Packages Wiki Activity

merge from 1.5.3.1 (r10978-r11049)

Browse source 
git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.2@11050 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
flyskyko 2012-08-20 07:56:33 +00:00
commit 0b4f79f420
6 changed files with 16 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/tpl/common_layout.html
View file

@ -1,12 +1,13 @@
{@
$db_info = Context::getDBInfo();
$lang_type = Context::getLangType();
$ssl_actions = Context::getSSLActions();
$css_files=Context::getCssFile();
$js_files=Context::getJsFile();
}
<!DOCTYPE html>
<html lang="{$lang_type}">
<head>
{@$css_files=Context::getCssFile()}
{@$js_files=Context::getJsFile()}
<!-- META -->
<meta charset="utf-8" />
<meta name="Generator" content="XpressEngine" />
@ -55,7 +56,6 @@ var default_url = "{Context::getDefaultUrl()}";
{Context::getHtmlFooter()}
<!-- ETC -->
<div class="wfsr"></div>
{@$ssl_actions=Context::getSSLActions()}
{@ $js_body_files = Context::getJsFile('body') }
<block loop="$js_body_files => $key, $js_file">
<block cond="$js_file['targetie']"><!--[if {$js_file['targetie']}]></block><script src="{$js_file['file']}"></script><block cond="$js_file['targetie']"><![endif]--></block>