Finish create organization team

4 files changed, 25 insertions, 19 deletions

diff --git a/templates/VERSION b/templates/VERSION
index eccb7a39b7..8777e13060 100644
--- a/templates/VERSION
+++ b/templates/VERSION
@@ -1 +1 @@
-0.4.5.0629 Alpha
\ No newline at end of file
+0.4.5.0702 Alpha
\ No newline at end of file
diff --git a/templates/org/new.tmpl b/templates/org/new.tmpl
index bb46db4ac3..870f3982d8 100644
--- a/templates/org/new.tmpl
+++ b/templates/org/new.tmpl
@@ -13,7 +13,7 @@
             </div>
         </div>
 
-        <div class="form-group {{if .Err_Email}}has-error has-feedback{{end}}">
+        <div class="form-group{{if .Err_Email}} has-error has-feedback{{end}}">
             <label class="col-md-2 control-label">Email<strong class="text-danger">*</strong></label>
             <div class="col-md-8">
                 <input name="email" type="text" class="form-control" placeholder="Type organization's email" value="{{.email}}" required="required">
diff --git a/templates/org/new_team.tmpl b/templates/org/team_new.tmpl
index 752f37d2e0..0936ec29b3 100644
--- a/templates/org/new_team.tmpl
+++ b/templates/org/team_new.tmpl
@@ -4,58 +4,63 @@
     <div class="container clearfix">
         <div id="org-nav-wrapper">
             <ul class="nav nav-pills pull-right">
-                <li><a href="#"><i class="fa fa-users"></i>Members
-                    <span class="label label-default">5</span></a>
+                <li><a href="/org/{{.Org.Name}}/members"><i class="fa fa-users"></i>Members
+                    <span class="label label-default">{{.Org.NumMembers}}</span></a>
                 </li>
-                <li class="active"><a href="#"><i class="fa fa-tags"></i>Teams
-                    <span class="label label-default">2</span></a>
+                <li class="active"><a href="/org/{{.Org.Name}}/teams"><i class="fa fa-tags"></i>Teams
+                    <span class="label label-default">{{.Org.NumTeams}}</span></a>
                 </li>
             </ul>
-            <img class="pull-left org-small-logo" src="https://avatars3.githubusercontent.com/u/6656686?s=140" alt="" width="60"/>
+            <img class="pull-left org-small-logo" src="{{.Org.AvatarLink}}?s=140" alt="" width="60"/>
             <div id="org-nav-info">
-                <h2 class="org-name">Organization Name</h2>
+                <h2 class="org-name">{{.Org.FullName}}</h2>
             </div>
         </div>
     </div>
 </div>
+
 <div id="body" class="container">
     <div id="org">
-        <form id="org-teams-create" class="form-horizontal card">
+        <form action="/org/{{.Org.Name}}/teams/new" method="post" id="org-teams-create" class="form-horizontal card">
+            {{.CsrfTokenHtml}}
             <h3>Create new team</h3>
-            <div class="form-group">
+            {{template "base/alert" .}}
+            <div class="form-group{{if .Err_TeamName}} has-error has-feedback{{end}}">
                 <label class="col-md-2 control-label">Team Name<strong class="text-danger">*</strong></label>
                 <div class="col-md-8">
-                    <input name="team" type="text" class="form-control" placeholder="Type your team name" value="" required="required">
+                    <input name="name" type="text" class="form-control" placeholder="Type your team name" value="{{.name}}" required="required">
                     <span class="help-block">You'll use this name to mention this team in conversations.</span>
                 </div>
             </div>
-            <div class="form-group">
+
+            <div class="form-group{{if .Err_Description}} has-error has-feedback{{end}}">
                 <label class="col-md-2 control-label">Description</label>
                 <div class="col-md-8">
-                    <input name="desc" type="text" class="form-control" placeholder="Type your team description (optional)" value="">
+                    <input name="desc" type="text" class="form-control" placeholder="Type your team description (optional)" value="{{.desc}}">
                 </div>
             </div>
-            <div class="form-group">
+
+            <div class="form-group{{if .Err_Permission}} has-error has-feedback{{end}}">
                 <label class="col-md-2 control-label">Permission</label>
                 <div class="col-md-8">
                     <div class="radio">
                         <label>
-                            <input type="radio" name="permission" value="pull" checked="">
-                            <strong>Read & Clone</strong>
+                            <input type="radio" name="permission" value="read" checked="">
+                            <strong>Read Access</strong>
                         </label>
                         <p>This team will be able to view and clone its repositories.</p>
                     </div>
                     <div class="radio">
                         <label>
-                            <input type="radio" name="permission" value="push">
-                            <strong>Push, Read & Clone</strong>
+                            <input type="radio" name="permission" value="write">
+                            <strong>Write Access</strong>
                         </label>
                         <p>This team will be able to read its repositories, as well as push to them.</p>
                     </div>
                     <div class="radio">
                         <label>
                             <input type="radio" name="permission" value="admin">
-                            <strong>Collaboration, Push, Read & Clone</strong>
+                            <strong>Admin Access</strong>
                         </label>
                         <p>This team will be able to push/pull to its repositories, as well as add other collaborators to them.</p>
                     </div>
diff --git a/templates/org/teams.tmpl b/templates/org/teams.tmpl
index 6f00db51c4..decfecf598 100644
--- a/templates/org/teams.tmpl
+++ b/templates/org/teams.tmpl
@@ -18,6 +18,7 @@
         </div>
     </div>
 </div>
+
 <div id="body" class="container">
     <div id="org">
         <div id="org-teams">