Add create organization

5 files changed, 36 insertions, 105 deletions

diff --git a/templates/VERSION b/templates/VERSION
index 8c2be60bbf..b5cda695b5 100644
--- a/templates/VERSION
+++ b/templates/VERSION
@@ -1 +1 @@
-0.4.5.0624 Alpha
\ No newline at end of file
+0.4.5.0625 Alpha
\ No newline at end of file
diff --git a/templates/org/dashboard.tmpl b/templates/org/dashboard.tmpl
deleted file mode 100644
index f86de1f42b..0000000000
--- a/templates/org/dashboard.tmpl
+++ /dev/null
@@ -1,73 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-<div id="body-nav">
-    <div class="container">
-        <div class="btn-group pull-left" id="dashboard-switch">
-            <button type="button" class="btn btn-default">
-                <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
-                gogits
-            </button>
-            <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
-                <span class="caret"></span>
-            </button>
-            <div class="dropdown-menu clone-group-btn no-propagation">
-                <ul id="dashboard-switch-menu" class="list-unstyled">
-                    <li class="checked"><a href="#"><i class="fa fa-check"></i>
-                        <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
-                        gogits/gogs</a>
-                    </li>
-                </ul>
-            </div>
-        </div>
-        <ul class="nav nav-pills pull-right">
-            <li class="active"><a href="/">Feed</a></li>
-            <li><a href="/issues">Issues</a></li>
-            <li><a href="#">Setting</a></li>
-            <!-- <li><a href="/pulls">Pull Requests</a></li>
-            <li><a href="/stars">Stars</a></li> -->
-        </ul>
-        <h3>News Feed</h3>
-    </div>
-</div>
-<div id="body" class="container" data-page="user">
-    {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
-    <div id="feed-left" class="col-md-8">
-        <ul class="list-unstyled activity-list">
-            {{range .Feeds}}
-            <li>
-                <i class="icon fa fa-{{ActionIcon .OpType}}"></i>
-                <div class="info"><span class="meta">{{TimeSince .Created}}</span><br>{{ActionDesc . | str2html}}</div>
-                <span class="clearfix"></span>
-            </li>
-            {{else}}
-            <li>Oh. Looks like there isn't any activity here yet. Get Busy!</li>
-            {{end}}
-        </ul>
-    </div>
-    <div id="feed-right" class="col-md-4">
-        <div class="panel panel-default repo-panel">
-            <div class="panel-heading">Repositories
-                <div class="btn-group pull-right" id="user-dashboard-repo-new">
-                    <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square"></i>New</button>
-                    <div class="dropdown-menu dropdown-menu-right">
-                        <ul class="list-unstyled">
-                            <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li>
-                            <li><a href="/repo/migrate"><i class="fa fa-clipboard"></i>Migration</a></li>
-                            <!-- <li><a href="#"><i class="fa fa-users"></i>Organization</a></li> -->
-                        </ul>
-                    </div>
-                </div>
-            </div>
-
-            <div class="panel-body">
-                <ul class="list-group">{{range .MyRepos}}
-                    <li class="list-group-item"><a href="/{{$.SignedUserName}}/{{.Name}}">
-                        <!-- <span class="stars pull-right"><i class="fa fa-star"></i>{{.NumStars}}</span> -->
-                        <i class="fa fa-book"></i>{{.Name}}{{if .IsPrivate}} <span class="label label-default">Private</span>{{end}}</a>
-                    </li>{{end}}
-                </ul>
-            </div>
-        </div>
-    </div>
-</div>
-{{template "base/footer" .}}
diff --git a/templates/org/new.tmpl b/templates/org/new.tmpl
index baa9c9dfa0..bb46db4ac3 100644
--- a/templates/org/new.tmpl
+++ b/templates/org/new.tmpl
@@ -1,22 +1,14 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div class="container" id="body">
-    <form action="/repo/create" method="post" class="form-horizontal card" id="org-create">
+    <form action="/org/create" method="post" class="form-horizontal card" id="org-create">
         {{.CsrfTokenHtml}}
         <h3>Create New Organization</h3>
         {{template "base/alert" .}}
-        <div class="form-group">
-            <label class="col-md-2 control-label">Owner<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                <p class="form-control-static">{{.SignedUserName}}</p>
-                <input type="hidden" value="{{.SignedUserId}}" name="userId"/>
-            </div>
-        </div>
-
-        <div class="form-group {{if .Err_RepoName}}has-error has-feedback{{end}}">
+        <div class="form-group {{if .Err_OrgName}}has-error has-feedback{{end}}">
             <label class="col-md-2 control-label">Organization<strong class="text-danger">*</strong></label>
             <div class="col-md-8">
-                <input name="repo" type="text" class="form-control" placeholder="Type your repository name" value="{{.repo}}" required="required">
+                <input name="orgname" type="text" class="form-control" placeholder="Type your organization name" value="{{.orgname}}" required="required">
                 <span class="help-block">Great organization names are short and memorable. </span>
             </div>
         </div>
@@ -24,18 +16,10 @@
         <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="" required="required">
+                <input name="email" type="text" class="form-control" placeholder="Type organization's email" value="{{.email}}" required="required">
                 <span class="help-block">Organization's Email receives all notifications and confirmations.</span>
             </div>
         </div>
-<!--
-        <div class="form-group">
-            <label class="col-md-2 control-label">Owners<strong class="text-danger">*</strong></label>
-            <div class="col-md-8">
-                owners
-            </div>
-        </div>-->
-
 
         <div class="form-group">
             <div class="col-md-offset-2 col-md-8">
diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index 12018ad891..e1b43e1597 100644
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -4,29 +4,46 @@
     <div class="container">
         <div class="btn-group pull-left" id="dashboard-switch">
             <button type="button" class="btn btn-default">
-                <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
-                fuxiaohei
+                <img src="{{.ContextUser.AvatarLink}}?s=28" alt="user-avatar" title="username">
+                {{.ContextUser.Name}}
             </button>
             <button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown">
                 <span class="caret"></span>
             </button>
             <div class="dropdown-menu clone-group-btn no-propagation">
                 <ul id="dashboard-switch-menu" class="list-unstyled">
-                    <li class="checked"><a href="#"><i class="fa fa-check"></i>
-                        <img src="//1.gravatar.com/avatar/f72f7454ce9d710baa506394f68f4132?s=28" alt="user-avatar" title="username">
-                        gogits/gogs</a></li>
+                    <li{{if not .PageIsOrgDashboard}} class="checked"{{end}}>
+                        <a href="/">
+                            <i class="fa fa-check"></i>
+                            <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username">
+                            {{.SignedUser.Name}}
+                        </a>
+                    </li>
+                    {{range .Orgs}}
+                    <li{{if eq $.ContextUser.Id .Id}} class="checked"{{end}}>
+                        <a href="/org/{{.Name}}/dashboard">
+                            <i class="fa fa-check"></i>
+                            <img src="{{.AvatarLink}}?s=28" alt="user-avatar" title="username">
+                            {{.Name}}
+                        </a>
+                    </li>
+                    {{end}}
+                    <li>
+                        <a href="/org/create">Create organization</a>
+                    </li>
                 </ul>
             </div>
         </div>
         <ul class="nav nav-pills pull-right">
-            <li class="active"><a href="/">Feed</a></li>
-            <li><a href="/issues">Issues</a></li>
+            <li class="active"><a href="/{{if .PageIsOrgDashboard}}org/{{.ContextUser.Name}}/dashboard{{end}}">News Feed</a></li>
+            <li><a href="/{{if .PageIsOrgDashboard}}org/{{.ContextUser.Name}}/dashboard/{{end}}issues">Issues</a></li>
+            {{if .PageIsOrgDashboard}}<li><a href="/org/{{.ContextUser.Name}}/settings">Settings</a></li>{{end}}
             <!-- <li><a href="/pulls">Pull Requests</a></li>
             <li><a href="/stars">Stars</a></li> -->
         </ul>
-        <h3>News Feed</h3>
     </div>
 </div>
+
 <div id="body" class="container" data-page="user">
     {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
     <div id="feed-left" class="col-md-8">
@@ -44,7 +61,7 @@
     </div>
     <div id="feed-right" class="col-md-4">
         <div class="panel panel-default repo-panel">
-            <div class="panel-heading">Your Repositories
+            <div class="panel-heading">{{if not .PageIsOrgDashboard}}Your {{end}}Repositories
                 <div class="btn-group pull-right" id="user-dashboard-repo-new">
                     <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square"></i>New</button>
                     <div class="dropdown-menu dropdown-menu-right">
@@ -66,7 +83,8 @@
                 </ul>
             </div>
         </div>
-
+        
+        {{if not .PageIsOrgDashboard}}
         <div class="panel panel-default repo-panel">
             <div class="panel-heading">Collaborative Repositories</div>
             <div class="panel-body">
@@ -78,6 +96,7 @@
                 </ul>
             </div>
         </div>
+        {{end}}
     </div>
 </div>
 {{template "base/footer" .}}
diff --git a/templates/user/issues.tmpl b/templates/user/issues.tmpl
index d1c2bd9941..c4ad64a4cf 100644
--- a/templates/user/issues.tmpl
+++ b/templates/user/issues.tmpl
@@ -3,7 +3,7 @@
 <div id="body-nav">
     <div class="container">
         <ul class="nav nav-pills pull-right">
-            <li><a href="/">Feed</a></li>
+            <li><a href="/">News Feed</a></li>
             <li class="active"><a href="/issues">Issues</a></li>
             <!-- <li><a href="/pulls">Pull Requests</a></li>
             <li><a href="/stars">Stars</a></li> -->
@@ -11,6 +11,7 @@
         <h3>Your Issues</h3>
     </div>
 </div>
+
 <div id="body" class="container" data-page="user">
     {{if .HasInfo}}<div class="alert alert-info">{{.InfoMsg}}</div>{{end}}
     <div id="issue">