You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by tk...@apache.org on 2013/05/16 16:35:45 UTC
git commit: added new template to configuration page (as a sample for
further development)
Updated Branches:
refs/heads/MARMOTTA-228 5a0ba66fc -> cbd4caaa7
added new template to configuration page (as a sample for further development)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/cbd4caaa
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/cbd4caaa
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/cbd4caaa
Branch: refs/heads/MARMOTTA-228
Commit: cbd4caaa7aafe891533bee01ef080c49bfd557a1
Parents: 5a0ba66
Author: tkurz <tk...@apache.org>
Authored: Thu May 16 16:34:51 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu May 16 16:34:51 2013 +0200
----------------------------------------------------------------------
.../js/widgets/configurator/configurator.coffee | 58 ++++++++------
.../src/main/resources/templates/admin.ftl | 5 +-
.../src/main/resources/web/admin/about.html | 13 +++-
.../main/resources/web/admin/configuration.html | 43 +++++++----
.../resources/web/admin/js/widgets/database.js | 20 +++---
5 files changed, 84 insertions(+), 55 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/cbd4caaa/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee b/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
index ffd54b7..c6ecd17 100644
--- a/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
+++ b/platform/marmotta-core/src/main/coffeescript/web/public/js/widgets/configurator/configurator.coffee
@@ -89,7 +89,7 @@ class Property
@comment = value.comment
mapping = value.type.match(/\((.+)\)/)
@options = mapping[1] if mapping && mapping[1]
- @tdtitle = "<td class='config_tdtitle'><h3>#{@key}</h2><span>#{@comment}</span></td>"
+ @tdtitle = "<td class='config_tdtitle'><h4>#{@key}</h4><small>#{@comment}</small></td>"
setValue:(@value)->
@@ -145,7 +145,7 @@ class EnumProperty extends Property
constructor:(@key,value,@comment)->
super(@key,value,@comment)
@td = $("<td></td>")
- @select = $("<select></select>").addClass("config_selectfield").appendTo @td
+ @select = $("<select></select>").appendTo @td
values = value.type.substring(15,value.type.length-1).split "|"
for index,value of values
@select.append $("<option>"+value.substring(1,value.length-1)+"</option>")
@@ -169,7 +169,7 @@ class EnumProperty extends Property
class IntegerProperty extends Property
constructor:(@key,value,@comment)->
super(@key,value,@comment)
- @input = $("<input >").addClass "config_intergerfield_short"
+ @input = $("<input type='text'>")
@field = $("<div></div>").append @input
values = []
@@ -197,7 +197,7 @@ class IntegerProperty extends Property
@onchange @
- up = $("<button>+</button>").mousedown =>
+ up = $("<button class='btn'>+</button>").mousedown =>
interval = setInterval(up_func,100)
.mouseup =>
clearInterval interval
@@ -213,7 +213,7 @@ class IntegerProperty extends Property
@input.val(parseInt(@input.val())-step)
@onchange @
- down = $("<button>-</button>").mousedown =>
+ down = $("<button class='btn'>-</button>").mousedown =>
interval = setInterval(down_func,100)
.mouseup =>
clearInterval interval
@@ -222,7 +222,7 @@ class IntegerProperty extends Property
@field.append(down).append(up)
else
- @input.removeClass("config_intergerfield_short").addClass("config_intergerfield")
+ @input.removeClass("config_intergerfield_short")
@input.keydown ()=>
@onchange @
@@ -245,7 +245,7 @@ class IntegerProperty extends Property
class StringProperty extends Property
constructor:(@key,value,@comment)->
super(@key,value,@comment)
- @input = $('<input>').addClass "config_inputfield"
+ @input = $('<input type="text">').addClass("span6")
@field = $("<div></div>").append @input
# clean lists
@@ -256,7 +256,7 @@ class StringProperty extends Property
match = value.type.match /".+"/
if match and match[0] == "\"password\""
@input.css "display","none"
- @button = $("<button>edit</button>").click =>
+ @button = $("<button class='btn'>edit</button>").click =>
if prompt("insert old password","")==@value
val = prompt "insert new password",""
if val != ""
@@ -299,7 +299,7 @@ class URIProperty extends StringProperty
class TextProperty extends Property
constructor:(@key,value,@comment)->
super(@key,value,@comment)
- @input = $('<textarea>').addClass "config_textfield"
+ @input = $('<textarea>')
@input.keydown =>
@onchange @
@@ -320,7 +320,6 @@ class TextProperty extends Property
class ProgramProperty extends TextProperty
constructor:(@key,value,@comment)->
super(@key,value,@comment)
- @input.addClass "config_solrprorgamfield"
@input.attr "readonly","readonly"
@input.unbind "keydown"
@input.keydown ->
@@ -339,13 +338,20 @@ class ListProperty extends StringProperty
class AddValue
constructor:(container,@prefix,@blacklist,@url)->
@container = $("#"+container)
- @background = $('<div style="display:none"></div>').css({display:'none'}).addClass('config_background').appendTo 'body'
+ @background = $('<div style="display:none"></div>').css({display:'none'}).addClass('modal-backdrop').addClass('modal-backdrop.fade.in').appendTo 'body'
prefix_span = if prefix == undefined then '' else '<span>'+prefix+'.</span>'
@popup = $("
- <div id='config_popup' style='display:none'>
- <h1>Add new value</h1>
- <table>
- <tr><td>Key</td><td>#{prefix_span}<input type='text' id='config_add_label'/></td></tr>
+ <div id='config_popup' class='modal' style='display:none'>
+ <div class='modal-header'>
+ <h3>Add new value</h3>
+ </div>
+ <div class='modal-body'>
+ <table class='table'>
+ <tr><td>Key</td><td>
+ <div class='input-prepend'>
+ <span class='add-on'>#{prefix_span}</span><input class='span2' type='text' id='config_add_label'/>
+
+ </td></tr>
<tr><td>Type</td><td><select id='config_add_type'>
<option value='java.lang.String'>String</option>
<option value='java.lang.Integer'>Integer</option>
@@ -358,7 +364,7 @@ class AddValue
<tr><td>Value</td><td><input type='text' id='config_add_value'/></td></tr>
<tr><td>Comment</td><td><textarea cols='20' rows='3' type='text' id='config_add_comment'/></td></tr>
</table>
- </div>
+ </div></div>
").appendTo 'body'
@popup.find('#config_add_type').change =>
ps = @popup.find('#config_add_parameters')
@@ -367,7 +373,7 @@ class AddValue
when 'java.lang.Enum' then ps.val('"one 1"|"two 2"')
else ps.val("")
- @button = $("<button></button>").css({margin:"0px auto",display:"block",marginBottom:"40px"}).text('Add Value').click =>
+ @button = $("<button class='btn btn-primary'></button>").css({margin:"0px auto",display:"block",marginBottom:"40px"}).text('Add Value').click =>
@open()
@container.append @button
@@ -378,14 +384,14 @@ class AddValue
@popup.find('#config_add_value').val ''
@popup.find('#config_add_comment').val ''
- buttons = $("<div id='config_add_buttons'></div>").appendTo @popup
+ buttons = $("<div id='config_add_buttons' class='modal-footer'></div>").appendTo @popup
- buttons.append $('<button></button>').text('cancel').click =>
+ buttons.append $('<button class="btn"></button>').text('cancel').click =>
@popup.hide()
@background.hide()
clean()
- buttons.append $('<button></button>').text('add').click =>
+ buttons.append $('<button class="btn btn-primary"></button>').text('add').click =>
# store data
label = @popup.find('#config_add_label').val()
type = @popup.find('#config_add_type').val()
@@ -440,7 +446,7 @@ class DataTable
constructor:(container)->
@container = $("#"+container)
- @saver = $("<div>SAVE</div>").addClass("config_saveButton").css("display","none");
+ @saver = $("<div class='btn btn-danger' style='position: fixed;top: 90px;right: 20px;z-index: 2000;'>SAVE CONFIGURATION</div>").css("display","none");
draw:(model,client)->
@container.html "<h2>Configurator:</h2>"
@@ -452,7 +458,9 @@ class DataTable
0
model.properties.sort sortFunction
- @table = $("<table></table>").addClass("config_datatable").appendTo @container
+ @table = $("<table></table>").addClass("table").addClass("table-bordered").addClass("table-striped").appendTo @container
+
+ @table.append($("<colgroup></colgroup>").append("<col class='span2'>").append("<col class='span5'>").append("<col class='span1'>"));
filter = (key)=>
regex = new RegExp ".*"+key+".*"
@@ -462,13 +470,13 @@ class DataTable
else
row.hide()
- filter_input = $("<input>").addClass("config_filterinput").keyup ()->
+ filter_input = $("<input type='text' class='span3'>").keyup ()->
filter filter_input.val()
- $("<tr></tr>").append($("<td style='text-align:center' colspan='3'></td>").append("<span style='font-weight:bold;'>Filter: </span>").append(filter_input)).appendTo(@table)
+ $("<tr></tr>").append($("<td style='text-align:center' colspan='3'></td>").append($("<div class='input-prepend'>").append("<span class='add-on'>Filter</span>").append(filter_input))).appendTo(@table)
remover = (val)->
- button = $("<button>remove</button>").click =>
+ button = $("<button class='btn btn btn-warning'>remove</button>").click =>
client.delete val.key
$("<td></td>").append button
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/cbd4caaa/platform/marmotta-core/src/main/resources/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/admin.ftl b/platform/marmotta-core/src/main/resources/templates/admin.ftl
index e524a05..682f574 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -5,7 +5,7 @@
<title>Aapche Marmotta</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<link href="${SERVER_URL}core/public/img/icon/lmf.ico" rel="SHORTCUT ICON">
-
+ <script src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
<!-- JS -->
<script type="text/javascript">
var _BASIC_URL = "${BASIC_URL}";
@@ -117,7 +117,7 @@
data-toggle="dropdown"
href="#">
More
- <b class="caret"></b>
+ <b class="caret"></b> ???
</a>
<ul class="dropdown-menu">
<li><a href="#">System</a></li>
@@ -188,7 +188,6 @@
<!-- Le javascript
================================================== -->
<!-- Placed at the end of the document so the pages load faster -->
-<script src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js"></script>
<script src="${SERVER_URL}ext/bootstrap/js/bootstrap.js"></script>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/cbd4caaa/platform/marmotta-core/src/main/resources/web/admin/about.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/about.html b/platform/marmotta-core/src/main/resources/web/admin/about.html
index 743a39e..3502960 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/about.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/about.html
@@ -25,12 +25,19 @@
</head>
<body>
<!--###BEGIN_CONTENT###-->
+<div class="span12">
+ <div class="hero-unit">
+
<h1>Apache Marmotta</h1>
<h2>
An Open Platform for Linked Data
</h2>
-<p>The goal of Apache Marmotta is to provide an open implementation of a Linked Data Platform that can be used, extended, and deployed easily by organizations who want to publish Linked Data or build custom applications on Linked Data.</p>
-<p>You can find more information about the project and the supported features on <a href="http://marmotta.incubator.apache.org/">http://marmotta.incubator.apache.org</a>.</p>
+ <p>The goal of Apache Marmotta is to provide an open implementation of a Linked Data Platform that can be used, extended, and deployed easily by organizations who want to publish Linked Data or build custom applications on Linked Data.</p>
+ <p>You can find more information about the project and the supported features on <a href="http://marmotta.incubator.apache.org/">http://marmotta.incubator.apache.org</a>.</p>
+ </div>
+ </div>
+<div class="span12">
+ <div class="unit">
<h2>
Links to common features
</h2>
@@ -56,6 +63,8 @@
<dt>User</dt> <dd>provides the user management features.</dd>
<dt>Versioning</dt> <dd>offers versioning services on top of the triple store.</dd>
</dl>
+ </div>
+ </div>
<!--###END_CONTENT###-->
</body>
</html>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/cbd4caaa/platform/marmotta-core/src/main/resources/web/admin/configuration.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/configuration.html b/platform/marmotta-core/src/main/resources/web/admin/configuration.html
index 928a336..9987c85 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/configuration.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/configuration.html
@@ -21,8 +21,6 @@
<head>
<!--###BEGIN_HEAD###-->
<title>Core Module Configuration</title>
- <link type="text/css" rel="stylesheet" href="../public/js/widgets/configurator/style.css">
- <script type="text/javascript" src="../public/js/lib/jquery-1.7.2.js"></script>
<script type="text/javascript" src="../public/js/widgets/configurator/configurator.js"></script>
<script type="text/javascript" src="js/widgets/database.js"></script>
<script type="text/javascript">
@@ -42,21 +40,36 @@
<div id="main">
<div id="contents">
<!--###BEGIN_CONTENT###-->
-<h1>Marmotta Core Configuration</h1>
- <p>
- Here you can configure the Marmotta Core.<br/>
- The configuration contains:
- </p>
- <ul>
- <li><a href="#generic">Generic Parameter Configuration</a></li>
- <li><a href="#database">Database Configuration</a></li>
- </ul>
- <div id="lmf_configurator">
- <h4>Loading configurator</h4>
+ <div class="span12">
+ <div class="hero-unit">
+ <h1>Marmotta Core Configuration</h1>
+
+ <p>
+ Here you can configure the Marmotta Core.<br/>
+ The configuration contains:
+ </p>
+ <ul>
+ <li><a href="#generic">Generic Parameter Configuration</a></li>
+ <li><a href="#database">Database Configuration</a></li>
+ </ul>
+
+ </div>
+ </div>
+ <div class="span12">
+ <div class="unit">
+
+ <div id="lmf_configurator">
+ <h4>Loading configurator</h4>
+ </div>
</div>
- <div id="lmf_database">
- <h4>Loading database manager</h4>
+ </div>
+ <div class="span12">
+ <div class="unit">
+ <div id="lmf_database">
+ <h4>Loading database manager</h4>
+ </div>
</div>
+ </div>
<!--###END_CONTENT###-->
</div>
</div>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/cbd4caaa/platform/marmotta-core/src/main/resources/web/admin/js/widgets/database.js
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/js/widgets/database.js b/platform/marmotta-core/src/main/resources/web/admin/js/widgets/database.js
index 43a1391..65c9ff0 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/js/widgets/database.js
+++ b/platform/marmotta-core/src/main/resources/web/admin/js/widgets/database.js
@@ -22,7 +22,7 @@
anker_name: 'database',
title: 'Database Configuration',
loading_img: '../public/img/loader/ajax-loader_small.gif',
- toplink:true
+ toplink:false
}
//jquery elements
@@ -43,7 +43,7 @@
var tr1 = $("<tr/>");
var td11 = $("<td/>").css({"font-weight":"bold"}).text("Database: ");
var td12 = $("<td/>");
- this.input_fields.db_select = $("<select/>").css({'width':'200px'});
+ this.input_fields.db_select = $("<select/>").addClass("span9");
for (value in databases) {
this.input_fields.db_select.append("<option>" + databases[value] + "</option>");
}
@@ -59,7 +59,7 @@
var tr2 = $("<tr/>");
var td21 = $("<td/>").css({"font-weight":"bold"}).text("Host: ");
var td22 = $("<td/>");
- this.input_fields.db_host = $("<input type='text' style='width:100%'/>");
+ this.input_fields.db_host = $("<input type='text' class='span9'/>");
this.input_fields.db_host.val(values["database.url"]);
td22.append(this.input_fields.db_host);
td21.appendTo(tr2);
@@ -70,7 +70,7 @@
var tr3 = $("<tr/>");
var td31 = $("<td/>").css({"font-weight":"bold"}).text("User: ");
var td32 = $("<td/>");
- this.input_fields.db_user = $("<input type='text' style='width:100%'/>");
+ this.input_fields.db_user = $("<input type='text' class='span9'/>");
this.input_fields.db_user.val(values["database.user"]);
td32.append(this.input_fields.db_user);
td31.appendTo(tr3);
@@ -81,7 +81,7 @@
var tr4 = $("<tr/>");
var td41 = $("<td/>").css({"font-weight":"bold"}).text("Password: ");
var td42 = $("<td/>");
- this.input_fields.db_pass = $("<input type='password' style='width:100%'/>");
+ this.input_fields.db_pass = $("<input type='password' class='span9'/>");
this.input_fields.db_pass.val(values["database.password"]);
td42.append(this.input_fields.db_pass);
td41.appendTo(tr4);
@@ -284,11 +284,11 @@
var top="";
if(settings.toplink)top='<a href="#" target="_top" style="position:absolute;right:5px;font-size:12px;top:7px;text-decoration:none;">top</a>';
//build basic view elements
- var title = $("<h2 style='position:relative;margin-bottom:10px'><a style='text-decoration:none' name='"+settings.anker_name+"'>"+settings.title+"</a><span style='margin-left:10px;display:none;' class='tiny_text,lmf_configurator_loader'><img src='"+settings.loading_img+"' alt='loading...'></span>"+top+"</h2>");
- table = $("<table style='margin:0px auto;background-color:#eeeeee;padding:20px;border:1px solid gray;-webkit-border-radius: 3px;border-radius: 3px;'></table>");
- var buttons = $("<div style='width:100%;text-align:center;padding-top:10px;margin-bottom:30px;'></div>");
- var b1 = $("<button>Reload</button>").click(function(){if(confirm("Discard all changes?"))functions.getValues()});
- var b3 = $("<button style='margin-left:10px;'>Test Configuration</button>").click(function(){functions.ping()});
+ var title = $("<h2><a style='text-decoration:none;color:#000000' name='"+settings.anker_name+"'>"+settings.title+"</a><span style='margin-left:10px;display:none;' class='tiny_text,lmf_configurator_loader'><img src='"+settings.loading_img+"' alt='loading...'></span>"+top+"</h2>");
+ table = $("<table class='table table-striped table-bordered'></table>");
+ var buttons = $("<p style='text-align: center'></p>");
+ var b1 = $("<button class='btn'>Reload</button>").click(function(){if(confirm("Discard all changes?"))functions.getValues()});
+ var b3 = $("<button class='btn'>Test Configuration</button>").click(function(){functions.ping()});
buttons.append(b1);
buttons.append(b3);