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

3 files changed, 12 insertions, 7 deletions

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/repo/mirror.tmpl b/templates/repo/mirror.tmpl
index c69f47a309..2ac21dd617 100644
--- a/templates/repo/mirror.tmpl
+++ b/templates/repo/mirror.tmpl
@@ -3,7 +3,7 @@
 <div class="container" id="body">
     <form action="/repo/create" method="post" class="form-horizontal card" id="repo-create">
         {{.CsrfTokenHtml}}
-        <h3>Import Repository</h3>
+        <h3>Create Repository Mirror</h3>
         <div class="alert alert-danger form-error{{if .HasError}}{{else}} hidden{{end}}">{{.ErrorMsg}}</div>
         <div class="form-group">
             <label class="col-md-2 control-label">From<strong class="text-danger">*</strong></label>
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>