diff --git a/app/assets/stylesheets/less/_page.less b/app/assets/stylesheets/less/_page.less index 8fc41860c..357096033 100644 --- a/app/assets/stylesheets/less/_page.less +++ b/app/assets/stylesheets/less/_page.less @@ -1448,7 +1448,7 @@ //---- sign up .signup-form-wrap { width: 400px; - margin-top: 54px; + margin-top: 14px; .center-block; .text { @@ -6397,3 +6397,7 @@ div.diff-body[data-outdated="true"] tr:hover .icon-comment { } } +.obfuscate { + unicode-bidi: bidi-override; + direction: rtl; +} diff --git a/app/controllers/UserApp.java b/app/controllers/UserApp.java index 5122d05c9..5200161eb 100644 --- a/app/controllers/UserApp.java +++ b/app/controllers/UserApp.java @@ -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"); diff --git a/app/views/user/signup.scala.html b/app/views/user/signup.scala.html index 1318fabe7..0e572d2fc 100644 --- a/app/views/user/signup.scala.html +++ b/app/views/user/signup.scala.html @@ -31,6 +31,12 @@

@Messages("app.description")

+ @if(UserApp.isUseSignUpConfirm){ +
+

@Messages("title.signupConfirmDesc")

+

@Html(Messages("title.signupConfirmDesc2", new StringBuilder(User.findByLoginId(SiteAdmin.SITEADMIN_DEFAULT_LOGINID).email).reverse().toString()))

+
+ }
diff --git a/conf/messages b/conf/messages index 5806cf10e..9fe8aa8d9 100644 --- a/conf/messages +++ b/conf/messages @@ -887,6 +887,8 @@ title.searchByKeyword = Search by keyword title.sendMail = Send email title.signup = Sign up title.signupFor = Sign up for {0} +title.signupConfirmDesc = It is required admission of admin for activation. +title.signupConfirmDesc2 = If you needed, contact to {0} title.siteSetting = Site settings title.text = Title title.unlimitedProjects = Project/Organization based work diff --git a/conf/messages.ko-KR b/conf/messages.ko-KR index 67d26e8c5..3366f0be2 100644 --- a/conf/messages.ko-KR +++ b/conf/messages.ko-KR @@ -880,6 +880,8 @@ title.searchByKeyword = 키워드로 검색 title.sendMail = 메일 발송 title.signup = 멤버 가입 title.signupFor = {0} 멤버 가입 +title.signupConfirmDesc = 가입 후 사용을 위해서는 관리자의 승인이 필요합니다 +title.signupConfirmDesc2 = {0}으로 문의하세요 title.siteSetting = 사이트 설정 title.text = 제목 title.unlimitedProjects = 프로젝트/그룹 기반으로 작업