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

Add option to specify a global header script per domain

Browse source
This commit is contained in:
Kijin Sung 2017-09-12 14:39:33 +09:00
parent 1a6e84d9cc
commit ecb598dc15
6 changed files with 27 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
classes/module/ModuleHandler.class.php
View file

@ -769,6 +769,10 @@ class ModuleHandler extends Handler
if($type == "view" && $kind != 'admin') if($type == "view" && $kind != 'admin')
{ {
$domain_info = Context::get('site_module_info'); $domain_info = Context::get('site_module_info');
if ($domain_info && $domain_info->settings && $domain_info->settings->html_header)
{
Context::addHtmlHeader($domain_info->settings->html_header);
}
if ($domain_info && $domain_info->settings && $domain_info->settings->html_footer) if ($domain_info && $domain_info->settings && $domain_info->settings->html_footer)
{ {
Context::addHtmlFooter($domain_info->settings->html_footer); Context::addHtmlFooter($domain_info->settings->html_footer);

4
modules/admin/admin.admin.controller.php
View file

@ -1044,7 +1044,8 @@ class adminAdminController extends admin
return new Object(-1, 'msg_invalid_timezone'); return new Object(-1, 'msg_invalid_timezone');
} }
// Clean up the footer script. // Clean up the header and footer scripts.
$vars->html_header = utf8_trim($vars->html_header);
$vars->html_footer = utf8_trim($vars->html_footer); $vars->html_footer = utf8_trim($vars->html_footer);
// Merge all settings into an array. // Merge all settings into an array.
@ -1053,6 +1054,7 @@ class adminAdminController extends admin
'subtitle' => $vars->subtitle, 'subtitle' => $vars->subtitle,
'language' => $vars->default_lang, 'language' => $vars->default_lang,
'timezone' => $vars->default_timezone, 'timezone' => $vars->default_timezone,
'html_header' => $vars->html_header,
'html_footer' => $vars->html_footer, 'html_footer' => $vars->html_footer,
); );

6
modules/admin/lang/en.php
View file

@ -252,8 +252,10 @@ $lang->thumbnail_target = 'Extract Thumbnail From';
$lang->thumbnail_target_all = 'All images'; $lang->thumbnail_target_all = 'All images';
$lang->thumbnail_target_attachment = 'Attached images only'; $lang->thumbnail_target_attachment = 'Attached images only';
$lang->thumbnail_type = 'Thumbnail Type'; $lang->thumbnail_type = 'Thumbnail Type';
$lang->input_footer_script = 'Footer script'; $lang->input_header_script = 'Header Script';
$lang->detail_input_footer_script = 'Any content added here will be printed at the bottom of the page, except the admin module.'; $lang->detail_input_header_script = 'Content added here will be printed at the top of every page, except the admin module.';
$lang->input_footer_script = 'Footer Script';
$lang->detail_input_footer_script = 'Content added here will be printed at the bottom of every page, except the admin module.';
$lang->thumbnail_crop = 'Crop'; $lang->thumbnail_crop = 'Crop';
$lang->thumbnail_ratio = 'Keep aspect ratio (may result in spaces)'; $lang->thumbnail_ratio = 'Keep aspect ratio (may result in spaces)';
$lang->thumbnail_none = 'Do not create thumbnails'; $lang->thumbnail_none = 'Do not create thumbnails';

6
modules/admin/lang/ja.php
View file

@ -123,8 +123,10 @@ $lang->timezone = '標準時間帯';
$lang->use_mobile_view = 'モバイル版使用'; $lang->use_mobile_view = 'モバイル版使用';
$lang->about_use_mobile_view = 'モバイル機器で接続した際にモバイルページを見せます。'; $lang->about_use_mobile_view = 'モバイル機器で接続した際にモバイルページを見せます。';
$lang->thumbnail_type = 'サムネイルの作成方式を選択してください。'; $lang->thumbnail_type = 'サムネイルの作成方式を選択してください。';
$lang->input_footer_script = '下段（footer）スクリプト'; $lang->input_header_script = '上段スクリプト';
$lang->detail_input_footer_script = '最下段にコードを追加します。管理者ページでは遂行できません。'; $lang->detail_input_header_script = 'すべてのページの最上段にコードを追加します。管理者ページでは遂行できません。';
$lang->input_footer_script = '下段スクリプト';
$lang->detail_input_footer_script = 'すべてのページの最下段にコードを追加します。管理者ページでは遂行できません。';
$lang->thumbnail_crop = 'トリミングする'; $lang->thumbnail_crop = 'トリミングする';
$lang->thumbnail_ratio = '比率に合わせる'; $lang->thumbnail_ratio = '比率に合わせる';
$lang->thumbnail_none = 'サムネイルを作成しない'; $lang->thumbnail_none = 'サムネイルを作成しない';

6
modules/admin/lang/ko.php
View file

@ -248,8 +248,10 @@ $lang->thumbnail_target = '썸네일 생성 대상';
$lang->thumbnail_target_all = '모든 이미지 (외부 이미지 포함)'; $lang->thumbnail_target_all = '모든 이미지 (외부 이미지 포함)';
$lang->thumbnail_target_attachment = '첨부된 이미지'; $lang->thumbnail_target_attachment = '첨부된 이미지';
$lang->thumbnail_type = '썸네일 생성 방식'; $lang->thumbnail_type = '썸네일 생성 방식';
$lang->input_footer_script = '하단(footer) 스크립트'; $lang->input_header_script = '상단(헤더) 스크립트';
$lang->detail_input_footer_script = '최하단에 코드를 삽입합니다. 관리자 화면에는 적용되지 않습니다.'; $lang->detail_input_header_script = '모든 페이지의 최상단에 코드를 삽입합니다. 관리자 화면에는 적용되지 않습니다.';
$lang->input_footer_script = '하단(푸터) 스크립트';
$lang->detail_input_footer_script = '모든 페이지의 최하단에 코드를 삽입합니다. 관리자 화면에는 적용되지 않습니다.';
$lang->thumbnail_crop = '크기에 맞추어 잘라내기'; $lang->thumbnail_crop = '크기에 맞추어 잘라내기';
$lang->thumbnail_ratio = '비율 유지 (여백이 생길 수 있음)'; $lang->thumbnail_ratio = '비율 유지 (여백이 생길 수 있음)';
$lang->thumbnail_none = '썸네일 생성하지 않음'; $lang->thumbnail_none = '썸네일 생성하지 않음';

8
modules/admin/tpl/config_domains_edit.html
View file

@ -92,6 +92,14 @@
</div> </div>
</div> </div>
<div class="x_control-group">
<label class="x_control-label" for="html_header">{$lang->input_header_script}</label>
<div class="x_controls" style="margin-right:14px">
<textarea name="html_header" id="html_header" rows="6" style="width:100%">{$domain_info ? $domain_info->settings->html_header : ''}</textarea>
<div class="x_help-block">{$lang->detail_input_header_script}</div>
</div>
</div>
<div class="x_control-group"> <div class="x_control-group">
<label class="x_control-label" for="html_footer">{$lang->input_footer_script}</label> <label class="x_control-label" for="html_footer">{$lang->input_footer_script}</label>
<div class="x_controls" style="margin-right:14px"> <div class="x_controls" style="margin-right:14px">