[Notice] Announcing the End of Demo Server [Read me]
BlueMir 2012-11-08
apply markup at newProject and signup
@5c7823d7f0613439db9788ca0420ff56642ebe8f
app/views/home.scala.html
--- app/views/home.scala.html
+++ app/views/home.scala.html
@@ -5,7 +5,7 @@
     <div class="container page-wrap">
     @views.html.alert()
     @content
-	</div>
+    </div>
     <footer class="page-footer-outer">
         <div class="page-footer">
             <span class="provider">Powered by <strong>nFORGE.</strong></span>
app/views/index.scala.html
--- app/views/index.scala.html
+++ app/views/index.scala.html
@@ -1,22 +1,14 @@
 @(projects:List[Project]) 
 
 @home("Welcome to nForge") {
-    @if(session.contains("userId")){
-    <div class="page">
-    } else {
-    <div class="page full">
-    }
+    <div class="page@if(!session.contains("userId")){ full}">
         <div class="center-wrap tag-line-wrap">
             <h1 class="title"><span class="high-light">Open Source</span> N4</h1>
             <p class="tag-line">Software development platform for Open Source project.</p>
         </div>
-        @if(session.contains("userId")){
-        <div class="fn-intro-wrap">
-            <ul class="intros">
-        } else {
-        <div class="intro-wrap">
-            <ul class="intros unstyled">
-        }
+        
+        <div class="@if(session.contains("userId")){fn-intro-wrap}else{intro-wrap}">
+            <ul class="intros@if(!session.contains("userId")){ unstyled}">
                 <li class="intro"><img src="@routes.Assets.at("images/img-project-198.png")" width="198" height="180"/></li>
                 <li class="intro"><img src="@routes.Assets.at("images/img-repository-198.png")" width="198" height="180"/></li>
                 <li class="intro"><img src="@routes.Assets.at("images/img-issue-198.png")" width="198" height="180"/></li>
@@ -37,7 +29,7 @@
                 <div class="gray-bubble-wrap">
                     <div class="bg-project-bubble-top ico">
                         <div class="project-count-wrap">
-                            MY PROJECTS <i class="ico ico-dot-white"></i><span class="p-num">22</span>
+                            MY PROJECTS <i class="ico ico-dot-white"></i><span class="p-num">@projects.size()</span>
                         </div>
                     </div>
                     <ul class="my-projects unstyled">
 
app/views/login.old (deleted)
--- app/views/login.old
@@ -1,37 +0,0 @@
-<div class="page-header">
-  <h1>@Messages(message)</h1>
-</div>
-
-<div class="row-fluid">
-  <div class="span12">
-        @form(routes.UserApp.authenticate(), 'class->"form-horizontal"){
-            @inputText(userForm("loginId")
-                ,'_label-> Messages("user.loginId") 
-                ,'class->"input-medium")        
-                
-            @inputPassword(userForm("password")
-                ,'_label-> Messages("user.password") 
-                ,'class->"input-medium")
-            
-            @checkbox(userForm("rememberMe"))
-            
-            <div class="form-actions">
-                <input class="btn btn-primary" type="submit" value="@Messages("button.login")">
-                <a class="btn" href="@routes.Application.index()">@Messages("button.cancel")</a>
-            </div>
-        }
-    </div>
-</div>
-
-<div class="row">
-    <div class="span12">
-      <dl class="dl-horizontal">
-        <dt>사이트 관리자</dt>
-        <dd>admin/admin00</dd>
-        <dt>프로젝트 관리자</dt>
-        <dd>hobi/hobi00</dd>
-        <dt>프로젝트 멤버</dt>
-        <dd>k16wire/k16wire00</dd>
-      </dl>
-    </div>
-</div>
app/views/login.scala.html
--- app/views/login.scala.html
+++ app/views/login.scala.html
@@ -1,7 +1,4 @@
-@(message:String, userForm:Form[User]) 
-
-@import helper._
-@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) } 
+@(message:String, userForm:Form[User])
 
 @home(message) {
 <div class="page full">
@@ -12,7 +9,7 @@
         <div class="login-form-wrap">
             <form action="@routes.UserApp.authenticate()" method="POST">
                 <label for="email">
-                    <input type="text" class="text email" id="email" placeholder="USER NAME" autocomplete="off" name="loginId">
+                    <input type="text" class="text email" id="email" placeholder="ID" autocomplete="off" name="loginId">
                 </label>
                 <label for="password">
                     <input type="password" class="text password" id="password" placeholder="PASSWORD" autocomplete="off" name="password">
app/views/project/newProject.scala.html
--- app/views/project/newProject.scala.html
+++ app/views/project/newProject.scala.html
@@ -1,83 +1,60 @@
 @(title:String, newProjectForm:Form[Project])
 
-@import helper._
 @import playRepository.RepositoryService
 
-@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) }
-
 @home(title){
-  <div class="page-header">
-    <h1>@Messages(title)</h1>
-  </div>
-
-    @form(action = routes.ProjectApp.saveProject, 
-                    'class -> "form-horizontal"){
-        <div class="row">
-            <fieldset>
-                <div class="icon-question-sign" href = "#" id="project_name" rel="popover"
-                    data-content="@Messages("project.name.alert")"
-                    data-original-title="@Messages("project.name.rule")"
-                ></div>
-                @inputText(
-                    newProjectForm("name"),
-                    '_label -> Messages("project.name"),
-                    '_help -> Messages("input.mandatory")
-                )
-                <div class="alert alert-danger hide" id="nameAlert">
-                    <a class="close" data-dismiss="alert">×</a>
-                    <strong>@Messages("project.name.alert")</strong>
+    <div class="page">
+        <div class="form-wrap new-project">
+            <div class="bread-crumb-wrap">
+                <h1 class="title orange">New Project</h1>
+                <div class="bread-crumb">
+                    <a href="/"><i class="ico ico-home"></i></a>
+                    <i class="ico ico-location-arrow"></i>
+                    <span>new project</span>
                 </div>
-                
-                @textarea(
-                    newProjectForm("overview"),
-                    '_label -> Messages("project.description"),
-                    'cols -> 50,
-                    '_help -> Messages("input.optional")
-                )
-                
-                <div class="icon-question-sign" href = "#" id="share_option_explanation" rel="popover"
-                    data-content="@Messages("project.shareOption.private.description")"
-                    data-original-title="@Messages("project.shareOption")"
-                ></div>
-                @inputRadioGroup(
-                    newProjectForm("share_option"),
-                    options = options("false"->Messages("project.shareOption.private"), "true"->Messages("project.shareOption.public")),
-                    '_label -> Messages("project.shareOption")
-                )
-                 @inputRadioGroup(
-                    newProjectForm("isAuthorEditable"),
-                    options = options("false"->Messages("project.isAuthorEditable.off"), "true"->Messages("project.isAuthorEditable.on")),
-                    '_label -> Messages("project.isAuthorEditable")
-                )
-                @selectEx(
-                    newProjectForm("vcs"),
-                    options(RepositoryService.vcsTypes),
-                    '_label -> Messages("project.vcs")
-                )
-
-                <div class="icon-question-sign" href = "#" id="terms" rel="popover"
-                    data-content="약관 ..."
-                    data-original-title="@Messages("project.agreement")"
-                ></div>
-                @checkbox(
-                     newProjectForm("accept"), 
-                    '_label -> None,
-                    '_text -> Messages("project.new.agreement"),
-                    '_showConstraints -> false
-                      )
-                <div class="alert alert-danger hide" id="acceptAlert">
-                    <a class="close" data-dismiss="alert">×</a>
-                    <strong>@Messages("project.new.agreement.alert")</strong>
-                </div>
-            </fieldset>
-        </div>
-        <div class="row">
-            <div class="actions">
-                <center><input type="submit" class="btn btn-primary" value="@Messages("project.create")" id="save"></center>
             </div>
+            <form action="@routes.ProjectApp.saveProject()" method="post">
+                <label for="name">
+                    <input id="project-name" type="text" name="name" class="text" placeholder="새 프로젝트 이름을 입력해주세요.">
+                </label>
+                <label for="overview">
+                    <textarea id="description" name="overview" class="text textarea" placeholder="프로젝트 설명을 입력해주세요."></textarea>
+                </label>
+                <ul class="options unstyled">
+                    <li class="option">
+                        <div class="option-label">공개설정</div>
+                        <div class="option-desc">
+                            <input name="share_option" type="radio" checked="checked" id="true" value="public" class="radio-btn"><label for="public" class="bg-radiobtn">공개</label>
+                            <input name="share_option" type="radio" id="private" value="false" class="radio-btn"><label for="private" class="bg-radiobtn">비공개</label>
+                            <span class="note">비공개 프로젝트도 프로젝트 이름, 설명, 로그 등은 모든 사용자가 볼 수 있습니다.</span>
+                        </div>
+                    </li>
+                    <li class="option">
+                        <div class="option-label">코드관리시스템</div>
+                        <div class="option-desc">
+                            <div class="btn-group">
+                                <button data-toggle="dropdown" class="btn">git</button>
+                                <button data-toggle="dropdown" class="btn dropdown-toggle"><span class="caret"></span></button>
+                                <ul class="dropdown-menu">
+                                    @RepositoryService.vcsTypes.map{ v =>
+                                        <li><a href="#!/git">@Messages(v._2)</a></li>
+                                    }
+                                </ul>
+                            </div>
+                        </div>
+                    </li>
+                    <li class="option">
+                        <div class="option-label">이용약관 <i class="ico ico-que-mark"></i></div>
+                        <div class="option-desc">
+                            <input type="checkbox" class="stipulation checkbox" autocomplete="off" id="stipulation" name="accept"><label for="stipulation" class="bg-checkbox">본인은 약관에 대한 안내를 읽었으며 동의 합니다.</label>
+                        </div>
+                    </li>
+                </ul>
+                <div class="actions">
+                    <button class="btn-transparent n-btn orange med">SAVE</button>
+                    <a href="/" class="n-btn gray med cancel">CANCEL</a>
+                </div>
+            </form>
         </div>
-    }
-    <script>nforge.require(["project.nameCheck", "project.popovers", "project.acceptCheck"], "save");</script> 
-
-    
-}
(No newline at end of file)
+    </div>
+}
app/views/user/signup.scala.html
--- app/views/user/signup.scala.html
+++ app/views/user/signup.scala.html
@@ -1,64 +1,29 @@
 @(message: String, newUserForm: Form[User]) 
 
