Skip to content

Commit

Permalink
Merge pull request #2223 from laiglinne-ff/develop-2218
Browse files Browse the repository at this point in the history
#2218 회원가입 비활성 시에도 회원가입 설정을 변경할 수 있도록 개선
  • Loading branch information
bnu authored Feb 22, 2018
2 parents a7c6ea0 + 44b9f17 commit 176fb2b
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 4 deletions.
5 changes: 5 additions & 0 deletions modules/member/lang/lang.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2801,4 +2801,9 @@
<value xml:lang="en"><![CDATA[Completed.]]></value>
<value xml:lang="jp"><![CDATA[完了しました。]]></value>
</item>
<item name="warn_member_setting">
<value xml:lang="ko"><![CDATA[주의! 현재 설정이 사이트의 회원 가입을 허용하고 있지 않고 있다는 것을 명심하십시오.]]></value>
<value xml:lang="en"><![CDATA[Warning! Please remember current site setting doesn't accept new member.]]></value>
<value xml:lang="jp"><![CDATA[注意!現在のサイト設定は、会員登録を許可していないということを覚えなさい。]]></value>
</item>
</lang>
7 changes: 6 additions & 1 deletion modules/member/tpl/header.html
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,11 @@ <h1>{$lang->cmd_member_config} <a class="x_icon-question-sign" href="./admin/hel
<li class="x_active"|cond="$act == 'dispMemberAdminLoginConfig'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminLoginConfig')}">{$lang->cmd_login}</a></li>
<li class="x_active"|cond="$act == 'dispMemberAdminDesignConfig'"><a href="{getUrl('', 'module', 'admin', 'act', 'dispMemberAdminDesignConfig')}">{$lang->cmd_set_design_info}</a></li>
</ul>
<block cond="$act == 'dispMemberAdminSignUpConfig'">
<div class="x_msg-warn message error">
<p>{$lang->warn_member_setting}</p>
</div>
</block>
<script>
enableSignUpTab({$config->enable_join == 'Y' ? 'true' : 'false'});
alertNewMemberAcceptSetting({$config->enable_join == 'Y' ? 'true' : 'false'});
</script>
10 changes: 7 additions & 3 deletions modules/member/tpl/js/config.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
function enableSignUpTab(isEnable)
window.runOnce = false;
function alertNewMemberAcceptSetting(isEnable, msg)
{
if(window.runOnce) return;
window.runOnce = true;
var $ = jQuery;
$('#signupTab').toggle(isEnable);
}
$("#signupTab>a").text("⚠ " + $("#signupTab>a").text()).css("color", "#7F2000");
$(".x_msg-warn").show();
}

0 comments on commit 176fb2b

Please sign in to comment.