Skip to content

Commit

Permalink
site-setting: Add restriction message at sign-up page
Browse files Browse the repository at this point in the history
If site setting 'signup.require.confirm = true' is used,
show restricted condition message and site admin email for contact

And also, admin email is obfuscated
  • Loading branch information
doortts committed Feb 5, 2016
1 parent c3332d1 commit e9a2dd6
Show file tree
Hide file tree
Showing 5 changed files with 16 additions and 2 deletions.
6 changes: 5 additions & 1 deletion app/assets/stylesheets/less/_page.less
Original file line number Diff line number Diff line change
Expand Up @@ -1448,7 +1448,7 @@
//---- sign up
.signup-form-wrap {
width: 400px;
margin-top: 54px;
margin-top: 14px;
.center-block;

.text {
Expand Down Expand Up @@ -6397,3 +6397,7 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment {
}
}

.obfuscate {
unicode-bidi: bidi-override;
direction: rtl;
}
2 changes: 1 addition & 1 deletion app/controllers/UserApp.java
Original file line number Diff line number Diff line change
Expand Up @@ -818,7 +818,7 @@ private static User authenticate(String loginId, String password, boolean hashed
return User.anonymous;
}

private static boolean isUseSignUpConfirm(){
public static boolean isUseSignUpConfirm(){
Configuration config = play.Play.application().configuration();
String useSignUpConfirm = config.getString("signup.require.confirm");
return useSignUpConfirm != null && useSignUpConfirm.equals("true");
Expand Down
6 changes: 6 additions & 0 deletions app/views/user/signup.scala.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,12 @@ <h1 class="title">
<p class="tag-line">@Messages("app.description")</p>
</div>

@if(UserApp.isUseSignUpConfirm){
<div class="center-txt">
<p>@Messages("title.signupConfirmDesc")</p>
<p>@Html(Messages("title.signupConfirmDesc2", new StringBuilder(User.findByLoginId(SiteAdmin.SITEADMIN_DEFAULT_LOGINID).email).reverse().toString()))</p>
</div>
}
<div class="signup-form-wrap frm-wrap">
<form action="@routes.UserApp.newUser()" method="post" name="signup">
<dl>
Expand Down
2 changes: 2 additions & 0 deletions conf/messages
Original file line number Diff line number Diff line change
Expand Up @@ -887,6 +887,8 @@ title.searchByKeyword = Search by keyword
title.sendMail = Send email
title.signup = Sign up
title.signupFor = Sign up for <span class="highlight">{0}</span>
title.signupConfirmDesc = It is required admission of admin for activation.
title.signupConfirmDesc2 = If you needed, contact to <span class="obfuscate">{0}</span>
title.siteSetting = Site settings
title.text = Title
title.unlimitedProjects = Project/Organization based work
Expand Down
2 changes: 2 additions & 0 deletions conf/messages.ko-KR
Original file line number Diff line number Diff line change
Expand Up @@ -880,6 +880,8 @@ title.searchByKeyword = 키워드로 검색
title.sendMail = 메일 발송
title.signup = 멤버 가입
title.signupFor = <span class="highlight">{0}</span> 멤버 가입
title.signupConfirmDesc = 가입 후 사용을 위해서는 관리자의 승인이 필요합니다
title.signupConfirmDesc2 = <span class="obfuscate">{0}</span>으로 문의하세요
title.siteSetting = 사이트 설정
title.text = 제목
title.unlimitedProjects = 프로젝트/그룹 기반으로 작업
Expand Down

0 comments on commit e9a2dd6

Please sign in to comment.