jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r1564758 - in /jena/branches/jena-fuseki-new-ui/pages: ./ css/ js/app/controllers/ js/app/templates/ js/app/views/
Date Wed, 05 Feb 2014 13:01:45 GMT
Author: ijd
Date: Wed Feb  5 13:01:44 2014
New Revision: 1564758

URL: http://svn.apache.org/r1564758
Log:
Redo the layout of the front page. Add the possibility to select a particular 
dataset for query or configure operatoins. Minor tweaks to menu bar.

Modified:
    jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html
    jena/branches/jena-fuseki-new-ui/pages/admin-dataset-details.html
    jena/branches/jena-fuseki-new-ui/pages/admin-logs.html
    jena/branches/jena-fuseki-new-ui/pages/css/fui.css
    jena/branches/jena-fuseki-new-ui/pages/documentation.html
    jena/branches/jena-fuseki-new-ui/pages/index.html
    jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/index-controller.js
    jena/branches/jena-fuseki-new-ui/pages/js/app/templates/dataset-selection-list.tpl
    jena/branches/jena-fuseki-new-ui/pages/js/app/views/dataset-selection-list.js
    jena/branches/jena-fuseki-new-ui/pages/query.html
    jena/branches/jena-fuseki-new-ui/pages/validate.html

Modified: jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html Wed Feb  5 13:01:44
2014
@@ -46,10 +46,10 @@
               <li class=""><a href="documentation.html"><i class="fa fa-info-circle"></i>
help</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>

Modified: jena/branches/jena-fuseki-new-ui/pages/admin-dataset-details.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/admin-dataset-details.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/admin-dataset-details.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/admin-dataset-details.html Wed Feb  5 13:01:44
2014
@@ -44,6 +44,8 @@
               <li class="admin active"><a href="admin-data-management.html"><i
class="fa fa-cogs"></i> administer</a></li>
               <li class="admin"><a href="admin-logs.html"><i class="fa fa-book"></i>
logs</a></li>
               <li class=""><a href="documentation.html"><i class="fa fa-info-circle"></i>
help</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
               <li>
                 <div class="dropdown navbar-item">
                   <a data-toggle="dropdown" href="#"><i class="fa fa-chevron-circle-down"></i></a>
@@ -54,12 +56,10 @@
               <li>
                 <div class="current-dataset navbar-item"> dataset: <span></span></div>
               </li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>

Modified: jena/branches/jena-fuseki-new-ui/pages/admin-logs.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/admin-logs.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/admin-logs.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/admin-logs.html Wed Feb  5 13:01:44 2014
@@ -44,10 +44,10 @@
               <li class=""><a href="documentation.html"><i class="fa fa-info-circle"></i>
help</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>

Modified: jena/branches/jena-fuseki-new-ui/pages/css/fui.css
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/css/fui.css?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/css/fui.css (original)
+++ jena/branches/jena-fuseki-new-ui/pages/css/fui.css Wed Feb  5 13:01:44 2014
@@ -93,4 +93,12 @@ a.navbar-brand img {
 }
 .has-error .validation-warning, .has-warning .validation-warning {
   display:block;
+}
+
+.current-dataset {
+  margin-right: 20px;
+}
+
+.status-indicator {
+  padding-top: 10px;
 }
\ No newline at end of file

Modified: jena/branches/jena-fuseki-new-ui/pages/documentation.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/documentation.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/documentation.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/documentation.html Wed Feb  5 13:01:44 2014
@@ -44,10 +44,10 @@
               <li class="active"><a href="documentation.html"><i class="fa
fa-info-circle"></i> help</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>

Modified: jena/branches/jena-fuseki-new-ui/pages/index.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/index.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/index.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/index.html Wed Feb  5 13:01:44 2014
@@ -46,10 +46,10 @@
               <li class=""><a href="documentation.html"><i class="fa fa-info-circle"></i>
help</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>
@@ -62,28 +62,29 @@
 
     <div class="container">
       <div class="row">
-        <h1>Welcome to Fuseki</h1>
-        <p>This is Apache Jena Fuseki, version TODO<span class='host-details'></span>.</p>
-
-        <p>
-          This server hosts the following currently-active datasets:
-        </p>
-        <ul class="datasets">
-
-        </ul>
-
+        <h1>Welcome to Apache Jena Fuseki <small>version <span class='host-details'>TODO</span></small></h1>
+      </div>
+      <div class="row">
+        <h2>
+          Existing datasets:
+        </h2>
+        <div id="dataset-selection-list"></div>
+      </div>
+      <div class="row">
         <h2>Operations</h2>
         <p>Use the following pages to perform actions or tasks on this server:</p>
         <dl class="dl-horizontal">
           <dt><a href="query.html">SPARQL query form</a></dt>
           <dd>to run a SPARQL query against one of the active datasets hosted by this
server</dd>
-          <dt><a href="validation.html">validation form</a></dt>
+          <dt><a href="validation.html">validate</a></dt>
           <dd>to validate SPARQL query syntax, or RDF data syntax</dd>
-          <dt><a href="documentation.html">help pages</a></dt>
-          <dd>for a cheat-sheet summary of commands, and links to online documentation</dd>
-          <dt><a href="admin/index.html">administration</a></dt>
+          <dt><a href="admin/index.html">administer</a></dt>
           <dd>to administer the datasets on this server, including adding and removing
datasets,
               enabling data services, uploading data and performing backups. </dd>
+          <dt><a href="documentation.html">logs</a></dt>
+          <dd>to view server log files</dd>
+          <dt><a href="documentation.html">help</a></dt>
+          <dd>for a summary of commands, and links to online documentation</dd>
 
         </dl>
       </div>