-@import helper._
-@implicitFieldConstructor = @{ FieldConstructor(twitterBootstrapInput.render) } 
-
 @home(message) {
-<div class="page-header">
-  <h1>@Messages(message)</h1>
-</div>
-<div class="row-fluid">
-  <div class="span3"></div>
-  <div class="span6">
-    <div class="alert alert-danger hide" id="confirmPasswordAlert">
-      <a class="close" data-dismiss="alert">×</a>
-      <strong>@Messages("user.confirmPassword.alert")</strong>
-    </div>
-    @form(action = routes.UserApp.saveUser, 'class -> "well form-horizontal"){
-      <fieldset>
-        @inputText(
-          newUserForm("loginId"),
-          '_label -> Messages("user.loginId"),
-          '_showConstraints -> false
-        )
-        
-        @inputPassword(
-          newUserForm("password"),
-          '_label -> Messages("user.password")
-        )
-        
-        <div class="control-group">
-          <label class="control-label" for="confirmPassword">@Messages("user.confirmPassword")&nbsp;&nbsp;</label>
-          <div class="controls">
-            <input type="password" id="confirmPassword" name="confirmPassword">
-          </div>
+    <div class="page full">
+        <div class="center-wrap tag-line-wrap signup">
+            <h1 class="title"><span class="high-light">Sign Up For</span> N4</h1>
+            <p class="tag-line signup"><span>Open Source</span> Project. <span>Code</span> Repository. <span>Issue</span> Tracker. <span>Task</span> Managspanent</p>
         </div>
-        
-        @inputText(
-          newUserForm("name"),
-          '_label -> Messages("user.name")
-        )
-        
-        @inputText(
-          newUserForm("email"),
-          '_label -> Messages("user.email"),
-          '_showConstraints -> false
-        )
-      </fieldset>
-      <button type="submit" class="btn btn-primary" id="signup">@Messages("button.signup")</button>
-    }
-  </div>
-</div>
-<script>
-  $(document).ready(function(){
-    $("#signup").click(function(){      
-      if($("#password").val() != ($("#confirmPassword").val())){
-        $("#confirmPasswordAlert").show();
-        return false;
-      }
-      
-      return true;
-    });
-  })
-</script>
+        <div class="signup-form-wrap">
+            <form action="@routes.UserApp.saveUser()" method="POST">
+                <label for="loginId" class="inline">
+                    <input type="text" class="text email" id="email" placeholder="ID" autocomplete="off" name="loginId">
+                </label><!--
+             --><label for="name" class="inline">
+                    <input type="text" class="text uname" id="uname" placeholder="NAME" autocomplete="off" name="name">
+                </label>
+                <label for="password">
+                    <input type="password" class="text password" id="password" placeholder="PASSWORD" autocomplete="off" name="password">
+                </label>
+                <div class="act-row">
+                    HAVE AN ACCOUNT ALREADY? <a href="@routes.UserApp.login()" class="go-login">LOG IN</a>
+                </div>
+                <div class="btns-row">
+                    <button type="submit" class="n-btn orange sign-up">Sign Up</button>
+                </div>
+            </form>
+        </div>
+    </div>
 }
Add a comment
List