new-repo dropdown in top navbar

3 files changed, 28 insertions, 12 deletions

diff --git a/public/css/gogs.css b/public/css/gogs.css
index dcfb2758a0..2850d15e2e 100755
--- a/public/css/gogs.css
+++ b/public/css/gogs.css
@@ -309,13 +309,13 @@ html, body {
     height: 8em;
 }
 
-#repo-import-auth{
+#repo-import-auth {
     width: 100%;
     margin-top: 48px;
     box-sizing: border-box;
 }
 
-#repo-import-auth .form-group{
+#repo-import-auth .form-group {
     box-sizing: border-box;
     margin-left: 0;
     margin-right: 0;
@@ -460,28 +460,39 @@ html, body {
     padding: 3px 8px;
 }
 
-#user-dashboard-repo-new .dropdown-menu {
+#user-dashboard-repo-new .dropdown-menu, #nav-repo-new .dropdown-menu {
     padding: 0;
     margin: 0;
 }
 
-#user-dashboard-repo-new ul {
+#user-dashboard-repo-new ul, #nav-repo-new ul {
     margin: 0;
     width: 200px;
 }
 
-#user-dashboard-repo-new li a {
+#user-dashboard-repo-new li a, #nav-repo-new li a {
     line-height: 36px;
     display: block;
     padding: 0 18px;
     color: #444;
 }
 
-#user-dashboard-repo-new li a:hover {
+#user-dashboard-repo-new li a:hover, #nav-repo-new li a:hover {
     background: #0093c4;
     color: #FFF;
 }
 
+#nav-repo-new button {
+    border: none;
+    background: transparent;
+    padding: 0;
+    width: 15px;
+}
+
+#nav-repo-new li .fa {
+    margin: 0 .5em;
+}
+
 /* gogits repo single page */
 
 #body-nav.repo-nav {
diff --git a/templates/base/navbar.tmpl b/templates/base/navbar.tmpl
index 7d1f64e495..c0855d81ef 100644
--- a/templates/base/navbar.tmpl
+++ b/templates/base/navbar.tmpl
@@ -8,9 +8,18 @@
             <a id="nav-avatar" class="nav-item navbar-right{{if .PageIsUserProfile}} active{{end}}" href="{{.SignedUser.HomeLink}}" data-toggle="tooltip" data-placement="bottom" title="{{.SignedUserName}}">
                 <img src="{{.SignedUser.AvatarLink}}?s=28" alt="user-avatar" title="username"/>
             </a>
-            <a class="navbar-right nav-item{{if .PageIsNewRepo}} active{{end}}" href="/repo/create" data-toggle="tooltip" data-placement="bottom" title="New Repository"><i class="fa fa-plus fa-lg"></i></a>
             <a class="navbar-right nav-item{{if .PageIsUserSetting}} active{{end}}" href="/user/setting"  data-toggle="tooltip" data-placement="bottom" title="Setting"><i class="fa fa-cogs fa-lg"></i></a>
             {{if .IsAdmin}}<a class="navbar-right nav-item{{if .PageIsAdmin}} active{{end}}" href="/admin"  data-toggle="tooltip" data-placement="bottom" title="Admin"><i class="fa fa-gear fa-lg"></i></a>{{end}}
+            <div class="navbar-right nav-item pull-right{{if .PageIsNewRepo}} active{{end}}" id="nav-repo-new" data-toggle="tooltip" data-placement="bottom" title="New Repo">
+                <button type="button" class="dropdown-toggle" data-toggle="dropdown"><i class="fa fa-plus-square fa-lg"></i></button>
+                <div class="dropdown-menu">
+                    <ul class="list-unstyled">
+                        <li><a href="/repo/create"><i class="fa fa-book"></i>Repository</a></li>
+                        <li><a href="/repo/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li>
+                        <li><a href="#"><i class="fa fa-users"></i>Organization</a></li>
+                    </ul>
+                </div>
+            </div>
             {{else}}<a id="nav-signin" class="nav-item navbar-right navbar-btn btn btn-danger" href="/user/login/">Sign In</a>
             <a id="nav-signup" class="nav-item navbar-right" href="/user/sign_up/">Sign Up</a>{{end}}
         </nav>
diff --git a/templates/user/dashboard.tmpl b/templates/user/dashboard.tmpl
index cd55b651df..e2d7a5093f 100644
--- a/templates/user/dashboard.tmpl
+++ b/templates/user/dashboard.tmpl
@@ -30,17 +30,13 @@
         <div class="panel panel-default repo-panel">
             <div class="panel-heading">Your Repositories
                 <div class="btn-group pull-right" id="user-dashboard-repo-new">
-                    <button type="button" class="btn btn-success btn-sm"><i class="fa fa-plus-square"></i>New</button>
-                    <button type="button" class="btn btn-success btn-sm dropdown-toggle" data-toggle="dropdown">
-                        <span class="caret"></span>
-                    </button>
+                    <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/mirror"><i class="fa fa-clipboard"></i>Mirror</a></li>
                            <li><a href="#"><i class="fa fa-users"></i>Organization</a></li>
                        </ul>
-
                     </div>
                 </div>
             </div>