[Bigdata-commit] SF.net SVN: bigdata:[8089] branches/RDR/bigdata-war/src/html

[<tob...@us...>]

Revision: 8089
          http://sourceforge.net/p/bigdata/code/8089
Author:   tobycraig
Date:     2014-04-08 22:24:37 +0000 (Tue, 08 Apr 2014)
Log Message:
-----------
Changed type labels, RDF format selector always visible

Modified Paths:
--------------
    branches/RDR/bigdata-war/src/html/css/style.css
    branches/RDR/bigdata-war/src/html/index.html
    branches/RDR/bigdata-war/src/html/js/workbench.js

Modified: branches/RDR/bigdata-war/src/html/css/style.css
===================================================================
--- branches/RDR/bigdata-war/src/html/css/style.css	2014-04-08 22:22:47 UTC (rev 8088)
+++ branches/RDR/bigdata-war/src/html/css/style.css	2014-04-08 22:24:37 UTC (rev 8089)
@@ -145,10 +145,6 @@
    box-sizing: border-box;
 }
 
-#rdf-type-container {
-   display: none;
-}
-
 hr {
    background: #929292;
    border: none;

Modified: branches/RDR/bigdata-war/src/html/index.html
===================================================================
--- branches/RDR/bigdata-war/src/html/index.html	2014-04-08 22:22:47 UTC (rev 8088)
+++ branches/RDR/bigdata-war/src/html/index.html	2014-04-08 22:24:37 UTC (rev 8089)
@@ -42,24 +42,22 @@
             <input type="file" id="load-file"><br>
             <label for="load-type">Type:</label>
             <select id="load-type">
-              <option value="sparql" selected="selected">SPARQL</option>
-              <option value="rdf">RDF</option>
-              <option value="path">File path</option>
+              <option value="sparql" selected="selected">SPARQL Update</option>
+              <option value="rdf">RDF Data</option>
+              <option value="path">File Path or URL</option>
             </select>
-            <span id="rdf-type-container">
-              <label for="rdf-type">Format:</label>
-              <select id="rdf-type">
-                <option value="">Select RDF format</option>
-                <option value="n-quads">N-Quads</option>
-                <option value="n-triples">N-Triples</option>
-                <option value="n3">Notation3</option>
-                <option value="rdf/xml">RDF/XML</option>
-                <option value="json">JSON</option>
-                <option value="trig">TriG</option>
-                <option value="trix">TriX</option>
-                <option value="turtle">Turtle</option>
-              </select>
-            </span>
+            <label for="rdf-type">Format:</label>
+            <select id="rdf-type">
+              <option value="">Select RDF format</option>
+              <option value="n-quads">N-Quads</option>
+              <option value="n-triples">N-Triples</option>
+              <option value="n3">Notation3</option>
+              <option value="rdf/xml">RDF/XML</option>
+              <option value="json">JSON</option>
+              <option value="trig">TriG</option>
+              <option value="trix">TriX</option>
+              <option value="turtle">Turtle</option>
+            </select>
           </p>
           <hr class="shadow">
           <button id="load-load">Load</button>

Modified: branches/RDR/bigdata-war/src/html/js/workbench.js
===================================================================
--- branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-08 22:22:47 UTC (rev 8088)
+++ branches/RDR/bigdata-war/src/html/js/workbench.js	2014-04-08 22:24:37 UTC (rev 8089)
@@ -317,17 +317,10 @@
    } 
 }
 
-function handleTypeChange(e) {
-   $('#rdf-type-container').toggle($(this).val() == 'rdf');
-}
-
 function setType(type, format) {
    $('#load-type').val(type);
    if(type == 'rdf') {
-      $('#rdf-type-container').show();
       $('#rdf-type').val(format);
-   } else {
-      $('#rdf-type-container').hide();
    }
 }
 
@@ -362,7 +355,6 @@
    .on('drop', handleFile)
    .on('paste', handlePaste)
    .bind('keydown', 'ctrl+return', submitLoad);
-$('#load-type').change(handleTypeChange);
 $('#clear-file').click(clearFile);
 
 $('#load-load').click(submitLoad);

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.