|
From: <tob...@us...> - 2014-03-12 00:22:08
|
Revision: 7935
http://sourceforge.net/p/bigdata/code/7935
Author: tobycraig
Date: 2014-03-12 00:22:02 +0000 (Wed, 12 Mar 2014)
Log Message:
-----------
#836 - Moved create namespace to its own box, added header, tweaked behaviour
Modified Paths:
--------------
branches/RDR/bigdata-war/src/html/css/style.css
branches/RDR/bigdata-war/src/html/js/workbench.js
branches/RDR/bigdata-war/src/html/new.html
Modified: branches/RDR/bigdata-war/src/html/css/style.css
===================================================================
--- branches/RDR/bigdata-war/src/html/css/style.css 2014-03-11 21:49:22 UTC (rev 7934)
+++ branches/RDR/bigdata-war/src/html/css/style.css 2014-03-12 00:22:02 UTC (rev 7935)
@@ -54,6 +54,11 @@
margin: 10px;
}
+h1 {
+ font-size: 125%;
+ margin-bottom: 10px;
+}
+
#container {
/*max-width: 600px;*/
}
Modified: branches/RDR/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/js/workbench.js 2014-03-11 21:49:22 UTC (rev 7934)
+++ branches/RDR/bigdata-war/src/html/js/workbench.js 2014-03-12 00:22:02 UTC (rev 7935)
@@ -53,7 +53,13 @@
var title = namespaces[i].getElementsByTagName('title')[0].textContent;
var titleText = title == DEFAULT_NAMESPACE ? title + ' (default)' : title;
var url = namespaces[i].getElementsByTagName('sparqlEndpoint')[0].getAttributeNS(rdf, 'resource');
- $('#namespaces-list').append('<li data-name="' + title + '" data-url="' + url + '">' + titleText + ' - <a href="#" class="use-namespace">Use</a> - <a href="#" class="delete-namespace">Delete</a></li>');
+ var use;
+ if(title == NAMESPACE) {
+ use = 'In use';
+ } else {
+ use = '<a href="#" class="use-namespace">Use</a>';
+ }
+ $('#namespaces-list').append('<li data-name="' + title + '" data-url="' + url + '">' + titleText + ' - ' + use + ' - <a href="#" class="delete-namespace">Delete</a></li>');
}
$('.use-namespace').click(function(e) {
e.preventDefault();
@@ -95,7 +101,8 @@
function createNamespace(e) {
e.preventDefault();
- var namespace = $(this).find('input').val();
+ var input = $(this).find('input[type=text]');
+ var namespace = input.val();
if(!namespace) {
return;
}
@@ -106,7 +113,7 @@
type: 'POST',
data: data,
contentType: 'application/xml',
- success: getNamespaces,
+ success: function() { input.val(''); getNamespaces(); },
error: function(jqXHR, textStatus, errorThrown) { alert(errorThrown); }
};
$.ajax('/bigdata/namespace', settings);
Modified: branches/RDR/bigdata-war/src/html/new.html
===================================================================
--- branches/RDR/bigdata-war/src/html/new.html 2014-03-11 21:49:22 UTC (rev 7934)
+++ branches/RDR/bigdata-war/src/html/new.html 2014-03-12 00:22:02 UTC (rev 7935)
@@ -162,10 +162,11 @@
<div class="tab" id="namespaces-tab">
<div class="box">
- <ul id="namespaces-list">
+ <h1>Namespaces</h1>
+ <ul id="namespaces-list"></ul>
+ </div>
- </ul>
-
+ <div class="box">
<form id="namespace-create"><input type="text"> <input type="submit" value="Create namespace"></form>
</div>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|