You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ij...@apache.org on 2014/01/21 13:06:58 UTC
svn commit: r1559995 - in /jena/branches/jena-fuseki-new-ui/pages: ./ admin/
js/app/ js/app/controllers/ js/app/templates/ js/app/views/
Author: ijd
Date: Tue Jan 21 12:06:57 2014
New Revision: 1559995
URL: http://svn.apache.org/r1559995
Log:
Simplified page hierarchy by removing /admin folder. Added skeleton of dataset management page
Added:
jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html
- copied, changed from r1559835, jena/branches/jena-fuseki-new-ui/pages/admin/data-management.html
jena/branches/jena-fuseki-new-ui/pages/admin-dataset-details.html
- copied unchanged from r1559835, jena/branches/jena-fuseki-new-ui/pages/admin/dataset-details.html
jena/branches/jena-fuseki-new-ui/pages/admin-logs.html
- copied, changed from r1559835, jena/branches/jena-fuseki-new-ui/pages/admin/logs.html
jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/data-management-controller.js (with props)
jena/branches/jena-fuseki-new-ui/pages/js/app/main.data-management.js (with props)
jena/branches/jena-fuseki-new-ui/pages/js/app/templates/data-management.tpl
jena/branches/jena-fuseki-new-ui/pages/js/app/views/data-management.js (with props)
Removed:
jena/branches/jena-fuseki-new-ui/pages/admin/
Modified:
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/query-controller.js
jena/branches/jena-fuseki-new-ui/pages/query.html
jena/branches/jena-fuseki-new-ui/pages/validation.html
Copied: jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html (from r1559835, 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?p2=jena/branches/jena-fuseki-new-ui/pages/admin-data-management.html&p1=jena/branches/jena-fuseki-new-ui/pages/admin/data-management.html&r1=1559835&r2=1559995&rev=1559995&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 Tue Jan 21 12:06:57 2014
@@ -3,16 +3,18 @@
<head>
<title>Apache Jena Fuseki</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
- <link href="../css/bootstrap.min.css" rel="stylesheet" media="screen">
- <link href="../css/font-awesome.min.css" rel="stylesheet" media="screen">
- <link href="../css/codemirror.css" rel="stylesheet" media="screen">
- <link href="../css/qonsole.css" rel="stylesheet" media="screen">
- <link href="../css/jquery.dataTables.css" rel="stylesheet" media="screen">
- <link href="../css/fui.css" rel="stylesheet" media="screen">
+ <link href="css/bootstrap.min.css" rel="stylesheet" media="screen">
+ <link href="css/font-awesome.min.css" rel="stylesheet" media="screen">
+ <link href="css/codemirror.css" rel="stylesheet" media="screen">
+ <link href="css/qonsole.css" rel="stylesheet" media="screen">
+ <link href="css/jquery.dataTables.css" rel="stylesheet" media="screen">
+ <link href="css/fui.css" rel="stylesheet" media="screen">
+
+ <script data-main="js/app/main.data-management.js" src="js/lib/require.min.js"></script>
<!--[if lt IE 9]>
- <script src="../js/lib/html5shiv.js"></script>
- <script src="../js/lib/respond.min.js"></script>
+ <script src="js/lib/html5shiv.js"></script>
+ <script src="js/lib/respond.min.js"></script>
<![endif]-->
</head>
<body>
@@ -36,9 +38,12 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
- <li class=""><a href="index.html">Current status</a></li>
- <li class="active"><a href="data-management.html">Data management</a></li>
- <li class=""><a href="logs.html">Logs</a></li>
+ <li class=""><a href="index.html">Home</a></li>
+ <li class=""><a href="query.html">Query</a></li>
+ <li class=""><a href="validation.html">Validation</a></li>
+ <li class="admin active"><a href="admin-data-management.html">Dataset administration</a></li>
+ <li class="admin"><a href="admin-logs.html">Logs</a></li>
+ <li class=""><a href="documentation.html">Documentation</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
@@ -55,19 +60,11 @@
<div class="container">
<div class="row">
- <h1>Data management</h1>
+ <h1>Administer datasets</h1>
</div>
- <hr/>
- <p>Focus on one database</p>
- <ul>
- <li>Statistics</li>
- <li>Backup</li>
- <li>Online/offline</li>
- <li><em>Delete</em></li>
- </ul>
- <hr/>
-
+ <div id="data-management"></div>
+<!--
<div class="row">
<h2>Create database</h2>
<small>
@@ -75,7 +72,7 @@
<p>Some Alternatives:</p>
<ul>
<li><p>Preset recipes (as below) that the server expands</p></li>
- <li><p>Have a template area (assembler) in broswer with help to
+ <li><p>Have a template area (assembler) in broswer with help to
fill details like</p></li>
</ul>
</small>
@@ -105,7 +102,7 @@
</form>
<hr/>
<h2>Create database (from Assembler Description)</h2>
- <!-- From assembler -->
+ <!-- From assembler - ->
<form action="../$/datasets" enctype="multipart/form-data" method="post" role="form">
<div class="form-group">
Database assembler description file: <input type="file" name="UNSET" size="40"><br/>
@@ -126,7 +123,7 @@
<h2>Backup Database</h2>
</div>
-<p> <li><p>Have a template area (assembler) in broswer with help to
+<p> <li><p>Have a template area (assembler) in broswer with help to
fill details like</p></li>
<div class="row">
<h2>Delete Database</h2>
Copied: jena/branches/jena-fuseki-new-ui/pages/admin-logs.html (from r1559835, 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?p2=jena/branches/jena-fuseki-new-ui/pages/admin-logs.html&p1=jena/branches/jena-fuseki-new-ui/pages/admin/logs.html&r1=1559835&r2=1559995&rev=1559995&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/admin/logs.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/admin-logs.html Tue Jan 21 12:06:57 2014
@@ -36,9 +36,12 @@
<!-- Collect the nav links, forms, and other content for toggling -->
<div class="collapse navbar-collapse navbar-ex1-collapse">
<ul class="nav navbar-nav">
- <li class=""><a href="index.html">Current status</a></li>
- <li class=""><a href="data-management.html">Data management</a></li>
- <li class="active"><a href="logs.html">Logs</a></li>
+ <li class=""><a href="index.html">Home</a></li>
+ <li class=""><a href="query.html">Query</a></li>
+ <li class=""><a href="validation.html">Validation</a></li>
+ <li class="admin"><a href="admin-data-management.html">Dataset administration</a></li>
+ <li class="admin active"><a href="admin-logs.html">Logs</a></li>
+ <li class=""><a href="documentation.html">Documentation</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
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=1559995&r1=1559994&r2=1559995&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/documentation.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/documentation.html Tue Jan 21 12:06:57 2014
@@ -38,8 +38,9 @@
<ul class="nav navbar-nav">
<li class=""><a href="index.html">Home</a></li>
<li class=""><a href="query.html">Query</a></li>
- <li class="admin"><a href="admin/index.html">Administration</a></li>
- <li><a href="validation.html">Validation</a></li>
+ <li class=""><a href="validation.html">Validation</a></li>
+ <li class="admin"><a href="admin-data-management.html">Dataset administration</a></li>
+ <li class="admin"><a href="admin-logs.html">Logs</a></li>
<li class="active"><a href="documentation.html">Documentation</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
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=1559995&r1=1559994&r2=1559995&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/index.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/index.html Tue Jan 21 12:06:57 2014
@@ -40,9 +40,10 @@
<ul class="nav navbar-nav">
<li class="active"><a href="index.html">Home</a></li>
<li class=""><a href="query.html">Query</a></li>
- <li class="admin"><a href="admin/index.html">Administration</a></li>
- <li><a href="validation.html">Validation</a></li>
- <li><a href="documentation.html">Documentation</a></li>
+ <li class=""><a href="validation.html">Validation</a></li>
+ <li class="admin"><a href="admin-data-management.html">Dataset administration</a></li>
+ <li class="admin"><a href="admin-logs.html">Logs</a></li>
+ <li class=""><a href="documentation.html">Documentation</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
Added: jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/data-management-controller.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/data-management-controller.js?rev=1559995&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/data-management-controller.js (added)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/data-management-controller.js Tue Jan 21 12:06:57 2014
@@ -0,0 +1,30 @@
+/** Controller for the admin/data-management.html page */
+define(
+ function( require ) {
+ var Marionette = require( "marionette" ),
+ Backbone = require( "backbone" ),
+ _ = require( "underscore" ),
+ fui = require( "fui" ),
+ DataManagementView = require( "views/data-management" );
+
+ var DataManagementController = function() {
+ this.initEvents();
+ };
+
+ // add the behaviours defined on the controller
+ _.extend( DataManagementController.prototype, {
+ initEvents: function() {
+ _.bindAll( this, "onServerModelReady" );
+ fui.vent.on( "models.fuseki-server.ready", this.onServerModelReady );
+ },
+
+ /** When the fuseki server is ready, we can list the initial datasets */
+ onServerModelReady: function( event ) {
+ new DataManagementView( {model: fui.models.fusekiServer} ).render();
+ }
+
+ } );
+
+ return DataManagementController;
+ }
+);
Propchange: jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/data-management-controller.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js?rev=1559995&r1=1559994&r2=1559995&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js (original)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js Tue Jan 21 12:06:57 2014
@@ -7,7 +7,7 @@ define(
fui = require( "fui" ),
qonsole = require( "lib/qonsole" );
- var ValidationController = function() {
+ var QueryController = function() {
this.initEvents();
};
@@ -41,6 +41,6 @@ define(
} );
- return ValidationController;
+ return QueryController;
}
);
Added: jena/branches/jena-fuseki-new-ui/pages/js/app/main.data-management.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/main.data-management.js?rev=1559995&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/main.data-management.js (added)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/main.data-management.js Tue Jan 21 12:06:57 2014
@@ -0,0 +1,28 @@
+
+define( ['require', '../common-config'],
+ function( require ) {
+ require(
+ ['underscore', 'jquery', 'backbone', 'marionette', 'fui', 'controllers/data-management-controller',
+ 'sprintf', 'bootstrap',
+ 'models/fuseki-server', 'models/dataset',
+ 'views/data-management',
+ 'services/ping-service',
+ 'lib/jquery.xdomainrequest'
+ ],
+ function( _, $, Backbone, Marionette, fui, DataManagementController ) {
+
+ // TODO: these variables need to be set dynamically based on the current server config
+ var options = {
+ serverPort: 3030,
+ managementPort: 3131
+ };
+
+ // initialise the backbone application
+ fui.controllers.dataManagementController = new DataManagementController();
+ fui.start( options );
+
+ // additional services
+ require( 'services/ping-service' ).start();
+ });
+ }
+);
Propchange: jena/branches/jena-fuseki-new-ui/pages/js/app/main.data-management.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added: jena/branches/jena-fuseki-new-ui/pages/js/app/templates/data-management.tpl
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/templates/data-management.tpl?rev=1559995&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/templates/data-management.tpl (added)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/templates/data-management.tpl Tue Jan 21 12:06:57 2014
@@ -0,0 +1,28 @@
+<div class="row">
+ <div class="col-md-span-12">
+ <table class='table'>
+ <tr class="headings"><th>Active?</th><th>Name</th><th>Actions</th></tr>
+ <% _.each( datasets, function( ds ) { %>
+ <tr>
+ <td><input type='checkbox' class='checkbox' checked /></td>
+ <td>
+ <%= ds.name() %>
+ </td>
+ <td>
+ <a class="btn btn-sm action remove btn-primary" data-uri='<%= ds.mgmtURL() %>'><i class='fa fa-times-circle'></i> remove</a>
+ <a class="btn btn-sm action backup btn-primary" data-uri='<%= ds.mgmtURL() %>'><i class='fa fa-download'></i> backup</a>
+ <a class="btn btn-sm action configure btn-primary" data-uri='<%= ds.mgmtURL() %>'><i class='fa fa-wrench'></i> configure</a>
+ <a class="btn btn-sm action add-data btn-primary" data-uri='<%= ds.mgmtURL() %>'><i class='fa fa-plus-circle'></i> add data</a>
+ </td>
+ </tr>
+ <% }) %>
+
+ </table>
+ </div>
+</div>
+<div class="row">
+ <div class="col-md-3 col-md-offset-9">
+ <a href="#" class="btn btn-sm btn-primary pull-right"><i class="fa fa-plus-circle"></i> add new dataset</a>
+ </div>
+
+</div>
\ No newline at end of file
Added: jena/branches/jena-fuseki-new-ui/pages/js/app/views/data-management.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/views/data-management.js?rev=1559995&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/views/data-management.js (added)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/views/data-management.js Tue Jan 21 12:06:57 2014
@@ -0,0 +1,39 @@
+define(
+ function( require ) {
+ var Backbone = require( "backbone" ),
+ _ = require( "underscore" ),
+ fui = require( "fui" ),
+ dataManagementViewTpl = require( "plugins/text!templates/data-management.tpl" );
+
+ var DataManagementView = Backbone.Marionette.ItemView.extend( {
+ initialize: function(){
+ this.listenTo( this.model, "change", this.onModelChange, this );
+ },
+
+ template: _.template( dataManagementViewTpl ),
+
+ ui: {
+ },
+
+ el: "#data-management",
+
+ events: {
+// "change #independent-variable-selection": "selectVariable",
+// "click a.action.filter": "onFilter"
+ },
+
+ templateHelpers: {
+ },
+
+
+ /** If the model changes, update the summary */
+ onModelChange: function( event ) {
+// this.ui.summary.html( this.model.independentVar().component.range().summarise() );
+ }
+
+ });
+
+
+ return DataManagementView;
+ }
+);
Propchange: jena/branches/jena-fuseki-new-ui/pages/js/app/views/data-management.js
------------------------------------------------------------------------------
svn:mime-type = text/plain
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=1559995&r1=1559994&r2=1559995&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/query.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/query.html Tue Jan 21 12:06:57 2014
@@ -40,9 +40,10 @@
<ul class="nav navbar-nav">
<li class=""><a href="index.html">Home</a></li>
<li class="active"><a href="query.html">Query</a></li>
- <li class="admin"><a href="admin/index.html">Administration</a></li>
- <li><a href="validation.html">Validation</a></li>
- <li><a href="documentation.html">Documentation</a></li>
+ <li class=""><a href="validation.html">Validation</a></li>
+ <li class="admin"><a href="admin-data-management.html">Dataset administration</a></li>
+ <li class="admin"><a href="admin-logs.html">Logs</a></li>
+ <li class=""><a href="documentation.html">Documentation</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>
Modified: jena/branches/jena-fuseki-new-ui/pages/validation.html
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/validation.html?rev=1559995&r1=1559994&r2=1559995&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/validation.html (original)
+++ jena/branches/jena-fuseki-new-ui/pages/validation.html Tue Jan 21 12:06:57 2014
@@ -40,9 +40,10 @@
<ul class="nav navbar-nav">
<li class=""><a href="index.html">Home</a></li>
<li class=""><a href="query.html">Query</a></li>
- <li class="admin"><a href="admin/index.html">Administration</a></li>
<li class="active"><a href="validation.html">Validation</a></li>
- <li><a href="documentation.html">Documentation</a></li>
+ <li class="admin"><a href="admin-data-management.html">Dataset administration</a></li>
+ <li class="admin"><a href="admin-logs.html">Logs</a></li>
+ <li class=""><a href="documentation.html">Documentation</a></li>
</ul>
<ul class="nav navbar-nav navbar-right">
<li>