You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@couchdb.apache.org by be...@apache.org on 2015/10/15 23:49:27 UTC
fauxton commit: updated refs/heads/master to 0c98393
Repository: couchdb-fauxton
Updated Branches:
refs/heads/master 916059c51 -> 0c98393b3
Fix for doc typeahead field being hidden
When typing a doc name in the Doc ID field on the Database -> All
Docs page, it would get cut off. This PR ensures it overlaps
the body content.
Project: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/repo
Commit: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/commit/0c98393b
Tree: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/tree/0c98393b
Diff: http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/diff/0c98393b
Branch: refs/heads/master
Commit: 0c98393b39a54e4601d6e72add96a166fd88b31b
Parents: 916059c
Author: Ben Keen <be...@gmail.com>
Authored: Wed Oct 14 18:57:50 2015 -0700
Committer: Ben Keen <be...@gmail.com>
Committed: Thu Oct 15 14:36:29 2015 -0700
----------------------------------------------------------------------
.travis.yml | 2 +-
app/addons/databases/components.react.jsx | 2 +-
app/addons/documents/templates/jumpdoc.html | 2 +-
.../tests/nightwatch/selectDocViaTypeahead.js | 42 ++++++++++++++++++++
assets/less/fauxton.less | 13 ++++--
assets/less/layouts.less | 7 ----
assets/less/notification-center.less | 2 +-
7 files changed, 55 insertions(+), 15 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/.travis.yml
----------------------------------------------------------------------
diff --git a/.travis.yml b/.travis.yml
index cc6f4f4..0b3e1b4 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -33,7 +33,7 @@ before_script:
- ./node_modules/grunt-cli/bin/grunt dev &
- sleep 25
script:
- - ./node_modules/grunt-cli/bin/grunt nightwatch
+ - ./node_modules/grunt-cli/bin/grunt nightwatch --file=selectDocViaTypeahead
cache: apt
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/app/addons/databases/components.react.jsx
----------------------------------------------------------------------
diff --git a/app/addons/databases/components.react.jsx b/app/addons/databases/components.react.jsx
index 3442163..8736a3b 100644
--- a/app/addons/databases/components.react.jsx
+++ b/app/addons/databases/components.react.jsx
@@ -278,7 +278,7 @@ define([
<form onSubmit={this.jumpToDbHandler} id="jump-to-db" className="navbar-form pull-right database-search">
<div className="input-append">
<input type="text" className="search-autocomplete" ref="searchDbName" name="search-query" placeholder="Database name" autoComplete="off" />
- <button className="btn btn-primary" type="submit"><i className="icon icon-search"></i></button>
+ <span><button className="btn btn-primary" type="submit"><i className="icon icon-search"></i></button></span>
</div>
</form>
</div>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/app/addons/documents/templates/jumpdoc.html
----------------------------------------------------------------------
diff --git a/app/addons/documents/templates/jumpdoc.html b/app/addons/documents/templates/jumpdoc.html
index 5038069..e7e301b 100644
--- a/app/addons/documents/templates/jumpdoc.html
+++ b/app/addons/documents/templates/jumpdoc.html
@@ -15,6 +15,6 @@ the License.
<form id="jump-to-doc">
<div class="input-append">
<input type="text" id="jump-to-doc-id" class="input-large" autocomplete="off" placeholder="Document ID" />
- <button class="btn btn-primary" type="submit"><i class="icon icon-search"></i></button>
+ <span><button class="btn btn-primary" type="submit"><i class="icon icon-search"></i></button></span>
</div>
</form>
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/app/addons/documents/tests/nightwatch/selectDocViaTypeahead.js
----------------------------------------------------------------------
diff --git a/app/addons/documents/tests/nightwatch/selectDocViaTypeahead.js b/app/addons/documents/tests/nightwatch/selectDocViaTypeahead.js
new file mode 100644
index 0000000..d5ef543
--- /dev/null
+++ b/app/addons/documents/tests/nightwatch/selectDocViaTypeahead.js
@@ -0,0 +1,42 @@
+// Licensed under the Apache License, Version 2.0 (the "License"); you may not
+// use this file except in compliance with the License. You may obtain a copy of
+// the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+// WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+// License for the specific language governing permissions and limitations under
+// the License.
+
+module.exports = {
+
+ 'Select doc via typeahead field redirects user': function (client) {
+ var waitTime = client.globals.maxWaitTime,
+ newDatabaseName = client.globals.testDatabaseName,
+ baseUrl = client.globals.test_settings.launch_url;
+
+ client
+ .populateDatabase(newDatabaseName, 3)
+ .loginToGUI()
+ .url(baseUrl + '/#/database/' + newDatabaseName + '/_all_docs')
+ .waitForElementPresent('#jump-to-doc-id', waitTime, false)
+ .waitForElementPresent('.prettyprint', waitTime, false)
+ .waitForElementPresent('#documents-pagination', waitTime, false)
+ .waitForElementPresent('.breadcrumb .js-lastelement', waitTime, false)
+ .click('.burger')
+
+ // we need to explicitly show the doc field because it's hidden on Travis due to screen width
+ .execute("$('.closeMenu .with-sidebar .searchbox-wrapper').show();")
+ .setValue('#jump-to-doc-id', ['_des'])
+
+ .waitForElementPresent('li[data-value="_design/testdesigndoc"]', waitTime, false)
+ .waitForElementVisible('li[data-value="_design/testdesigndoc"]', waitTime, false)
+ .click('#jump-to-doc .typeahead.dropdown-menu li[data-value="_design/testdesigndoc"]')
+
+ .setValue('#jump-to-doc-id', [client.Keys.ENTER])
+ .waitForElementPresent('.panel-button.upload', waitTime, false)
+ .end();
+ }
+};
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/assets/less/fauxton.less
----------------------------------------------------------------------
diff --git a/assets/less/fauxton.less b/assets/less/fauxton.less
index 5657913..95cb88d 100644
--- a/assets/less/fauxton.less
+++ b/assets/less/fauxton.less
@@ -314,8 +314,10 @@ div.spinner {
}
#header-search {
- position: relative;
height: @collapsedNavWidth;
+ span {
+ position: relative;
+ }
}
.api-bar-tray {
@@ -517,7 +519,7 @@ body #dashboard .flex-body#breadcrumbs {
margin: 0;
}
.searchbox-container {
- margin: 12px;
+ padding: 12px;
input[type="text"] {
.border-radius(5px);
font-size: 13px;
@@ -529,8 +531,8 @@ body #dashboard .flex-body#breadcrumbs {
border: none;
position: absolute;
right: 12px;
- top: 0px;
- height: @collapsedNavWidth;
+ top: 0;
+ height: 50px;
z-index: 2;
color: #999;
.icon-search {
@@ -538,6 +540,9 @@ body #dashboard .flex-body#breadcrumbs {
top: 11px;
}
}
+ form {
+ margin: 0;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/assets/less/layouts.less
----------------------------------------------------------------------
diff --git a/assets/less/layouts.less b/assets/less/layouts.less
index f760762..b1cb3f8 100644
--- a/assets/less/layouts.less
+++ b/assets/less/layouts.less
@@ -48,11 +48,6 @@ body #notification-center .flex-layout {
body #dashboard .flex-body, body #notification-center .flex-body {
.flex(1);
overflow: auto;
-
- /* yet more stuff that can be removed at end */
- &.right-header-wrapper {
- overflow: hidden;
- }
}
/* tells an element to be as large as the content. This will replace the hardcoded ones */
@@ -72,8 +67,6 @@ body #dashboard .flex-fill {
.one-pane > header {
width: 100%;
-// .bottom-shadow-border();
-
#breadcrumbs {
overflow: hidden;
http://git-wip-us.apache.org/repos/asf/couchdb-fauxton/blob/0c98393b/assets/less/notification-center.less
----------------------------------------------------------------------
diff --git a/assets/less/notification-center.less b/assets/less/notification-center.less
index 9cd623f..08a44a5 100644
--- a/assets/less/notification-center.less
+++ b/assets/less/notification-center.less
@@ -24,7 +24,7 @@ body #dashboard #notification-center-btn {
.flex(0 0 auto);
&>div {
- padding: 17px;
+ padding: 17px 16px 16px;
}
&:hover {
color: @darkRed;