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/09/12 14:23:33 UTC
[2/3] git commit: change configuration for new admin ui (for
MARMOTTA-228)
change configuration for new admin ui (for MARMOTTA-228)
Project: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/commit/40ce6eb9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/tree/40ce6eb9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-marmotta/diff/40ce6eb9
Branch: refs/heads/develop
Commit: 40ce6eb9abb1fe45f8954918ec5fd8038ffc40f5
Parents: 4e767a7
Author: tkurz <tk...@apache.org>
Authored: Thu Sep 12 14:23:00 2013 +0200
Committer: tkurz <tk...@apache.org>
Committed: Thu Sep 12 14:23:00 2013 +0200
----------------------------------------------------------------------
.../src/main/resources/kiwi-module.properties | 41 ++++++++++++-----
.../src/main/resources/templates/admin.ftl | 48 ++++++++++++++++----
.../src/main/resources/kiwi-module.properties | 6 ++-
.../src/main/resources/kiwi-module.properties | 12 ++++-
.../src/main/resources/kiwi-module.properties | 6 ++-
.../src/main/resources/kiwi-module.properties | 13 +++++-
.../src/main/resources/kiwi-module.properties | 14 +++++-
.../src/main/resources/kiwi-module.properties | 8 +++-
.../src/main/resources/kiwi-module.properties | 6 ++-
9 files changed, 127 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-core/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/kiwi-module.properties b/platform/marmotta-core/src/main/resources/kiwi-module.properties
index c3e2c28..37692bb 100644
--- a/platform/marmotta-core/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-core/src/main/resources/kiwi-module.properties
@@ -18,7 +18,7 @@
name=Core Services
-container=Admin
+container=Generic
container.weight = 10
subtitle = Configure LMF Core
@@ -29,16 +29,35 @@ icon_small = /admin/img/config_small.png
#do not change!!!
baseurl=/core
-adminpages=/admin/about.html,\
- /admin/configuration.html,\
- /admin/tasks.html,\
- /admin/import.html,\
- /admin/export.html,\
- /admin/dataview.html,\
- /admin/contexts.html,\
- /admin/prefixes.html,\
- /admin/system.html,\
- /admin/database.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
+
+adminpage.2.title=Tasks
+adminpage.2.link=/admin/tasks.html
+
+adminpage.3.title=Import
+adminpage.3.link=/admin/import.html
+
+adminpage.4.title=Export
+adminpage.4.link=/admin/export.html
+
+adminpage.5.title=Data Views
+adminpage.5.link=/admin/dataview.html
+
+adminpage.6.title=Context Manager
+adminpage.6.link=/admin/contexts.html
+
+adminpage.7.title=Prefix Manager
+adminpage.7.link=/admin/prefixes.html
+
+adminpage.8.title=System
+adminpage.8.link=/admin/system.html
+
+adminpage.9.title=Database
+adminpage.9.link=/admin/database.html
webservices=org.apache.marmotta.platform.core.webservices.config.ConfigurationWebService,\
org.apache.marmotta.platform.core.webservices.config.DependenciesWebService,\
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/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 3352942..90173ff 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -58,18 +58,49 @@
}
ul.center_submenu li {
list-style: none;
- display: inline;
- margin-bottom: -1px;
- padding: 5px 0 0;
- margin-bottom: 10px;
- background-color: white;
- border: 1px solid black;
+ display: list-item;
+ float: left;
+ padding: 5px;
+ margin-right: 4px;
}
ul.center_submenu li.active {
- margin-bottom:-1px;
+ border-top-left-radius: 3px;
+ border-top-right-radius: 3px;
+ background-color: white;
+ border-left: 1px solid #ccc;
+ border-right: 1px solid #ccc;
+ border-top: 1px solid #ccc;
}
ul.center_submenu a {
- padding:10px;
+ text-decoration: underline;
+ font-weight: bold;
+ color: #0B61A4;
+ }
+
+ ul.center_submenu li.active a {
+ text-decoration: none;
+ }
+ #content {
+ border-top-left-radius: 0;
+ border-top-right-radius: 3px;
+ border-bottom-right-radius: 3px;
+ border-bottom-left-radius: 3px;
+ border-left: 1px solid #ccc;
+ }
+ #login_logout {
+ float: right;
+ margin-right: 5px;
+ margin-top: -3px;
+ border: 1px solid #aaa;
+ padding: 4px 10px 2px;
+ background-color: white;
+ border-radius: 3px;
+ -webkit-border-radius: 3px;
+ box-shadow: 0px 0px 8px #555;
+ }
+ #login_logout a {
+ color: #0B61A4;
+ font-weight: bold;
}
</style>
</head>
@@ -130,6 +161,7 @@
</#if>
</#list>
</ul>
+ <div class="clear"></div>
<div id="content">
${CONTENT}
</div>
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties b/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
index 0f0c425..3f3dd4e 100644
--- a/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-ldcache/src/main/resources/kiwi-module.properties
@@ -25,7 +25,11 @@ baseurl=/cache
webservices=org.apache.marmotta.platform.ldcache.webservices.LinkedDataCachingWebService
-adminpages=/admin/about.html,/admin/configuration.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties b/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
index dd04fc9..6cfc446 100644
--- a/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-ldpath/src/main/resources/kiwi-module.properties
@@ -17,7 +17,8 @@
#
name=LD Path Querying
-subtitle =
+
+container = Query and Update
icon_small = /admin/img/ld_path_small.png
#icon_big =
@@ -30,5 +31,14 @@ entities=
adminpages= /admin/about.html, /admin/ldpath.html, /admin/functions.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Query Interface
+adminpage.1.link=/admin/ldpath.html
+
+adminpage.2.title=Function Set
+adminpage.2.link=/admin/functions.html
+
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties b/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
index 90187a8..cc520d1 100644
--- a/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-reasoner/src/main/resources/kiwi-module.properties
@@ -25,4 +25,8 @@ icon_small = /admin/img/reasoner_small.png
webservices=org.apache.marmotta.platform.reasoner.webservices.ProgramWebService,org.apache.marmotta.platform.reasoner.webservices.ReasonerWebService
-adminpages=/admin/about.html,/admin/configure.html
\ No newline at end of file
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configure.html
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-security/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-security/src/main/resources/kiwi-module.properties b/platform/marmotta-security/src/main/resources/kiwi-module.properties
index e83618b..3e10010 100644
--- a/platform/marmotta-security/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-security/src/main/resources/kiwi-module.properties
@@ -17,6 +17,7 @@
#
name=Security
+container=Generic
baseurl=/security
@@ -26,8 +27,18 @@ icon_small = /public/img/security_small.png
webservices=org.apache.marmotta.platform.security.webservices.SecurityWebService
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
+
+adminpage.2.title=Profiles
+adminpage.2.link=/admin/profiles.html
+
+adminpage.3.title=Rule Set
+adminpage.3.link=/admin/rules.html
-adminpages=/admin/about.html,/admin/configuration.html,/admin/profiles.html,/admin/rules.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-sparql/src/main/resources/kiwi-module.properties b/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
index 5641ea4..4d1fe2d 100644
--- a/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-sparql/src/main/resources/kiwi-module.properties
@@ -18,6 +18,8 @@
name=SPARQL
weight = 20
+container = Query and Update
+container.weight = 5
baseurl=/sparql
@@ -27,5 +29,15 @@ icon_small = /admin/img/sparql_small.png
webservices=org.apache.marmotta.platform.sparql.webservices.SparqlWebService
-adminpages=/admin/about.html,/admin/configuration.html,/admin/snorql.html,/admin/update.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html
+
+adminpage.2.title=Query Interface
+adminpage.2.link=/admin/snorql.html
+
+adminpage.3.title=Update Interface
+adminpage.3.link=/admin/update.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-user/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-user/src/main/resources/kiwi-module.properties b/platform/marmotta-user/src/main/resources/kiwi-module.properties
index 60a5965..dc804e9 100644
--- a/platform/marmotta-user/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-user/src/main/resources/kiwi-module.properties
@@ -18,6 +18,8 @@
name=Users
+container=Generic
+
baseurl=/user
subtitle = Profile and Account Management
@@ -27,9 +29,11 @@ icon_small = /admin/img/user_small.png
webservices=org.apache.marmotta.platform.user.webservices.UserWebService,\
org.apache.marmotta.platform.user.webservices.UserManagementWebService
+adminpage.0.title=About Me
+adminpage.0.link=/me.html
-adminpages=/me.html,\
- /admin/users.html
+adminpage.1.title=Users
+adminpage.1.link=/admin/users.html
http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/40ce6eb9/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
----------------------------------------------------------------------
diff --git a/platform/marmotta-versioning/src/main/resources/kiwi-module.properties b/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
index 12dd95c..f143730 100644
--- a/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
+++ b/platform/marmotta-versioning/src/main/resources/kiwi-module.properties
@@ -27,4 +27,8 @@ webservices=org.apache.marmotta.platform.versioning.webservices.VersioningWebSer
icon_small = /admin/img/clock_small.png
-adminpages=/admin/about.html,/admin/configuration.html
+adminpage.0.title=About
+adminpage.0.link=/admin/about.html
+
+adminpage.1.title=Configuration
+adminpage.1.link=/admin/configuration.html