jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/365058 )
Change subject: Show toast how to exit fullscreen mode
......................................................................
Show toast how to exit fullscreen mode
Bug:T170540
Change-Id: I14137d886e190d18f945bc3a28c62829e6a144c3
---
M i18n/en.json
M i18n/qqq.json
M index.html
M package.json
M style.css
M wikibase/queryService/ui/App.js
6 files changed, 13 insertions(+), 0 deletions(-)
Approvals:
Jonas Kress (WMDE): Looks good to me, but someone else must approve
Lucas Werkmeister (WMDE): Looks good to me, approved
jenkins-bot: Verified
diff --git a/i18n/en.json b/i18n/en.json
index 8fb8695..68a2002 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -56,6 +56,7 @@
"wdqs-app-resultbrowser-hierarchical-lr": "Hierarchical layout left to
right",
"wdqs-app-resultbrowser-hierarchical-ud": "Hierarchical layout up to down",
"wdqs-app-resultbrowser-hierarchical-rl": "Hierarchical layout right to
left",
+ "wdqs-app-toast-leave-fullscreen": "Press [esc] to leave fullscreen",
"wdqs-dialog-examples-preview-query": "Preview query",
"wdqs-dialog-examples-preview-result": "Preview result",
"wdqs-ve-filter": "Filter",
diff --git a/i18n/qqq.json b/i18n/qqq.json
index e7ca525..40d429c 100644
--- a/i18n/qqq.json
+++ b/i18n/qqq.json
@@ -58,6 +58,7 @@
"wdqs-app-resultbrowser-hierarchical-lr": "Button message in graph
browser toolbar",
"wdqs-app-resultbrowser-hierarchical-ud": "Button message in graph
browser toolbar",
"wdqs-app-resultbrowser-hierarchical-rl": "Button message in graph
browser toolbar",
+ "wdqs-app-toast-leave-fullscreen": "Explaination how to exit fullscreen",
"wdqs-dialog-examples-preview-query": "Label to preview query in
example dialog",
"wdqs-dialog-examples-preview-result": "Label to preview result in
example dialog",
"wdqs-ve-filter": "Label to add a filter in Query
Helper\n{{Identical|Filter}}",
diff --git a/index.html b/index.html
index deb1c17..c2bb2d6 100644
--- a/index.html
+++ b/index.html
@@ -26,6 +26,7 @@
<link rel="stylesheet"
href="node_modules/jquery.uls/css/jquery.uls.lcd.css">
<link rel="stylesheet"
href="node_modules/jquery.uls/css/jquery.uls.mobile.css">
<link rel="stylesheet"
href="node_modules/jstree/dist/themes/default/style.css" />
+ <link rel="stylesheet"
href="node_modules/jquery-toast-plugin/src/jquery.toast.css" />
<link rel="stylesheet"
href="vendor/bootstrap-tags/css/bootstrap-tags.css">
<link rel="stylesheet" href="style.css">
<!-- endbuild -->
@@ -269,6 +270,7 @@
<!-- JS files -->
<!-- build:js js/vendor.min.js -->
<script src="node_modules/jquery/dist/jquery.js"></script>
+ <script
src="node_modules/jquery-toast-plugin/src/jquery.toast.js"></script>
<script src="node_modules/underscore/underscore.js"></script>
<script src="node_modules/bootstrap/dist/js/bootstrap.js"></script>
<script src="node_modules/codemirror/lib/codemirror.js"></script>
diff --git a/package.json b/package.json
index 90e6659..da56cdc 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
"font-awesome": "^4.7.0",
"jqcloud-npm": "^3.1.0",
"jquery": "^3.2.1",
+ "jquery-toast-plugin": "^1.3.1",
"jquery.i18n": "git+https://github.com/wikimedia/jquery.i18n.git";,
"jquery.uls": "git+https://github.com/wikimedia/jquery.uls.git";,
"js-cookie": "^2.1.4",
diff --git a/style.css b/style.css
index 113da69..5f8f4ce 100644
--- a/style.css
+++ b/style.css
@@ -146,6 +146,10 @@
text-align: center;
}
+.jq-toast-single a {
+ border: none;
+}
+
/**
Bootstrap Styles
**/
diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js
index 41a23d0..85443ba 100644
--- a/wikibase/queryService/ui/App.js
+++ b/wikibase/queryService/ui/App.js
@@ -365,6 +365,10 @@
e.preventDefault();
self._editor.toggleFullscreen();
self._editor.focus();
+
+ var $help = $( '<a target="_blank" rel="noopener"
href="https://www.wikidata.org/wiki/Wikidata:SPARQL_query_service/Wikidata_Query_Help/SPARQL_Editor#Editor_Toolbar";>'
)
+ .append( $.i18n(
'wdqs-app-toast-leave-fullscreen' ) );
+ $.toast( $help[0].outerHTML );
} );
$( window ).on( 'popstate', $.proxy( this._initQuery, this ) );
--
To view, visit https://gerrit.wikimedia.org/r/365058
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I14137d886e190d18f945bc3a28c62829e6a144c3
Gerrit-PatchSet: 4
Gerrit-Project: wikidata/query/gui
Gerrit-Branch: master
Gerrit-Owner: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Jonas Kress (WMDE) <[email protected]>
Gerrit-Reviewer: Lucas Werkmeister (WMDE) <[email protected]>
Gerrit-Reviewer: Siebrand <[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
