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/04/08 12:51:31 UTC

[4/8] git commit: sgvizler bugfix

sgvizler bugfix


Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/fc74e3c9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/fc74e3c9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/fc74e3c9

Branch: refs/heads/master
Commit: fc74e3c9956029371467609abd7fe6c9613865e1
Parents: f9de6f3
Author: tkurz <tk...@apache.org>
Authored: Mon Apr 8 11:27:41 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Mon Apr 8 11:27:41 2013 +0200

----------------------------------------------------------------------
 .../src/main/resources/templates/admin.ftl         |    3 +++
 .../src/main/resources/web/admin/dataview.html     |    2 ++
 .../resources/web/admin/js/lib/sgvizler.pack.js    |    4 +++-
 3 files changed, 8 insertions(+), 1 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/fc74e3c9/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 a211682..6b8e84f 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -32,6 +32,9 @@
         var _BASIC_URL = "${BASIC_URL}";
         //use _SERVER_URL for webservice calls
         var _SERVER_URL = "${SERVER_URL}";
+
+        var _CURRENT_STYLE = "${DEFAULT_STYLE}";
+
     </script>
     <#if USER_MODULE_IS_ACTIVE>
         <link href="${SERVER_URL}user/admin/style/style.css" rel="stylesheet" type="text/css">

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/fc74e3c9/platform/marmotta-core/src/main/resources/web/admin/dataview.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/dataview.html b/platform/marmotta-core/src/main/resources/web/admin/dataview.html
index 1420e94..eec7574 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/dataview.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/dataview.html
@@ -38,6 +38,8 @@
 
         sgvizler.option.libfolder = "js/lib/";
 
+        sgvizler.option.stylepath = _SERVER_URL + _CURRENT_STYLE;
+
         sgvizler.option.query.endpoint = SERVER_URL+"sparql/select";
         sgvizler.option.query.endpoint_output = 'json';
 

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/fc74e3c9/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js b/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
index a1c4d93..b847cc2 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
+++ b/platform/marmotta-core/src/main/resources/web/admin/js/lib/sgvizler.pack.js
@@ -53,7 +53,7 @@
             }
 
             // load stylesheet
-            $('head').append('<link rel="stylesheet" href="../../../core/public/style/sgvizler.chart.css" type="text/css" />');
+            $('head').append('<link rel="stylesheet" href="'+this.option.stylepath+'sgvizler.chart.css" type="text/css" />');
         },
 
         drawFormQuery: function () {
@@ -103,6 +103,8 @@
         homefolder: "",
         libfolder: "/lib/",
 
+        stylepath:"",
+
         //// Prefixes included in queries:
         namespace: {
             'rdf' : "http://www.w3.org/1999/02/22-rdf-syntax-ns#",