Merge branch 'master' of github.com:gogits/gogs

3 files changed, 55 insertions, 22 deletions

diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index c93f9386..a3ad06df 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -1,24 +1,57 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
-<div class="container">
-	<form action="/repo/create" method="post" class="form-horizontal">
-		<div class="form-group">
-<div class="col-md-offset-4 col-md-3">
-				Owner: <input name="userId" type="hidden" value="1"/>lunny
-			</div>
-			<div class="col-md-offset-4 col-md-3">
-		    	repo name: <input name="name" type="text"/>
-		    </div>
-		    <div class="col-md-offset-4 col-md-3">
-		    	description(optional): <input name="desc" type="text"/>
-		    	</div>
-		    	<div class="col-md-offset-4 col-md-3">
-			
-			</div>
-		    	<div class="col-md-offset-4 col-md-3">
-		    	<button type="submit" class="btn btn-info">Create repository</button>
-		    </div>
-		</div>
-	</form>
+<div class="container" id="gogs-body">
+    <form action="/repo/create" method="post" class="form-horizontal gogs-card" id="gogs-repo-create">
+        <h3>Create New Repository</h3>
+        <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">Owner-name</p>
+                <input type="hidden" value="1" name="user-id"/>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-2 control-label">Repository<strong class="text-danger">*</strong></label>
+            <div class="col-md-8">
+                <input name="repo" type="text" class="form-control" placeholder="Type your repository name">
+                <span class="help-block">Great repository names are short and memorable. </span>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-2 control-label">Description</label>
+            <div class="col-md-8">
+                <textarea name="desc" class="form-control" placeholder="Type your repository name"></textarea>
+            </div>
+        </div>
+        <div class="form-group">
+            <label class="col-md-2 control-label">Language</label>
+            <div class="col-md-8">
+                <select class="form-control" name="language">
+                    <option value="">Select a language</option>
+                    <option value="ActionScript">ActionScript</option>
+                    <option value="C#">C#</option>
+                    <option value="Google Go">Google Go</option>
+                    <option value="Java">Java</option>
+                    <option value="PHP">PHP</option>
+                </select>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-8 col-md-offset-2">
+                <div class="checkbox">
+                    <label>
+                        <input type="checkbox" value="true" name="init-md">
+                        <strong>Initialize this repository with a README</strong>
+                    </label>
+                </div>
+            </div>
+        </div>
+        <div class="form-group">
+            <div class="col-md-offset-2 col-md-8">
+                <button type="submit" class="btn btn-lg btn-primary">Create repository</button>
+                <a href="/" class="text-danger">Cancel</a>
+            </div>
+        </div>
+    </form>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file
diff --git a/templates/user/signin.tmpl b/templates/user/signin.tmpl
index c3a3131f..856e46d9 100644
--- a/templates/user/signin.tmpl
+++ b/templates/user/signin.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div class="container" id="gogs-body">
-    <form action="/user/signin" method="post" class="form-horizontal" id="gogs-login-card">
+    <form action="/user/signin" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
         <h3>Log in</h3>
         <div class="form-group">
             <label class="col-md-4 control-label">Username or Email: </label>
diff --git a/templates/user/signup.tmpl b/templates/user/signup.tmpl
index 0bac3244..48e50a00 100644
--- a/templates/user/signup.tmpl
+++ b/templates/user/signup.tmpl
@@ -1,7 +1,7 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
 <div class="container" id="gogs-body">
-	<form action="/user/signup" method="post" class="form-horizontal" id="gogs-login-card">
+	<form action="/user/signup" method="post" class="form-horizontal gogs-card" id="gogs-login-card">
         <h3>Sign Up</h3>
 		<div class="form-group">
 			<label class="col-md-4 control-label">Username: </label>