Updated Branches: refs/heads/develop 563f9ca66 -> 5bbd56e4d
fixed MARMOTTA-378 (unavailable content) Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/5bbd56e4 Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/5bbd56e4 Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/5bbd56e4 Branch: refs/heads/develop Commit: 5bbd56e4d16b3f39699057e8cdc519a2d95603d2 Parents: 563f9ca Author: Sebastian Schaffert <[email protected]> Authored: Fri Nov 29 15:11:08 2013 +0100 Committer: Sebastian Schaffert <[email protected]> Committed: Fri Nov 29 15:11:08 2013 +0100 ---------------------------------------------------------------------- .../src/main/resources/web/admin/about.html | 1 - .../main/resources/web/admin/configuration.html | 31 +++++------- .../src/main/resources/web/admin/about.html | 2 - .../src/main/resources/web/admin/configure.html | 1 - .../src/main/resources/web/admin/sgvizler.html | 1 - .../src/main/resources/web/admin/update.html | 2 +- .../src/main/resources/web/admin/about.html | 1 - .../main/resources/web/admin/configuration.html | 24 ++++----- .../src/main/resources/web/admin/about.html | 37 ++++++++++++++ .../main/resources/web/admin/configuration.html | 51 ++++++++++++++++++++ 10 files changed, 110 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/about.html ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/about.html b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/about.html index 1f7ccae..fe62cd7 100644 --- a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/about.html +++ b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/about.html @@ -24,7 +24,6 @@ <head> <!--${symbol_pound}${symbol_pound}${symbol_pound}BEGIN_HEAD${symbol_pound}${symbol_pound}${symbol_pound}--> <title>About ${moduleName}</title> - <link rel="stylesheet" type="text/css" href="../../core/public/style/center.css"/> <!--${symbol_pound}${symbol_pound}${symbol_pound}END_HEAD${symbol_pound}${symbol_pound}${symbol_pound}--> </head> <body> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/configuration.html ---------------------------------------------------------------------- diff --git a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/configuration.html b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/configuration.html index 77303d3..fce4ca2 100644 --- a/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/configuration.html +++ b/build/archetypes/marmotta-archetype-module/src/main/resources/archetype-resources/src/main/resources/web/admin/configuration.html @@ -24,28 +24,21 @@ <head> <!--${symbol_pound}${symbol_pound}${symbol_pound}BEGIN_HEAD${symbol_pound}${symbol_pound}${symbol_pound}--> <title>${moduleName} Configuration</title> - <script type="text/javascript" src="http://code.jquery.com/jquery-1.6.2.min.js";></script> - <script type="text/javascript" src="../../core/public/js/widgets/property_config.js"></script> + <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script> + <script type="text/javascript" src="../../core/public/js/widgets/configurator/configurator.js"></script> + <link type="text/css" rel="stylesheet" href="../../core/public/js/widgets/configurator/style.css"> <script type="text/javascript"> jQuery(document).ready(function(){ - var settings = { - host: _SERVER_URL, - anker_name: '${moduleKey}', - title: 'Versioning Properties <span style="font-size:12px">(parameter name MUST start with ${symbol_escape}'${moduleKey}.${symbol_escape}')</small>', - loading_img: '../../core/public/img/ajax-loader_small.gif', - blacklist_keys:[], - toplink:true, - prefix:'${moduleKey}' + var options = { + url : _SERVER_URL, + container : "configurator", + prefix : '${moduleKey}', + blacklist: [] } - ${symbol_dollar}('${symbol_pound}lmf_configurator').lmf_configurator(settings); + var configurator = new Configurator(options); }); </script> - <link rel="stylesheet" type="text/css" href="../../core/public/style/center.css"/> - <style type="text/css"> - h2 { - margin: 10px 0; - } - </style> + <!--${symbol_pound}${symbol_pound}${symbol_pound}END_HEAD${symbol_pound}${symbol_pound}${symbol_pound}--> </head> <body> @@ -58,9 +51,9 @@ The configuration contains: </p> <ul> - <li><a href="${symbol_pound}lmf_configurator">Generic Parameter Configuration</a></li> + <li><a href="${symbol_pound}configurator">Generic Parameter Configuration</a></li> </ul> - <div id="lmf_configurator"> + <div id="configurator"> <h4>Loading configurator</h4> </div> <!--${symbol_pound}${symbol_pound}${symbol_pound}END_CONTENT${symbol_pound}${symbol_pound}${symbol_pound}--> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/about.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/about.html b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/about.html index 39d1cc7..3fa323c 100644 --- a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/about.html +++ b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/about.html @@ -21,8 +21,6 @@ <head> <!--###BEGIN_HEAD###--> <title>Reasoning Module</title> -<link rel="stylesheet" type="text/css" - href="../../core/public/style/center.css" /> <!--###END_HEAD###--> </head> <body> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/configure.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/configure.html b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/configure.html index b3d6142..74839b2 100644 --- a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/configure.html +++ b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/configure.html @@ -30,7 +30,6 @@ $('#reasoner').reasoning_config({host:_SERVER_URL}); }); </script> - <link rel="stylesheet" type="text/css" href="../../core/public/style/center.css"/> <style type="text/css"> tr{ border:none !important; http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html b/platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html index 7d8c8af..1cc12d6 100644 --- a/platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html +++ b/platform/marmotta-sparql/src/main/resources/web/admin/sgvizler.html @@ -4,7 +4,6 @@ <!--###BEGIN_HEAD###--> <title>Sgvizler</title> <meta charset="UTF-8"/> - <link rel="stylesheet" type="text/css" href="../../../core/public/style/center.css"/> <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script> <script type="text/javascript" src="https://www.google.com/jsapi";></script> <script type="text/javascript" src="../../webjars/sgvizler/0.5.1/sgvizler.js" id="sgvzlr_script" ></script> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-sparql/src/main/resources/web/admin/update.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-sparql/src/main/resources/web/admin/update.html b/platform/marmotta-sparql/src/main/resources/web/admin/update.html index f1d2e6e..1bea78d 100644 --- a/platform/marmotta-sparql/src/main/resources/web/admin/update.html +++ b/platform/marmotta-sparql/src/main/resources/web/admin/update.html @@ -75,7 +75,7 @@ </form> <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script> -<script type="text/javascript" src="../../webjars/jquery-ui/1.10.3/jquery-ui.min.js"></script> +<script type="text/javascript" src="../../webjars/jquery-ui/1.10.3/ui/minified/jquery-ui.min.js"></script> <script type="text/javascript" src="../../webjars/codemirror/3.16/codemirror.js"></script> <script type="text/javascript"> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/about.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/about.html b/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/about.html index 0f39967..f72bd52 100644 --- a/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/about.html +++ b/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/about.html @@ -21,7 +21,6 @@ <head> <!--###BEGIN_HEAD###--> <title>Versioning Services</title> - <link rel="stylesheet" type="text/css" href="../../core/public/style/center.css"/> <!--###END_HEAD###--> </head> <body> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/configuration.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/configuration.html b/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/configuration.html index 1fc1753..636e032 100644 --- a/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/configuration.html +++ b/platform/marmotta-versioning-kiwi/src/main/resources/web/admin/configuration.html @@ -22,22 +22,19 @@ <!--###BEGIN_HEAD###--> <title>Versioning Module Configuration</title> <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script> - <script type="text/javascript" src="../../core/public/js/widgets/property_config.js"></script> + <script type="text/javascript" src="../../core/public/js/widgets/configurator/configurator.js"></script> + <link type="text/css" rel="stylesheet" href="../../core/public/js/widgets/configurator/style.css"> <script type="text/javascript"> jQuery(document).ready(function(){ - var settings = { - host: _SERVER_URL, - anker_name: 'generic', - title: 'Versioning Properties <span style="font-size:12px">(parameter name MUST start with \'versioning.\')</small>', - loading_img: '../../core/public/img/ajax-loader_small.gif', - blacklist_keys:[], - toplink:true, - prefix:'versioning' + var options = { + url : _SERVER_URL, + container : "configurator", + prefix : 'versioning', + blacklist: [] } - $('#lmf_configurator').lmf_configurator(settings); + var configurator = new Configurator(options); }); </script> - <link rel="stylesheet" type="text/css" href="../../core/public/style/center.css"/> <style type="text/css"> h2 { margin: 10px 0; @@ -54,10 +51,7 @@ Here you can configure the Marmotta Versioning Services.<br/> The configuration contains: </p> - <ul> - <li><a href="#lmf_configurator">Generic Parameter Configuration</a></li> - </ul> - <div id="lmf_configurator"> + <div id="configurator"> <h4>Loading configurator</h4> </div> <!--###END_CONTENT###--> http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-zookeeper/src/main/resources/web/admin/about.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-zookeeper/src/main/resources/web/admin/about.html b/platform/marmotta-zookeeper/src/main/resources/web/admin/about.html new file mode 100644 index 0000000..0e67e01 --- /dev/null +++ b/platform/marmotta-zookeeper/src/main/resources/web/admin/about.html @@ -0,0 +1,37 @@ +<!-- + + Licensed to the Apache Software Foundation (ASF) under one + or more contributor license agreements. See the NOTICE file + distributed with this work for additional information + regarding copyright ownership. The ASF licenses this file + to you under the Apache License, Version 2.0 (the + "License"); you may not use this file except in compliance + with the License. You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + +--> +<html> +<head> + <!--###BEGIN_HEAD###--> + <title>Zookeeper Module</title> + <!--###END_HEAD###--> +</head> +<body> +<!--###BEGIN_CONTENT###--> +<h1>Zookeeper Integration</h1> +<p> + This module offers integration with Apache Zookeeper for managing the configuration of a cluster of Apache Marmotta + instances. The <a href="http://marmotta.apache.org/platform/cloud.html";>Apache Marmotta Webpage</a> contains + documentation on how to setup a cloud installation. +</p> +<!--###END_CONTENT###--> +</body> +</html> + http://git-wip-us.apache.org/repos/asf/marmotta/blob/5bbd56e4/platform/marmotta-zookeeper/src/main/resources/web/admin/configuration.html ---------------------------------------------------------------------- diff --git a/platform/marmotta-zookeeper/src/main/resources/web/admin/configuration.html b/platform/marmotta-zookeeper/src/main/resources/web/admin/configuration.html new file mode 100644 index 0000000..e3a3bec --- /dev/null +++ b/platform/marmotta-zookeeper/src/main/resources/web/admin/configuration.html @@ -0,0 +1,51 @@ +<!-- + ~ Licensed to the Apache Software Foundation (ASF) under one or more + ~ contributor license agreements. See the NOTICE file distributed with + ~ this work for additional information regarding copyright ownership. + ~ The ASF licenses this file to You under the Apache License, Version 2.0 + ~ (the "License"); you may not use this file except in compliance with + ~ the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, software + ~ distributed under the License is distributed on an "AS IS" BASIS, + ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + ~ See the License for the specific language governing permissions and + ~ limitations under the License. + --> +<html> +<head> +<title>Storage Backend: BigData</title> +<script type="text/javascript"> + var _SERVER_URL = "http://localhost:8080/LMF/";; +</script> +<!--###BEGIN_HEAD###--> + <script type="text/javascript" src="../../webjars/jquery/1.8.2/jquery.min.js"></script> + <script type="text/javascript" src="../../core/public/js/widgets/configurator/configurator.js"></script> + <link type="text/css" rel="stylesheet" href="../../core/public/js/widgets/configurator/style.css"> + <script type="text/javascript"> + jQuery(document).ready(function(){ + var options = { + url : _SERVER_URL, + container : "kiwi_configurator", + prefix : 'zookeeper', + blacklist: [] + } + var configurator = new Configurator(options); + }); + </script> +<!--###END_HEAD###--> +</head> +<body> + <!--###BEGIN_CONTENT###--> + <h1>Zookeeper Configuration</h1> + <p> + Here you can configure options offered by the Zookeeper integration. The configuration currently contains: + </p> + <div id="kiwi_configurator"> + <h4>Loading configurator</h4> + </div> + <!--###END_CONTENT###--> +</body> +</html> \ No newline at end of file
