Merge branch 'dev' of github.com:gogits/gogs into dev

8 files changed, 65 insertions, 58 deletions

diff --git a/templates/.VERSION b/templates/.VERSION
index bdaabb3ffa..0621825f4b 100644
--- a/templates/.VERSION
+++ b/templates/.VERSION
@@ -1 +1 @@
-0.4.7.0802 Alpha
\ No newline at end of file
+0.4.7.0807 Alpha
\ No newline at end of file
diff --git a/templates/.brackets.json b/templates/.brackets.json
new file mode 100644
index 0000000000..f358faa62e
--- /dev/null
+++ b/templates/.brackets.json
@@ -0,0 +1,5 @@
+{
+    "language.fileExtensions": {
+        "tmpl": "html"
+    }
+}
\ No newline at end of file
diff --git a/templates/home.tmpl b/templates/home.tmpl
index 249bce314d..47d1e69017 100644
--- a/templates/home.tmpl
+++ b/templates/home.tmpl
@@ -1,17 +1,16 @@
-{{template "ng/base/head" .}}
-{{template "ng/base/header" .}}
+{{template "ng/base/head" .}} {{template "ng/base/header" .}}
 <div id="promo-wrapper">
     <div class="container clear">
         <div id="promo-logo" class="left">
-            <img src="/img/gogs-lg.png" alt="logo"/>
+            <img src="/img/gogs-lg.png" alt="logo" />
         </div>
         <div id="promo-content">
             <h1>Gogs</h1>
             <h2>{{.i18n.Tr "app_desc"}}</h2>
             <form id="promo-form" action="/user/login" method="post">
                 {{.CsrfTokenHtml}}
-                <input class="ipt ipt-large" id="username" name="uname" type="text" placeholder="{{.i18n.Tr "home.uname_holder"}}"/>
-                <input class="ipt ipt-large" name="password" type="password" placeholder="{{.i18n.Tr "home.password_holder"}}"/>
+                <input class="ipt ipt-large" id="username" name="uname" type="text" placeholder="{{.i18n.Tr " home.uname_holder "}}"/>
+                <input class="ipt ipt-large" name="password" type="password" placeholder="{{.i18n.Tr " home.password_holder "}}"/>
                 <input name="from" type="hidden" value="home">
                 <button class="btn btn-black btn-large">{{.i18n.Tr "sign_in"}}</button>
                 <button class="btn btn-green btn-large" id="register-button">{{.i18n.Tr "register"}}</button>
