Return-Path: 
 <commits-return-3299-apmail-marmotta-commits-archive=marmotta.apache.org@marmotta.apache.org>
X-Original-To: apmail-marmotta-commits-archive@minotaur.apache.org
Delivered-To: apmail-marmotta-commits-archive@minotaur.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 34B101063B
	for <apmail-marmotta-commits-archive@minotaur.apache.org>;
 Thu, 19 Dec 2013 14:49:09 +0000 (UTC)
Received: (qmail 48410 invoked by uid 500); 19 Dec 2013 14:49:08 -0000
Delivered-To: apmail-marmotta-commits-archive@marmotta.apache.org
Received: (qmail 48354 invoked by uid 500); 19 Dec 2013 14:49:08 -0000
Mailing-List: contact commits-help@marmotta.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@marmotta.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@marmotta.apache.org>
List-Post: <mailto:commits@marmotta.apache.org>
List-Id: <commits.marmotta.apache.org>
Reply-To: dev@marmotta.apache.org
Delivered-To: mailing list commits@marmotta.apache.org
Received: (qmail 47648 invoked by uid 99); 19 Dec 2013 14:49:02 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 19 Dec 2013 14:49:02 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 89E831E05A; Thu, 19 Dec 2013 14:49:02 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: jakob@apache.org
To: commits@marmotta.apache.org
Date: Thu, 19 Dec 2013 14:49:06 -0000
Message-Id: <ccc9f012ef1e40c693c408a66e47c204@git.apache.org>
In-Reply-To: <9d0594d07a774c2bb646166fb91e6ad2@git.apache.org>
References: <9d0594d07a774c2bb646166fb91e6ad2@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [5/5] git commit: Fixed two small bugs in the admin-ui (core/context
 and kiwi-reasoner/config)

Fixed two small bugs in the admin-ui (core/context and kiwi-reasoner/config)


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

Branch: refs/heads/develop
Commit: 883aa78347133dcf084d63dd9bb5b8d177840f7e
Parents: 97425c6
Author: Jakob Frank <jakob@apache.org>
Authored: Thu Dec 19 15:47:58 2013 +0100
Committer: Jakob Frank <jakob@apache.org>
Committed: Thu Dec 19 15:47:58 2013 +0100

----------------------------------------------------------------------
 .../marmotta-core/src/main/resources/web/admin/contexts.html   | 2 +-
 .../src/main/resources/web/admin/widget/conf_reasoner.js       | 6 +++++-
 2 files changed, 6 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/marmotta/blob/883aa783/platform/marmotta-core/src/main/resources/web/admin/contexts.html
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/admin/contexts.html b/platform/marmotta-core/src/main/resources/web/admin/contexts.html
index 7a0127f..4a94291 100644
--- a/platform/marmotta-core/src/main/resources/web/admin/contexts.html
+++ b/platform/marmotta-core/src/main/resources/web/admin/contexts.html
@@ -64,7 +64,7 @@
                 $("<tr>", {"id": "context_"+id})
                     .append($("<td>", {"text": label}))
                     .append($("<td>").append($("<a>", {"text": uri, "href": uri})))
-                    .append($("<td>").append(size?$("<span>", {"text":size+" triple"+(size==1?"":"s")}):$("<em>", {"text":"unknown"})))
+                    .append($("<td>").append(size!==undefined?$("<span>", {"text":size+" triple"+(size==1?"":"s")}):$("<em>", {"text":"unknown"})))
                     .append(appendDownloadLinks($("<td>"), ctx))
                     .append($("<td>").append($("<button>", {"text": "delete"}).click(deleteContext(uri, id, size))))
                     .appendTo($("table#contexts > tbody:last"));        

http://git-wip-us.apache.org/repos/asf/marmotta/blob/883aa783/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
index 9d88207..a2b0587 100644
--- a/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
+++ b/platform/marmotta-reasoner-kiwi/src/main/resources/web/admin/widget/conf_reasoner.js
@@ -38,7 +38,7 @@
         var settings = {
             host: 'http://localhost:8080/LMF/',
             samples :{
-                skos:"@prefix: skos: <http://www.w3.org/2004/02/skos/core#>\n\n($1 skos:broader $2) -> ($1 skos:broaderTransitive $2)\n($1 skos:narrower $2) -> ($1 skos:narrowerTransitive $2)\n($1 skos:broaderTransitive $2), ($2 skos:broaderTransitive $3) -> ($1 skos:broaderTransitive $3)\n($1 skos:narrowerTransitive $2), ($2 skos:narrowerTransitive $3) -> ($1 skos:narrowerTransitive $3)\n($1 skos:broader $2) -> ($2 skos:narrower $1)\n($1 skos:narrower $2) -> ($2 skos:broader $1)\n($1 skos:broader $2) -> ($1 skos:related $2)\n($1 skos:narrower $2) -> ($1 skos:related $2)\n($1 skos:related $2) -> ($2 skos:related $1)",
+                skos:"@prefix skos: <http://www.w3.org/2004/02/skos/core#>\n\n($1 skos:broader $2) -> ($1 skos:broaderTransitive $2)\n($1 skos:narrower $2) -> ($1 skos:narrowerTransitive $2)\n($1 skos:broaderTransitive $2), ($2 skos:broaderTransitive $3) -> ($1 skos:broaderTransitive $3)\n($1 skos:narrowerTransitive $2), ($2 skos:narrowerTransitive $3) -> ($1 skos:narrowerTransitive $3)\n($1 skos:broader $2) -> ($2 skos:narrower $1)\n($1 skos:narrower $2) -> ($2 skos:broader $1)\n($1 skos:broader $2) -> ($1 skos:related $2)\n($1 skos:narrower $2) -> ($1 skos:related $2)\n($1 skos:related $2) -> ($2 skos:related $1)",
                 rdfs:"@prefix rdfs: <http://www.w3.org/2000/01/rdf-schema#>\n@prefix rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>\n\n($1 rdfs:subClassOf $2), ($2 rdfs:subClassOf $3) -> ($1 rdfs:subClassOf $3)\n($1 rdfs:subPropertyOf $2), ($2 rdfs:subPropertyOf $3) -> ($1 rdfs:subPropertyOf $3)\n($1 rdf:type $2), ($2 rdfs:subClassOf $3) -> ($1 rdf:type $3)\n($p rdfs:range $r), ($1 $p $2) -> ($2 rdf:type $r)\n($p rdfs:domain $d), ($1 $p $2) -> ($1 rdf:type $d)"
             },
             loader:"../../core/public/img/ajax-loader_small.gif"
@@ -69,6 +69,10 @@
         }
 
         var do_upload = function() {
+            var editor = $(program_input)[0]._cmEditor || {};
+            if (editor && editor.save) {
+                editor.save();
+            }
             var data = program_input.val();
             if(data=="" || title_input.val() == "") {
                 alert("Values may not be empty!");