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

3 files changed, 81 insertions, 1 deletions

diff --git a/public/css/gogs.css b/public/css/gogs.css
index 05e3081051..322c031de7 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -36,6 +36,12 @@ body {
     cursor: pointer;
 }
 
+.panel-default .panel-heading{
+    background-color: #FAFAFA;
+    border-bottom: 1px solid #DDD;
+    font-weight: bold;
+}
+
 /* gogits nav header */
 .gogs-masthead {
     background-color: #428bca;
@@ -131,6 +137,35 @@ body {
     margin-top: 50px;
 }
 
+#gogs-body-nav{
+    margin-top: 52px;
+    margin-bottom: -50px;
+    background-color: #FFF;
+    border-bottom: 1px solid #BBB;
+    height: 66px
+}
+
+#gogs-body-nav .nav{
+    font-size: 14px;
+    margin-top: 12px;
+}
+
+#gogs-body-nav .nav-pills li a{
+    color: #444;
+}
+
+#gogs-body-nav .nav-pills li.active a{
+    font-weight: bold;
+    border-bottom: 2px solid #d26911;
+    background-color: transparent;
+    color: #444;
+}
+
+#gogs-body-nav .nav-pills li:hover a{
+    background-color: transparent;
+    text-decoration: underline;
+}
+
 /* gogits login card */
 .gogs-card {
     margin: auto;
@@ -300,4 +335,13 @@ body {
 
 #gogs-ssh-form textarea {
     height: 16em;
+}
+/* #gogs-feed */
+
+#gogs-feed-left{
+    padding-left: 0;
+}
+
+#gogs-feed-right .repo-panel .panel-heading .btn{
+    margin-top: -4px;
 }
\ No newline at end of file
diff --git a/templates/repo/create.tmpl b/templates/repo/create.tmpl
index e7a3633489..d8267d7bdc 100644
--- a/templates/repo/create.tmpl
+++ b/templates/repo/create.tmpl
@@ -50,6 +50,19 @@
         </div>
 
         <div class="form-group">
+            <label class="col-md-2 control-label">License</label>
+            <div class="col-md-8">
+                <select class="form-control" name="license">
+                    <option value="">Select a license</option>
+                    <option value="mit">MIT</option>
+                    <option value="gpl">GPL</option>
+                    <option value="apache">Apache License</option>
+                    <option value="bsd">BSD</option>go
+                </select>
+            </div>
+        </div>
+
+        <div class="form-group">
             <div class="col-md-8 col-md-offset-2">
                 <div class="checkbox">
                     <label>
diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index bde541a6a7..3045b033cf 100644
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -1,6 +1,29 @@
 {{template "base/head" .}}
 {{template "base/navbar" .}}
+<div id="gogs-body-nav">
+    <div class="container">
+        <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="/pulls/">Pull Requests</a></li>
+            <li><a href="/stars/">Stars</a></li>
+        </ul>
+        <h3>New Feed</h3>
+    </div>
+</div>
 <div id="gogs-body" class="container">
-	Website is still in the progress of building...please come back later! <strong>{{.SignedUserName}}</strong> is logged!
+    <div id="gogs-feed-left" class="col-md-8">
+        Website is still in the progress of building...please come back later! <strong>{{.SignedUserName}}</strong> is logged!
+    </div>
+    <div id="gogs-feed-right" class="col-md-4">
+        <div class="panel panel-default repo-panel">
+            <div class="panel-heading">Your Repositories
+                <a class="btn btn-success pull-right btn-sm" href="/repo/create/"><i class="fa fa-plus-square"></i>New Repo</a>
+            </div>
+            <div class="panel-body">
+                repo-list
+            </div>
+        </div>
+    </div>
 </div>
 {{template "base/footer" .}}
\ No newline at end of file