issue 160, apply google analytics script

git-svn-id: http://xe-core.googlecode.com/svn/branches/1.5.0@9194 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
chschy 2011-09-19 06:11:39 +00:00
parent e33723c126
commit e38b406b62
5 changed files with 36 additions and 9 deletions

View file

@ -351,6 +351,14 @@
Context::addHtmlFooter($footer); Context::addHtmlFooter($footer);
} }
if($type == "view" && $kind != 'admin'){
$module_config= $oModuleModel->getModuleConfig('module');
if($module_config->htmlFooter){
Context::addHtmlFooter($module_config->htmlFooter);
}
}
// if failed message exists in session, set context // if failed message exists in session, set context
$this->_setInputErrorToContext(); $this->_setInputErrorToContext();

View file

@ -373,8 +373,13 @@
Context::set('ftp_info', $ftp_info); Context::set('ftp_info', $ftp_info);
$oDocumentModel = &getModel('document'); $oDocumentModel = &getModel('document');
$config = $oDocumentModel->getDocumentConfig(); $config = $oDocumentModel->getDocumentConfig();
Context::set('thumbnail_type',$config->thumbnail_type); Context::set('thumbnail_type',$config->thumbnail_type);
$oModuleModel = &getModel('module');
$config = $oModuleModel->getModuleConfig('module');
Context::set('htmlFooter',$config->htmlFooter);
$oModuleModel = &getModel('module'); $oModuleModel = &getModel('module');
$columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl'); $columnList = array('modules.mid', 'modules.browser_title', 'sites.index_module_srl');

View file

@ -680,6 +680,10 @@ Lütfen son sürümü için indirme linkine tıklayınız.]]></value>
<value xml:lang="ko"><![CDATA[Qmail 사용]]></value> <value xml:lang="ko"><![CDATA[Qmail 사용]]></value>
<value xml:lang="en"><![CDATA[Enable Qmail]]></value> <value xml:lang="en"><![CDATA[Enable Qmail]]></value>
</item> </item>
<item name="input_footer_script">
<value xml:lang="ko"><![CDATA[풋터 스크립트 삽입]]></value>
<value xml:lang="en"><![CDATA[풋터 스크립트 삽입]]></value>
</item>
<item name="sftp"> <item name="sftp">
<value xml:lang="ko"><![CDATA[SFTP 사용]]></value> <value xml:lang="ko"><![CDATA[SFTP 사용]]></value>
<value xml:lang="en"><![CDATA[Use SFTP]]></value> <value xml:lang="en"><![CDATA[Use SFTP]]></value>

View file

@ -207,6 +207,10 @@
<input type="radio" name="qmail_compatibility" id="qmail_compatibility_n" value="N" <!--@if($qmail_compatibility!='Y')-->checked="checked" <!--@end-->/> <label for="qmail_compatibility_n">{$lang->cmd_no}</label> <input type="radio" name="qmail_compatibility" id="qmail_compatibility_n" value="N" <!--@if($qmail_compatibility!='Y')-->checked="checked" <!--@end-->/> <label for="qmail_compatibility_n">{$lang->cmd_no}</label>
</p> </p>
</li> </li>
<li>
<p class="q">{$lang->input_footer_script}<p>
<p class="a"><textarea name="htmlFooter" id="htmlFooter" rows="4" cols="42">{$htmlFooter}</textarea></p>
</li>
</ul> </ul>
</fieldset> </fieldset>
<fieldset class="section"> <fieldset class="section">

View file

@ -162,9 +162,10 @@
$selected_lang = Context::get('selected_lang'); $selected_lang = Context::get('selected_lang');
$this->saveLangSelected($selected_lang); $this->saveLangSelected($selected_lang);
//썸네일 세팅 //모듈 설정 저장(썸네일, 풋터스크립트)
$config = Context::gets('thumbnail_type'); $config->thumbnail_type = Context::get('thumbnail_type');
$this->thumbnailCheck($config); $config->htmlFooter = Context::get('htmlFooter');
$this->setModulesConfig($config);
//파비콘 //파비콘
$favicon = Context::get('favicon'); $favicon = Context::get('favicon');
@ -199,13 +200,18 @@
} }
/* 썸내일 보여주기 방식 변경.*/ /* 썸내일 보여주기 방식 변경.*/
function thumbnailCheck($config){ function setModulesConfig($config){
if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) $args->thumbnail_type = 'crop'; if(!$config->thumbnail_type || $config->thumbnail_type != 'ratio' ) $args->thumbnail_type = 'crop';
else $args->thumbnail_type = 'ratio'; else $args->thumbnail_type = 'ratio';
$oModuleController = &getController('module'); $oModuleController = &getController('module');
$output = $oModuleController->insertModuleConfig('document',$args); $oModuleController->insertModuleConfig('document',$args);
unset($args);
$args->htmlFooter = $config->htmlFooter;
$oModuleController->insertModuleConfig('module',$args);
return $output; return $output;
} }