You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@marmotta.apache.org by wi...@apache.org on 2014/10/14 16:19:20 UTC
git commit: MARMOTTA-551: fixed favicon
Repository: marmotta
Updated Branches:
refs/heads/develop 5048480ba -> a78bc6e9f
MARMOTTA-551: fixed favicon
Project: http://git-wip-us.apache.org/repos/asf/marmotta/repo
Commit: http://git-wip-us.apache.org/repos/asf/marmotta/commit/a78bc6e9
Tree: http://git-wip-us.apache.org/repos/asf/marmotta/tree/a78bc6e9
Diff: http://git-wip-us.apache.org/repos/asf/marmotta/diff/a78bc6e9
Branch: refs/heads/develop
Commit: a78bc6e9f7431bc66954923c42263be6da7ee23e
Parents: 5048480
Author: Sergio Fernández <wi...@apache.org>
Authored: Tue Oct 14 16:18:37 2014 +0200
Committer: Sergio Fernández <wi...@apache.org>
Committed: Tue Oct 14 16:18:37 2014 +0200
----------------------------------------------------------------------
.../src/main/webapp/WEB-INF/templates/admin.ftl | 2 +-
.../src/main/resources/templates/admin.ftl | 2 +-
.../src/main/resources/web/public/img/icon/lmf.ico | Bin 1082 -> 0 bytes
.../resources/web/public/img/icon/marmotta.ico | Bin 0 -> 15814 bytes
4 files changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a78bc6e9/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/admin.ftl
----------------------------------------------------------------------
diff --git a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/admin.ftl b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/admin.ftl
index d0d36fe..d8f95a3 100644
--- a/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/admin.ftl
+++ b/build/archetypes/marmotta-archetype-webapp/src/main/resources/archetype-resources/src/main/webapp/WEB-INF/templates/admin.ftl
@@ -27,7 +27,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="${SERVER_URL}${DEFAULT_STYLE}javadoc.css" rel="stylesheet" type="text/css" />
<link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/img/icon/lmf.ico" rel="SHORTCUT ICON">
+ <link href="${SERVER_URL}core/public/img/icon/marmotta.ico" rel="SHORTCUT ICON">
<script type="text/javascript">
var _BASIC_URL = "${BASIC_URL}";
//use _SERVER_URL for webservice calls
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a78bc6e9/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 85a9e65..da870d6 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -27,7 +27,7 @@
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<link href="${SERVER_URL}${DEFAULT_STYLE}javadoc.css" rel="stylesheet" type="text/css" />
<link href="${SERVER_URL}${DEFAULT_STYLE}style.css" rel="stylesheet" type="text/css" />
- <link href="${SERVER_URL}core/public/img/icon/lmf.ico" rel="SHORTCUT ICON">
+ <link href="${SERVER_URL}core/public/img/icon/marmotta.ico" rel="SHORTCUT ICON">
<script type="text/javascript">
var _BASIC_URL = "${BASIC_URL}";
//use _SERVER_URL for webservice calls
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a78bc6e9/platform/marmotta-core/src/main/resources/web/public/img/icon/lmf.ico
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/img/icon/lmf.ico b/platform/marmotta-core/src/main/resources/web/public/img/icon/lmf.ico
deleted file mode 100644
index 0f8fbfc..0000000
Binary files a/platform/marmotta-core/src/main/resources/web/public/img/icon/lmf.ico and /dev/null differ
http://git-wip-us.apache.org/repos/asf/marmotta/blob/a78bc6e9/platform/marmotta-core/src/main/resources/web/public/img/icon/marmotta.ico
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/img/icon/marmotta.ico b/platform/marmotta-core/src/main/resources/web/public/img/icon/marmotta.ico
new file mode 100644
index 0000000..b631e75
Binary files /dev/null and b/platform/marmotta-core/src/main/resources/web/public/img/icon/marmotta.ico differ