diff options
author | Garren Smith <garren.smith@gmail.com> | 2013-12-09 10:15:23 +0200 |
---|---|---|
committer | Garren Smith <garren.smith@gmail.com> | 2013-12-09 10:15:23 +0200 |
commit | f28dd6f64df4781131f03eec01322e18c9d8377a (patch) | |
tree | 9c0368e296f1e3b80d3d499286e9004297dc94d1 | |
parent | 555ad0ff711ea271ef96a537cb9fa72c99edd765 (diff) | |
download | couchdb-f28dd6f64df4781131f03eec01322e18c9d8377a.tar.gz |
Fauxton: UI Improvements
-rw-r--r-- | src/fauxton/Gruntfile.js | 2 | ||||
-rw-r--r-- | src/fauxton/app/templates/documents/sidebar.html | 22 | ||||
-rw-r--r-- | src/fauxton/app/templates/documents/view_editor.html | 2 | ||||
-rw-r--r-- | src/fauxton/assets/less/fauxton.less | 4 |
4 files changed, 15 insertions, 15 deletions
diff --git a/src/fauxton/Gruntfile.js b/src/fauxton/Gruntfile.js index 5e046ffb3..3afaa1f62 100644 --- a/src/fauxton/Gruntfile.js +++ b/src/fauxton/Gruntfile.js @@ -220,7 +220,7 @@ module.exports = function(grunt) { proxy: { target: { host: 'localhost', - port: 5684, + port: 5984, https: false }, // This sets the Host header in the proxy so that you can use external diff --git a/src/fauxton/app/templates/documents/sidebar.html b/src/fauxton/app/templates/documents/sidebar.html index 4faae4cdd..336946ddd 100644 --- a/src/fauxton/app/templates/documents/sidebar.html +++ b/src/fauxton/app/templates/documents/sidebar.html @@ -14,7 +14,7 @@ the License. <div id="sidenav"> <header class="row-fluid"> - <div class="span5"> + <div class="span12"> <div class="btn-group"> <button class="btn dropdown-toggle dropdown-toggle-btn" data-toggle="dropdown"> Docs @@ -30,9 +30,7 @@ the License. <% }); %> </ul> </div> - </div> - <div class="span4 offset1"> <div class="btn-group"> <button class="btn dropdown-toggle dropdown-toggle-btn" data-toggle="dropdown"> Add @@ -40,19 +38,17 @@ the License. </button> <ul class="dropdown-menu"> <!-- dropdown menu links --> - <li> - <a id="doc" href="#<%= database.url('app') %>/new">New doc</a> + <li> + <a id="doc" href="#<%= database.url('app') %>/new">New doc</a> </li> <% if (showNewView) { %> - <li> - <a href="#<%= database.url('app') %>/new_view">New view</a> - </li> + <li> + <a href="#<%= database.url('app') %>/new_view">New view</a> + </li> <% } %> </ul> </div> - </div> - <div class="span1"> - <button id="delete-database" class="btn"><i class="icon-trash"></i></button> + <button id="delete-database" class="btn"><i class="icon-trash"></i> Database</button> </div> </header> @@ -64,8 +60,8 @@ the License. <ul class="nav nav-list views"> <li class="nav-header">Secondary Indexes</li> <% if (showNewView) { %> - <li><a id="new-view" href="#<%= database.url('app') %>/new_view" class="new"><i class="icon-plus"></i> New</a></li> - <% } %> + <li><a id="new-view" href="#<%= database.url('app') %>/new_view" class="new"><i class="icon-plus"></i> New</a></li> + <% } %> </ul> </nav> </div> diff --git a/src/fauxton/app/templates/documents/view_editor.html b/src/fauxton/app/templates/documents/view_editor.html index 7f5d233e9..cd53fc750 100644 --- a/src/fauxton/app/templates/documents/view_editor.html +++ b/src/fauxton/app/templates/documents/view_editor.html @@ -14,8 +14,10 @@ the License. <div class="row"> <ul class="nav nav-tabs window-resizeable" id="db-views-tabs-nav"> <li class="active"> <a id="index-nav" class="fonticon-wrench fonticon" data-toggle="tab" href="#index"><% if (newView) { %>Create Index <% } else { %>Edit Index <% } %></a></li> + <% if (!newView) { %> <li><a id="query-nav" class="fonticon-plus fonticon" href="#query" data-toggle="tab">Query Options</a></li> <li><a id="meta-nav" href="#metadata" data-toggle="tab">Design Doc Metadata</a></li> + <% } %> </ul> <div class="all-docs-list errors-container"></div> <div class="tab-content"> diff --git a/src/fauxton/assets/less/fauxton.less b/src/fauxton/assets/less/fauxton.less index 3d8d97a0a..0efbba921 100644 --- a/src/fauxton/assets/less/fauxton.less +++ b/src/fauxton/assets/less/fauxton.less @@ -1000,4 +1000,6 @@ div.spinner { font-size: 16px; } - +#delete-database { + float: right; +} |