jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From i..@apache.org
Subject svn commit: r1604180 - in /jena/Experimental/jena-fuseki2/src/main/webapp: ./ js/app/controllers/ js/app/models/ js/app/templates/
Date Fri, 20 Jun 2014 14:50:36 GMT
Author: ijd
Date: Fri Jun 20 14:50:35 2014
New Revision: 1604180

URL: http://svn.apache.org/r1604180
Log:
Tidy up landing page. Move services list to dataset info tab. Add tab
icons. Show Fuseki version. Connect landing page action buttons to 
appropriate tabs.


Modified:
    jena/Experimental/jena-fuseki2/src/main/webapp/dataset.html
    jena/Experimental/jena-fuseki2/src/main/webapp/documentation.html
    jena/Experimental/jena-fuseki2/src/main/webapp/index.html
    jena/Experimental/jena-fuseki2/src/main/webapp/js/app/controllers/index-controller.js
    jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js
    jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-management.tpl
    jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-selection-list.tpl
    jena/Experimental/jena-fuseki2/src/main/webapp/manage.html
    jena/Experimental/jena-fuseki2/src/main/webapp/services.html

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/dataset.html
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/dataset.html?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/dataset.html (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/dataset.html Fri Jun 20 14:50:35 2014
@@ -46,7 +46,7 @@
               <li class=""><a href="index.html"><i class="fa fa-home"></i></a></li>
               <li class="active"><a href="dataset.html"><i class="fa fa-database"></i>
dataset</a></li>
               <li class=""><a href="manage.html"><i class="fa fa-cogs"></i>
manage datasets</a></li>
-              <li class=""><a href="services.html"><i class="fa fa-dashboard"></i>
services</a></li>
+              <li class=""><a href="services.html"><i class="fa fa-wrench"></i>
services</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">
@@ -76,11 +76,10 @@
         <div class="col-md-12">
           <div class="content-frame">
             <ul class="nav nav-tabs">
-              <li><a href="#query" data-toggle="tab">query</a></li>
-              <li><a href="#upload" data-toggle="tab">upload files</a></li>
-              <li><a href="#edit" data-toggle="tab">edit</a></li>
-              <li><a href="#config" data-toggle="tab">view config</a></li>
-              <li><a href="#stats" data-toggle="tab">stats</a></li>
+              <li><a href="#query" data-toggle="tab"><i class='fa fa-question-circle'></i>
query</a></li>
+              <li><a href="#upload" data-toggle="tab"><i class='fa fa-upload'></i>
upload files</a></li>
+              <li><a href="#edit" data-toggle="tab"><i class='fa fa-edit'></i>
edit</a></li>
+              <li><a href="#info" data-toggle="tab"><i class='fa fa-dashboard'></i>
info</a></li>
             </ul>
 
             <!-- Tab panes -->
@@ -234,19 +233,13 @@
                 </div>
               </div>
 
-              <div class="tab-pane" id="config">
+              <div class="tab-pane" id="info">
                 <div class="no-dataset">Please select a dataset.</div>
                 <div class="with-dataset hidden">
                   config
                 </div>
               </div>
 
-              <div class="tab-pane" id="stats">
-                <div class="no-dataset">Please select a dataset.</div>
-                <div class="with-dataset hidden">
-                  stats
-                </div>
-              </div>
             </div>
           </div>
         </div>

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/documentation.html
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/documentation.html?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/documentation.html (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/documentation.html Fri Jun 20 14:50:35
2014
@@ -39,7 +39,7 @@
               <li class=""><a href="index.html"><i class="fa fa-home"></i></a></li>
               <li class=""><a href="dataset.html"><i class="fa fa-database"></i>
dataset</a></li>
               <li class=""><a href="manage.html"><i class="fa fa-cogs"></i>
manage datasets</a></li>
-              <li class=""><a href="services.html"><i class="fa fa-dashboard"></i>
services</a></li>
+              <li class=""><a href="services.html"><i class="fa fa-wrench"></i>
services</a></li>
               <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">

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/index.html?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/index.html (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/index.html Fri Jun 20 14:50:35 2014
@@ -41,7 +41,7 @@
               <li class="active"><a href="index.html"><i class="fa fa-home"></i></a></li>
               <li class=""><a href="dataset.html"><i class="fa fa-database"></i>
dataset</a></li>
               <li class=""><a href="manage.html"><i class="fa fa-cogs"></i>
manage datasets</a></li>
-              <li class=""><a href="service.html"><i class="fa fa-dashboard"></i>
services</a></li>
+              <li class=""><a href="service.html"><i class="fa fa-wrench"></i>
services</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">
@@ -62,14 +62,14 @@
     <div class="container">
       <div class="row">
         <div class="col-md-12">
-          <h1 class="text-center">Apache Jena Fuseki <small>version <span
class='host-details'>TODO</span></small></h1>
+          <h1 class="text-center">Apache Jena Fuseki <small>version <span
class='host-details text-muted'></span></small></h1>
         </div>
       </div>
 
       <div class="row current-datasets">
         <div class="col-md-12">
           <h2>
-            Existing datasets
+            Datasets on this server
           </h2>
           <div id="dataset-selection-list"></div>
         </div>

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/controllers/index-controller.js
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/controllers/index-controller.js?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/controllers/index-controller.js
(original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/controllers/index-controller.js
Fri Jun 20 14:50:35 2014
@@ -13,13 +13,20 @@ define(
 
     // add the behaviours defined on the controller
     _.extend( IndexController.prototype, {
+
       initEvents: function() {
         _.bindAll( this, "onServerModelReady" );
         fui.vent.on( "models.fuseki-server.ready", this.onServerModelReady );
       },
 
-      onServerModelReady: function( event ) {
+      onServerModelReady: function() {
         new DatasetSelectionListView( {model: fui.models.fusekiServer} ).render();
+        this.displayVersion();
+      },
+
+      /** Display the fuseki software version */
+      displayVersion: function() {
+        $('.host-details').html( fui.models.fusekiServer.get( "version" ) );
       }
 
     } );

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js Fri Jun
20 14:50:35 2014
@@ -67,11 +67,11 @@ define(
       loadServerDescription: function() {
         var self = this;
         return this.getJSON( "/$/server" ).done( function( data ) {
-                                                  self.saveServerDescription( data );
-                                                } )
-                                         .then( function() {
-                                                  fui.vent.trigger( "models.fuseki-server.ready"
);
-                                                });
+                                                   self.saveServerDescription( data );
+                                                 } )
+                                          .then( function() {
+                                                   fui.vent.trigger( "models.fuseki-server.ready"
);
+                                                 });
       },
 
       /** Store the server description in this model */
@@ -100,7 +100,12 @@ define(
             return 0;
         } );
 
-        this.set( {server: serverDesc.server, datasets: datasets, ready: true} );
+        this.set( {
+          server: serverDesc.server,
+          datasets: datasets,
+          ready: true,
+          version: serverDesc.version
+        } );
       },
 
       /**

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-management.tpl
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-management.tpl?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-management.tpl
(original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-management.tpl
Fri Jun 20 14:50:35 2014
@@ -17,7 +17,7 @@
               <div>
                 <a class="btn btn-sm action remove btn-primary" data-ds-id='<%= ds.name()
%>'><i class='fa fa-times-circle'></i> remove</a>
                 <a class="btn btn-sm action backup btn-primary" data-ds-id='<%= ds.name()
%>'><i class='fa fa-download'></i> backup</a>
-                <a class="btn btn-sm action add-data btn-primary" href="dataset.html?tab=upload&ds=<%=
ds.name() %>"><i class='fa fa-plus-circle'></i> add data</a>
+                <a class="btn btn-sm action add-data btn-primary" href="dataset.html?tab=upload&ds=<%=
ds.name() %>"><i class='fa fa-upload'></i> upload data</a>
               </div>
               <div class="action feedback"></a>
             </td>

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-selection-list.tpl
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-selection-list.tpl?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-selection-list.tpl
(original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/js/app/templates/dataset-selection-list.tpl
Fri Jun 20 14:50:35 2014
@@ -1,31 +1,22 @@
 <div class="col-md-span-12">
   <% if (datasets.length > 0) { %>
     <table class='table ijd'>
-      <tr class="headings"><th>Name</th><th>Services</th><th></th></tr>
+      <tr class="headings"><th>dataset name</th><th>actions</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="upload.html?ds=<%=
ds.name() %>"><i class='fa fa-plus-circle'></i> add data</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-stats.html?ds=<%=
ds.name() %>"><i class='fa fa-dashboard'></i> stats</a>
+            <a class="btn btn-sm action remove btn-primary" href="dataset.html?tab=query&ds=<%=
ds.name() %>"><i class='fa fa-question-circle'></i> query</a>
+            <a class="btn btn-sm action remove btn-primary" href="dataset.html?tab=upload&ds=<%=
ds.name() %>"><i class='fa fa-upload'></i> add data</a>
+            <a class="btn btn-sm action configure btn-primary" href="dataset.html?tab=info&ds=<%=
ds.name() %>"><i class='fa fa-dashboard'></i> info</a>
           </td>
         </tr>
       <% }) %>
 
     </table>
    <% } else { %>
-    <p>There are no datasets on this server yet. <a href="#">Add one.</a></p>
+    <p>There are no datasets on this server yet. <a href="manage.html?tab=new-dataset">Add
one.</a></p>
    <% } %>
 </div>

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/manage.html
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/manage.html?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/manage.html (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/manage.html Fri Jun 20 14:50:35 2014
@@ -41,7 +41,7 @@
               <li class=""><a href="index.html"><i class="fa fa-home"></i></a></li>
               <li class=""><a href="dataset.html"><i class="fa fa-database"></i>
dataset</a></li>
               <li class="active"><a href="manage.html"><i class="fa fa-cogs"></i>
manage datasets</a></li>
-              <li class=""><a href="services.html"><i class="fa fa-dashboard"></i>
services</a></li>
+              <li class=""><a href="services.html"><i class="fa fa-wrench"></i>
services</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">
@@ -82,8 +82,8 @@
         <div class="col-md-12">
           <div class="content-frame">
             <ul class="nav nav-tabs">
-              <li><a href="#datasets" data-toggle="tab">existing datasets</a></li>
-              <li><a href="#new-dataset" data-toggle="tab">add new dataset</a></li>
+              <li><a href="#datasets" data-toggle="tab"><i class='fa fa-database'></i>
existing datasets</a></li>
+              <li><a href="#new-dataset" data-toggle="tab"><i class='fa fa-plus-circle'></i>
add new dataset</a></li>
             </ul>
 
             <!-- Tab panes -->

Modified: jena/Experimental/jena-fuseki2/src/main/webapp/services.html
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/services.html?rev=1604180&r1=1604179&r2=1604180&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/services.html (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/services.html Fri Jun 20 14:50:35 2014
@@ -41,7 +41,7 @@
               <li class=""><a href="index.html"><i class="fa fa-home"></i></a></li>
               <li class=""><a href="dataset.html"><i class="fa fa-database"></i>
dataset</a></li>
               <li class=""><a href="manage.html"><i class="fa fa-cogs"></i>
manage datasets</a></li>
-              <li class="active"><a href="services.html"><i class="fa fa-dashboard"></i>
services</a></li>
+              <li class="active"><a href="services.html"><i class="fa fa-wrench"></i>
services</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">



Mime
View raw message