Jonas Kress (WMDE) has uploaded a new change for review. https://gerrit.wikimedia.org/r/272741
Change subject: Show standard prefixes outside of the editor ...................................................................... Show standard prefixes outside of the editor When clicking prefixes > standard prefixes one can toggle showing the standard prefixes. Bug:T127740 Change-Id: Ie8e2b745c54b95a7e6cc724021b59e7707cad20a --- M index.html M style.css M wikibase/queryService/RdfNamespaces.js M wikibase/queryService/ui/App.js 4 files changed, 47 insertions(+), 17 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikidata/query/gui refs/changes/41/272741/1 diff --git a/index.html b/index.html index 972e87d..b240fce 100644 --- a/index.html +++ b/index.html @@ -33,7 +33,10 @@ <ul class="dropdown-menu"> <li><div class="namespace-shortcuts"></div></li> <li role="separator" class="divider"></li> - <li><a class="addPrefixes">Add Standard Prefixes</a></li> + <li> + <a title="Prefixes that can be used without explicitly defining them" data-toggle="collapse" data-parent="#accordion" + href="#collapseOne" aria-expanded="false" aria-controls="collapseOne"> Standard Prefixes </a> + </li> </ul></li> <li class="dropdown"><a class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Tools<span class="caret"></span></a> <ul class="dropdown-menu"> @@ -62,7 +65,15 @@ </ul> </div> </nav> - + <div class="panel-group" id="accordion" role="tablist" aria-multiselectable="true"> + <div class="panel panel-default"> + <div id="collapseOne" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingOne"> + <div class="panel-body standard-prefixes"> + <div class="heading">Standard Prefixes:</div> + </div> + </div> + </div> + </div> <div id="query-box"> <form id="query-form"> <textarea class="queryEditor" name="query" placeholder="(Input a SPARQL query or choose a query example)"></textarea> diff --git a/style.css b/style.css index 9b13963..0213968 100644 --- a/style.css +++ b/style.css @@ -117,6 +117,26 @@ margin-left: 15px; } +.panel-group { + margin-bottom: 0px; +} +.panel-body { + padding: 0; +} +.standard-prefixes { + margin: 10px 10px 10px 35px; +} +.standard-prefixes .heading { + text-decoration: underline; +} + +.standard-prefixes .prefix { + color: #708; +} + +.standard-prefixes .value { + color: #219;; +} /** Query example dialog **/ diff --git a/wikibase/queryService/RdfNamespaces.js b/wikibase/queryService/RdfNamespaces.js index ba794f8..1ef6e9d 100644 --- a/wikibase/queryService/RdfNamespaces.js +++ b/wikibase/queryService/RdfNamespaces.js @@ -46,15 +46,10 @@ function(n) { return n; } ).reduce(function(p, v, i) { return $.extend(p, v); }, {}); - RdfNamespaces.STANDARD_PREFIXES = [ - 'PREFIX wd: <http://www.wikidata.org/entity/>', - 'PREFIX wdt: <http://www.wikidata.org/prop/direct/>', - 'PREFIX wikibase: <http://wikiba.se/ontology#>', - 'PREFIX p: <http://www.wikidata.org/prop/>', - 'PREFIX ps: <http://www.wikidata.org/prop/statement/>', - 'PREFIX pq: <http://www.wikidata.org/prop/qualifier/>', - 'PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>' - ]; + RdfNamespaces.STANDARD_PREFIXES = { + Wikidata: ['wd','wdt','wikibase','p','ps', 'pq'], + W3C:'rdfs' + }; RdfNamespaces.getPrefixMap = function(entityTypes) { var prefixes = {}; diff --git a/wikibase/queryService/ui/App.js b/wikibase/queryService/ui/App.js index c7f4521..41c2de6 100644 --- a/wikibase/queryService/ui/App.js +++ b/wikibase/queryService/ui/App.js @@ -139,7 +139,8 @@ */ SELF.prototype._initRdfNamespaces = function() { var category, select, ns, container = $( '.namespace-shortcuts' ), - namespaces = wikibase.queryService.RdfNamespaces.NAMESPACE_SHORTCUTS; + namespaces = wikibase.queryService.RdfNamespaces.NAMESPACE_SHORTCUTS, + standardPrefixes = wikibase.queryService.RdfNamespaces.STANDARD_PREFIXES; container.click( function( e ) { e.stopPropagation(); @@ -157,6 +158,14 @@ } ) ); } } + + $.each( standardPrefixes, function( type, prefixes ) { + $.each ( prefixes, function() { + var $k = $( '<span/>' ).addClass( 'prefix' ).text( 'PREFIX ' ); + var $p = $( '<span/>' ).addClass( 'value' ).text( this +': '+ namespaces[type][this] ); + $( '.standard-prefixes' ).append( '<div/>' ).append( $k, $p ); + } ) + } ); }; /** @@ -196,11 +205,6 @@ $( '#query-form' ).submit( $.proxy( this._handleQuerySubmit, this ) ); $( '.namespace-shortcuts' ).on( 'change', 'select', $.proxy( this._handleNamespaceSelected, this ) ); - - $( '.addPrefixes' ).click( function() { - var prefixes = wikibase.queryService.RdfNamespaces.STANDARD_PREFIXES.join( '\n' ); - self._editor.prepandValue( prefixes + '\n\n' ); - } ); $( '#clear-button' ).click( function () { self._editor.setValue( '' ); -- To view, visit https://gerrit.wikimedia.org/r/272741 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ie8e2b745c54b95a7e6cc724021b59e7707cad20a 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