Jonas Kress (WMDE) has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/362251 )
Change subject: Introduce editor toolbar
......................................................................
Introduce editor toolbar
Move all editor related controls to the editor toolbar.
Change-Id: I9c0f0dda8e95ea8fb22cb54418ff33d079e12f75
---
M index.html
M style.css
M wikibase/queryService/ui/App.js
3 files changed, 53 insertions(+), 36 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui
refs/changes/51/362251/1
diff --git a/index.html b/index.html
index e1f6a8d..0b39cd4 100644
--- a/index.html
+++ b/index.html
@@ -54,13 +54,6 @@
</button>
</li>
<li class="dropdown"><a
class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false">
- <span class="glyphicon
glyphicon-pushpin" aria-hidden="true"></span><span
data-i18n="wdqs-app-button-prefixes"></span><span class="caret"></span></a>
- <ul
class="dropdown-menu">
- <li><div
class="namespace-shortcuts"></div></li>
- <li
role="separator" class="divider"></li>
- <li><a
class="addPrefixes" data-i18n="wdqs-app-editor-addprefixes"></a></li>
- </ul></li>
- <li class="dropdown"><a
class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false">
<span class="glyphicon
glyphicon-cog" aria-hidden="true"></span><span
data-i18n="wdqs-app-button-tools"></span><span class="caret"></span></a>
<ul
class="dropdown-menu">
<li><a
target="_blank" rel="noopener"
href="https://tools.wmflabs.org/hay/propbrowse/";><span class="glyphicon
glyphicon-new-window" aria-hidden="true"></span> Hay's Properties
Browser</a></li>
@@ -105,25 +98,47 @@
<div id="query-box">
<form id="query-form"
action="https://query.wikidata.org/bigdata/namespace/wdq/sparql";>
- <textarea class="queryEditor"
name="query" data-i18n="[placeholder]wdqs-app-editor-placeholder"
placeholder="(Input a SPARQL query or choose a query example)"></textarea>
- <div class="status navbar navbar-default">
- <div class="navbar-left">
- <span data-i18n="[html]wdqs-app-footer-help"></span>
- </div>
- <div class="navbar-right">
- <span
class="dataUpdated">
- </span>
- </div>
+ <table>
+ <tr>
+ <td class="toolbar">
+ <div
class="dropdown">
+ <a
class="dropdown-toggle" data-toggle="dropdown" role="button"
aria-haspopup="true" aria-expanded="false"
data-i18n="[title]wdqs-app-button-prefixes">
+ <span
class="fa fa-thumb-tack" aria-hidden="true"></span><span
class="caret"></span></a>
+ <ul
class="dropdown-menu">
+
<li><div class="namespace-shortcuts"></div></li>
+
<li role="separator" class="divider"></li>
+
<li><a class="addPrefixes" data-i18n="wdqs-app-editor-addprefixes"></a></li>
+ </ul>
+ </div>
+ <div>
+ <a
class="btn" data-i18n="[title]wdqs-app-button-examples" data-toggle="modal"
data-target="#QueryExamples"> <span class="fa fa-folder-open-o"
aria-hidden="true"></span>
+ </a>
+ </div>
+ <div>
+ <a
class="btn" id="clear-button" data-toggle="tooltip" data-placement="top"
data-i18n="[title]wdqs-app-button-clear-title"> <span class="fa fa-trash-o"
aria-hidden="true"></span>
+ </a>
+ </div>
+ <div>
+ <a
href="#" class="shareQuery shortUrlTrigger query" target="_blank"
data-i18n="[title]wdqs-app-shorturl-page-title" data-toggle="popover"> <span
class="fa fa-link" aria-hidden="true"></span></a>
+ </div>
+ </td>
+ <td><textarea
class="queryEditor" name="query"
data-i18n="[placeholder]wdqs-app-editor-placeholder" placeholder="(Input a
SPARQL query or choose a query example)"></textarea></td>
+ </tr>
+ </table>
+ <div class="status navbar
navbar-default">
+ <div class="navbar-left">
+ <span
data-i18n="[html]wdqs-app-footer-help"></span>
+ </div>
+ <div class="navbar-right">
+ <span
class="dataUpdated"> </span>
+ </div>
- </div>
+ </div>
<nav class="navbar navbar-default">
<div class="nav navbar-form
navbar-left">
<div class="form-group">
<button
type="submit" class="btn btn-info" id="execute-button" data-toggle="tooltip"
data-placement="top" data-i18n="[title]wdqs-app-button-run-title">
<span
class="glyphicon glyphicon-play" aria-hidden="true"></span> <span
data-i18n="wdqs-app-button-run">Run</span>
- </button>
- <button
type="button" class="btn btn-default" id="clear-button" data-toggle="tooltip"
data-placement="top" data-i18n="[title]wdqs-app-button-clear-title">
- <span
data-i18n="wdqs-app-button-clear"></span>
</button>
<span
class="query-total">
<span
class="label label-default"><span id="total-results"></span> Results in <span
id="query-time"></span> ms </span></span>
@@ -176,7 +191,6 @@
<div class="panel-body"></div>
</div>
</div>
- <a href="#" class="shareQuery shortUrlTrigger
query" target="_blank" data-i18n="[title]wdqs-app-shorturl-page-title"
data-toggle="popover"> <span class="glyphicon glyphicon-link"
aria-hidden="true"></span></a>
</div>
</div>
<div class="row action-bar">
diff --git a/style.css b/style.css
index 3926db3..f2bd4f2 100644
--- a/style.css
+++ b/style.css
@@ -8,10 +8,6 @@
white-space: pre;
}
-#clear-button {
- margin-right: 10px;
-}
-
.query-total,
#query-result,
#hide-explorer {
@@ -120,13 +116,20 @@
#query-box .nav {
margin-left: 0;
}
-.shareQuery {
- z-index: 100;
- position: absolute;
- top: 10px;
- right: 10px;
- font-size: 25px;
- background: rgba( 255, 255, 255, 0.5 );
+
+#query-box table {
+ width: 100%;
+}
+
+#query-box .toolbar {
+ width: 1.5em;
+ padding-top: 0.5em;
+ vertical-align: top;
+ text-align: center;
+}
+
+#query-box .toolbar .fa {
+ font-size: 1.5em;
}
/**
@@ -408,8 +411,8 @@
display: none;
z-index: 100;
position: absolute;
- top: 10px;
- right: 45px;
+ top: 0.5em;
+ right: 0.5em;
font-size: 25px;
}
@@ -419,7 +422,7 @@
z-index: 100;
position: absolute;
top: 5px;
- right: 45px;
+ right: 0.5em;
font-size: 15px;
padding-left: 35px;
}
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index e86c139..5089eb2 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -369,7 +369,7 @@
var self = this;
$( '.shortUrlTrigger.query' ).clickover( {
- placement: 'left',
+ placement: 'right',
'global_close': true,
'html': true,
'content': function() {
--
To view, visit https://gerrit.wikimedia.org/r/362251
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9c0f0dda8e95ea8fb22cb54418ff33d079e12f75
Gerrit-PatchSet: 1
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <jonas.kr...@wikimedia.de>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