diff --git a/templates/ng/base/social.tmpl b/templates/ng/base/social.tmpl
index 153239f743..97f71b4e99 100644
--- a/templates/ng/base/social.tmpl
+++ b/templates/ng/base/social.tmpl
@@ -1,4 +1,4 @@
-<button class="btn github"><i class="fa fa-github"></i>GitHub</button>
-<button class="btn google"><i class="fa fa-google"></i>Google +</button>
-<button class="btn weibo"><i class="fa fa-weibo"></i>新浪微博</button>
-<button class="btn qq"><i class="fa fa-qq"></i>腾讯 QQ&nbsp;</button>
\ No newline at end of file
+{{if .OauthService.GitHub}}<a class="btn github" href="/user/login/github?next=/user/sign_up"><i class="fa fa-github"></i>GitHub</a>{{end}}
+{{if .OauthService.Google}}<a class="btn google" href="/user/login/google?next=/user/sign_up"><i class="fa fa-google"></i>Google +</a>{{end}}
+{{if .OauthService.Weibo}}<a class="btn weibo" href="/user/login/weibo?next=/user/sign_up"><i class="fa fa-weibo"></i>新浪微博</a>{{end}}
+{{if .OauthService.Tencent}}<a class="btn qq" href="/user/login/qq?next=/user/sign_up"><i class="fa fa-qq"></i>腾讯 QQ&nbsp;</a>{{end}}
\ No newline at end of file
diff --git a/templates/repo/collaboration.tmpl b/templates/repo/collaboration.tmpl
deleted file mode 100644
index 564c99eca2..0000000000
--- a/templates/repo/collaboration.tmpl
+++ /dev/null
@@ -1,47 +0,0 @@
-{{template "base/head" .}}
-{{template "base/navbar" .}}
-{{template "repo/nav" .}}
-{{template "repo/toolbar" .}}
-<div id="body" class="container">
-    {{template "repo/setting_nav" .}}
-    <div id="repo-setting-container" class="col-md-10">
-        {{template "base/alert" .}}
-        <div class="panel panel-default">
-            <div class="panel-heading">
-                Collaborators
-            </div>
-            
-            <div class="panel-body">
-                <ul id="repo-collab-list" class="list-unstyled">
-                    {{range .Collaborators}}
-                    <li class="collab">
-                        {{if not (eq .LowerName $.Owner.LowerName)}}<a href="{{$.RepoLink}}/settings/collaboration?remove={{.Name}}" class="remove-collab pull-right"><i class="fa fa-times"></i></a>{{end}}
-                        <a class="member" href="/user/{{.Name}}">
-                            <img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}">
-                            <strong class="access-member-fullname">{{.FullName}}</strong><br/>
-                            {{.Name}}
-                        </a>
-                    </li>
-                    {{end}}
-                </ul>
-            </div>
-
-            <div class="panel-footer">
-                <form action="{{.RepoLink}}/settings/collaboration" method="post" class="form-horizontal" id="repo-collab-form">
-                    {{.CsrfTokenHtml}}
-                    <div class="form-group" style="margin-bottom: 0">
-                        <div class="col-md-4">
-                            <input type="text" name="collaborator" class="form-control dropdown-toggle" id="repo-collaborator" autocomplete="off" required="required" data-toggle="dropdown"/>
-                            <div class="dropdown-menu">
-                                <ul class="list-unstyled"></ul>
-                            </div>
-                        </div>
-                        <button class="col-md-2 btn btn-primary">Add collaborator</button>
-                    </div>
-                </form>
-            </div>
-        </div>
-
-    </div>
-</div>
-{{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/repo/header.tmpl b/templates/repo/header.tmpl
index a789d13fee..5e9c3ea2db 100644
--- a/templates/repo/header.tmpl
+++ b/templates/repo/header.tmpl
@@ -1,10 +1,11 @@
 <div id="repo-header" class="clear">
     <div class="container clear">
         <h1 id="repo-header-name" class="left public">
-            <i class="mega-octicon octicon-{{if .Repository.IsPrivate}}lock{{else}}repo{{end}}"></i>
+            <i class="mega-octicon octicon-{{if .Repository.IsPrivate}}lock{{else if .Repository.IsMirror}}repo-clone{{else}}repo{{end}}"></i>
             <a class="author" href="/{{.Owner.Name}}">{{.Owner.Name}}</a>
             <span class="divider">/</span>
             <a class="repo text-bold" href="{{.RepoLink}}">{{.Repository.Name}}</a>
+            {{if .Repository.IsMirror}}<span class="label label-gray">{{.i18n.Tr "mirror"}}</span>{{end}}
         </h1>
         <ul id="repo-header-meta" class="right menu menu-line">
             <li id="repo-header-download" class="inline-block down drop">
diff --git a/templates/repo/settings/collaboration.tmpl b/templates/repo/settings/collaboration.tmpl
new file mode 100644
index 0000000000..deb09e1f54
--- /dev/null
+++ b/templates/repo/settings/collaboration.tmpl
@@ -0,0 +1,47 @@
+{{template "ng/base/head" .}}
+{{template "ng/base/header" .}}
+<div id="repo-wrapper">
+    {{template "repo/header" .}}
+	<div id="setting-wrapper" class="main-wrapper">
+	    <div id="repo-setting" class="container clear">
+	        {{template "repo/settings/nav" .}}
+	        <div class="grid-4-5 left">
+	            <div class="setting-content">
+	                {{template "ng/base/alert" .}}
+	                <div id="setting-content">
+	                    <div id="user-profile-setting-content" class="panel panel-radius">
+	                        <div class="panel-header">
+	                        	<strong>{{.i18n.Tr "repo.settings.collaboration"}}</strong>
+	                        </div>
+	                        <div class="panel-body">
+	                        	<ul id="repo-collab-list">
+	                        		{{range .Collaborators}}
+	                        		<li class="collab">
+	                        			{{if not (eq .Id $.Owner.Id)}}<a href="{{$.RepoLink}}/settings/collaboration?remove={{.Name}}" class="remove-collab right"><i class="fa fa-times"></i></a>{{end}}
+										<a class="member" href="/{{.Name}}">
+										    <img alt="{{.Name}}" class="pull-left avatar" src="{{.AvatarLink}}">
+										    <strong>{{.FullName}}</strong> ({{.Name}})
+										</a>
+	                        		</li>
+	                        		<hr>
+	                        		{{end}}
+	                        	</ul>
+							</div>
+				            <div class="panel-footer">
+				                <form class="form form-align" action="{{.RepoLink}}/settings/collaboration" method="post" id="repo-collab-form">
+				                    {{.CsrfTokenHtml}}
+	                                <input class="ipt ipt-large ipt-radius" id="repo-collaborator" name="collaborator" autocomplete="off" required />
+	                                <button class="btn btn-blue btn-large btn-radius">{{.i18n.Tr "repo.settings.add_collaborator"}}</button>
+									<div class="repo-user-list-block">
+										<ul class="menu-down-show menu-vertical menu-radius switching-list user-list" id="repo-collaborator-list"></ul>
+									</div>
+				                </form>
+				            </div>
+	                    </div>
+	                </div>
+	            </div>
+	        </div>
+	    </div>
+	</div>
+</div>
+{{template "ng/base/footer" .}} 
\ No newline at end of file
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index 8b67dbd86e..9db98cd008 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -28,10 +28,12 @@
                 <span class="form-label"></span>
                 <a href="/user/sign_up">{{.i18n.Tr "auth.sign_up_now" | Str2html}}</a>
             </p>
+            {{if .OauthEnabled}}
             <hr/>
             <div id="sign-social" class="text-center social-buttons">
                 {{template "ng/base/social" .}}
             </div>
+            {{end}}
         </div>
     </form>
 </div>