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

Issue 2215: fix SSL Action variable to be shown fairly.

Browse source 
Before: ssl_actions variable was defined at the bottom of the template file.
After: Define ssl_actions variable at the top of the page, and define JS File and CSS file variable at the top of the page.
(Defining order miss was found and I fix it.)

SSL XML communication via function 'exec_xml', defined on xe.js, need 'ssl_actions' variable but it was written as empty before, so I fix the variable to contain SSL actions as it intended to.

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.3.1@10985 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
misol 2012-08-06 11:34:12 +00:00
parent 97c23fb891
commit baeb4dd465
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
common/tpl/common_layout.html
View file

@ -1,6 +1,9 @@
{@
$db_info = Context::getDBInfo();
$lang_type = Context::getLangType();
$ssl_actions = Context::getSSLActions();
$css_files=Context::getCssFile();
$js_files=Context::getJsFile();
}
<!--@if($db_info->use_html5=='Y')-->
<!DOCTYPE html>
@ -9,8 +12,6 @@
<!--@end-->
<html lang="{$lang_type}" xmlns="http://www.w3.org/1999/xhtml"|cond="$db_info->use_html5!='Y'">
<head>
{@$css_files=Context::getCssFile()}
{@$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'" />
@ -65,7 +66,6 @@
{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 type="text/javascript"|cond="$db_info->use_html5!='Y'" src="{$js_file['file']}"></script><block cond="$js_file['targetie']"><![endif]--></block>