Modified: jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/index-controller.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/index-controller.js?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/index-controller.js (original)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/index-controller.js Wed Feb
 5 13:01:44 2014
@@ -5,7 +5,8 @@ define(
         Backbone = require( "backbone" ),
         _ = require( "underscore" ),
         fui = require( "fui" ),
-        qonsole = require( "lib/qonsole" );
+        qonsole = require( "lib/qonsole" ),
+        DatasetSelectionListView = require( "views/dataset-selection-list" );
 
     var IndexController = function() {
       this.initEvents();
@@ -20,19 +21,7 @@ define(
 
       /** When the fuseki server is ready, we can init the qonsole */
       onServerModelReady: function( event ) {
-        // when ready, initialise the qonsole component
-        var datasets = fui.models.fusekiServer.datasets();
-        var endpoints = {};
-        var elem = $("ul.datasets");
-
-        _.each( datasets, function( ds ) {
-          var queryURL = ds.queryURL();
-          if (queryURL) {
-            // TODO this should be moved to a template and made more interesting
-            elem.append( sprintf( "<li>%s (with services: %s)</li>\n", ds.name(),
ds.serviceTypes().join(", ") ) );
-          }
-        } );
-
+        new DatasetSelectionListView( {model: fui.models.fusekiServer} ).render();
       }
 
     } );

Modified: jena/branches/jena-fuseki-new-ui/pages/js/app/templates/dataset-selection-list.tpl
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/templates/dataset-selection-list.tpl?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/templates/dataset-selection-list.tpl (original)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/templates/dataset-selection-list.tpl Wed
Feb  5 13:01:44 2014
@@ -1,8 +1,23 @@
-<h2>Known datasets:</h2>
-<ul class=''>
-  <% _.each( datasets, function( ds ) { %>
-    <li>
-      <%= ds.name() %>
-    </li>
-  <% }) %>
-</ul>
+<div class="col-md-span-12">
+  <table class='table'>
+    <tr class="headings"><th>Name</th><th>Services</th><th></th></tr>
+    <% _.each( datasets, function( ds ) { %>
+      <tr>
+        <td>
+          <%= ds.name() %>
+        </td>
+        <td>
+          <% _.each( ds.serviceTypes(), function( st ) { %>
+            <span class='badge'><%= st %></span>
+          <% }) %>
+        </td>
+        <td>
+          <a class="btn btn-sm action remove btn-primary" href="query.html?ds=<%= ds.name()
%>"><i class='fa fa-question-circle'></i> query</a>
+          <a class="btn btn-sm action remove btn-primary" href="explore.html?ds=<%=
ds.name() %>"><i class='fa fa-globe'></i> explore</a>
+          <a class="btn btn-sm action configure btn-primary" href="admin-dataset-details.html?ds=<%=
ds.name() %>"><i class='fa fa-wrench'></i> manage</a>
+        </td>
+      </tr>
+    <% }) %>
+
+  </table>
+</div>

Modified: jena/branches/jena-fuseki-new-ui/pages/js/app/views/dataset-selection-list.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/views/dataset-selection-list.js?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/views/dataset-selection-list.js (original)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/views/dataset-selection-list.js Wed Feb
 5 13:01:44 2014
@@ -5,7 +5,7 @@ define(
         fui = require( "fui" ),
         datasetSelectionListTemplate = require( "plugins/text!templates/dataset-selection-list.tpl"
);
 
-    var DatasetSelectionList = Backbone.Marionette.ItemView.extend( {
+    var DatasetSelectionListView = Backbone.Marionette.ItemView.extend( {
       initialize: function(){
 //        _.bindAll(this, "onFilter", "onModelChange");
         this.listenTo( this.model, "change", this.onModelChange, this );
@@ -13,6 +13,8 @@ define(
 
       template: _.template( datasetSelectionListTemplate ),
 
+      el: "#dataset-selection-list",
+
       ui: {
       },
 
@@ -46,6 +48,6 @@ define(
     });
 
 
-    return DatasetSelectionList;
+    return DatasetSelectionListView;
   }
 );

Modified: jena/branches/jena-fuseki-new-ui/pages/query.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/query.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/query.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/query.html Wed Feb  5 13:01:44 2014
@@ -44,6 +44,8 @@
               <li class="admin"><a href="admin-data-management.html"><i class="fa
fa-cogs"></i> administer</a></li>
               <li class="admin"><a href="admin-logs.html"><i class="fa fa-book"></i>
logs</a></li>
               <li class=""><a href="documentation.html"><i class="fa fa-info-circle"></i>
help</a></li>
+            </ul>
+            <ul class="nav navbar-nav navbar-right">
               <li>
                 <div class="dropdown navbar-item">
                   <a data-toggle="dropdown" href="#"><i class="fa fa-chevron-circle-down"></i></a>
@@ -52,14 +54,12 @@
                 </div>
               </li>
               <li>
-                <div class="current-dataset navbar-item"> dataset: <span></span></div>
+                <div class="current-dataset navbar-item"> dataset: <span>testing</span></div>
               </li>
-            </ul>
-            <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>

Modified: jena/branches/jena-fuseki-new-ui/pages/validate.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/validate.html?rev=1564758&r1=1564757&r2=1564758&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/validate.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/validate.html Wed Feb  5 13:01:44 2014
@@ -46,10 +46,10 @@
               <li class=""><a href="documentation.html"><i class="fa fa-info-circle"></i>
help</a></li>
             </ul>
             <ul class="nav navbar-nav navbar-right">
-              <li>
+              <li class="status-indicator">
                 <div>Server<br />status:</div>
               </li>
-              <li>
+              <li class="status-indicator">
                 <a class="" href="admin/server-log.html" id="server-status-light" title="current
server status">
                   <span class="server-up"></span>
                 </a>



Mime
View raw message