jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365050 )
Change subject: Make Result View more prominent and add help link
......................................................................
Make Result View more prominent and add help link
Bug:T170660
Change-Id: I793f299c5b7a5510cf42b36b0f67158e8f1d31f0
---
M index.html
M style.css
M wikibase/queryService/ui/ResultView.js
3 files changed, 21 insertions(+), 11 deletions(-)
Approvals:
Smalyshev: Looks good to me, approved
jenkins-bot: Verified
diff --git a/index.html b/index.html
index deb1c17..7a53ca7 100644
--- a/index.html
+++ b/index.html
@@ -155,19 +155,22 @@
</div>
</div>
- <nav class="navbar navbar-default">
- <div class="nav navbar-form
navbar-left">
- <div class="form-group">
- <span
class="query-total">
- <span
class="label label-default"><span id="total-results"></span> Results in <span
id="query-time"></span> ms </span></span>
- </div>
- </div>
- <ul class="nav navbar-nav
navbar-right query-total">
+ <nav class="navbar navbar-default
result">
+ <ul class="nav navbar-nav
navbar-left">
<li><a
id="display-button" href="#" data-toggle="dropdown" class="dropdown-toggle"
data-placement="top" data-i18n="[title]wdqs-app-button-display-title"><span
id="display-button-icon" class="glyphicon glyphicon-eye-open"
aria-hidden="true"></span><span id="display-button-label"></span><span
class="caret"></span>
</a>
<ul
id="result-browser-menu" class="dropdown-menu" role="menu">
</ul></li>
<li>
+ <li>
+ <a
target="_blank" class="help" rel="noopener"
href="https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/Result_Views";><span
class="fa fa-question-circle"></span></a>
+ </li>
+ </ul>
+ <ul class="nav navbar-nav
navbar-right">
+ <li class="navbar-text">
+ <span
class="query-total">
+ <span
class="label label-default"><span id="total-results"></span> Results in <span
id="query-time"></span> ms </span></span>
+ </li>
<li><a
id="download-button" href="#" data-toggle="dropdown" class="dropdown-toggle"
data-placement="top" data-i18n="[title]wdqs-app-button-download-title"><span
class="glyphicon glyphicon-download-alt" aria-hidden="true"></span><span
data-i18n="wdqs-app-button-download"></span><span class="caret"></span>
</a>
<ul
class="dropdown-menu" role="menu">
diff --git a/style.css b/style.css
index 113da69..afb29dd 100644
--- a/style.css
+++ b/style.css
@@ -8,7 +8,6 @@
white-space: pre;
}
-.query-total,
#query-result,
#hide-explorer {
display: none;
@@ -32,6 +31,10 @@
.error-character {
background: lightsalmon;
+}
+
+.result {
+ display: none;
}
#query-result pre {
@@ -154,6 +157,9 @@
margin-bottom: 0;
}
+.navbar .help {
+ padding-left: 0;
+}
.navbar-right {
margin-right: 0;
}
diff --git a/wikibase/queryService/ui/ResultView.js
b/wikibase/queryService/ui/ResultView.js
index b12aedb..9dcf0a7 100644
--- a/wikibase/queryService/ui/ResultView.js
+++ b/wikibase/queryService/ui/ResultView.js
@@ -211,7 +211,7 @@
this._actionBar.show( 'wdqs-action-query', '', 'info', 100 );
$( '#query-result' ).empty().hide();
- $( '.query-total' ).hide();
+ $( '.result' ).hide();
$( '#query-error' ).hide();
this._sparqlApi.query( query )
@@ -270,7 +270,8 @@
$( '#total-results' ).text( api.getResultLength() );
$( '#query-time' ).text( api.getExecutionTime() );
- $( '.query-total' ).show();
+ $( '.result' ).show();
+
$( '#execute-button' ).prop( 'disabled', false );
var defaultBrowser = this._createResultBrowsers(
api.getResultRawData() );
--
To view, visit https://gerrit.wikimedia.org/r/365050
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I793f299c5b7a5510cf42b36b0f67158e8f1d31f0
Gerrit-PatchSet: 2
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Smalyshev <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
