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 2013/03/18 12:21:48 UTC

[1/3] git commit: MARMOTTA-153: workaround to get a minimum style for project using the alternate dark style, by default now in lmf for instance

MARMOTTA-153: workaround to get a minimum style for project using the alternate dark style, by default now in lmf for instance


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

Branch: refs/heads/master
Commit: ebdb970195468bfe8e99eeecb2cc04583679bc36
Parents: c9174b5
Author: Sergio Fernández <wi...@apache.org>
Authored: Mon Mar 18 12:07:48 2013 +0100
Committer: Sergio Fernández <wi...@apache.org>
Committed: Mon Mar 18 12:07:48 2013 +0100

----------------------------------------------------------------------
 .../src/main/resources/templates/404.ftl           |   69 ++++++---------
 .../src/main/resources/templates/admin.ftl         |    8 +-
 .../src/main/resources/web/public/style/404.css    |   44 +++++++++
 .../main/resources/web/public/style/rdfhtml.css    |    1 +
 .../resources/web/public/style/scheme/dark.css     |   23 ++++-
 .../src/main/resources/web/public/style/style.css  |    5 +-
 6 files changed, 96 insertions(+), 54 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ebdb9701/platform/marmotta-core/src/main/resources/templates/404.ftl
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/templates/404.ftl b/platform/marmotta-core/src/main/resources/templates/404.ftl
index 1cb3e4e..a81d1ba 100644
--- a/platform/marmotta-core/src/main/resources/templates/404.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/404.ftl
@@ -17,41 +17,26 @@
     limitations under the License.
 
 -->
-<!DOCTYPE html>
-<html lang="en">
-
-<head>
-  <title>404 Not Found - Marmotta Linked Data Explorer</title>
-  <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> 
-  <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}"> 
-  <script src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js" type="text/javascript" ></script>
-  <link href="${SERVER_URL}core/public/style/style.css" title="screen" rel="stylesheet" type="text/css" />
-  <link href="${SERVER_URL}core/public/style/scheme/blue.css" title="screen" rel="stylesheet" type="text/css" />  
-  <link href="${SERVER_URL}core/public/style/scheme/dark.css" title="screen" rel="alternate stylesheet" type="text/css" />  
-  <link href="${SERVER_URL}core/public/style/rdfhtml.css" title="screen" rel="stylesheet" type="text/css" />  
-  <style type="text/css">
-    div#center {
-      float: none; 
-      width: auto; 
-      vertical-align: middle; 
-      min-height: 400px; 
-      margin: 0; 
-      padding: 2em 30% 5em 30%;
-    }
-    div#center > * {
-      margin-top: 2em;
-      font-size: 1.6em;
-    }
-    div#center > p > a > img {
-      vertical-align: text-top;
-      margin-left: 0.15em;
-    }
-  </style>  
-</head>
-
-<body>
-
-<div id="wrapper">
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+        "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+
+<html xmlns="http://www.w3.org/1999/xhtml" dir="ltr">
+
+  <head>
+    <meta http-equiv="Content-Type" content="text/html;charset=utf-8" /> 
+    <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}" /> 
+    <title>404 Not Found - Marmotta Linked Data Explorer</title>
+    <script src="${SERVER_URL}core/public/js/lib/jquery-1.7.2.js" type="text/javascript" ></script>
+    <link href="${SERVER_URL}core/public/style/style.css" rel="stylesheet" type="text/css" />
+    <link href="${SERVER_URL}core/public/style/scheme/blue.css" title="blue" rel="stylesheet" type="text/css" />  
+    <link href="${SERVER_URL}core/public/style/scheme/dark.css" title="dark" rel="alternate stylesheet" type="text/css" />  
+    <link href="${SERVER_URL}core/public/style/rdfhtml.css" rel="stylesheet" type="text/css" />  
+    <link href="${SERVER_URL}core/public/style/404.css" rel="stylesheet" type="text/css" />  
+  </head>
+
+  <body>
+
+    <div id="wrapper">
     <div id="header">
         <a id="logo" href="${SERVER_URL}" title="${PROJECT}">
             <img src="${SERVER_URL}${LOGO}" alt="${PROJECT} logo" />
@@ -76,7 +61,7 @@
         </div>
         
     </div>
-    
+
     <div class="clear"></div>
     <div id="footer">
         <div id="footer_line">
@@ -86,16 +71,16 @@
         </div>
     </div> 
 
-</div>
+    </div>
 
-<script type="text/javascript"> 
+    <script type="text/javascript"> 
 
-  $(document).ready(function() {
+    $(document).ready(function() {
 
-  });
+    });
 
-</script> 
+    </script> 
 
-</body>
+  </body>
 
 </html>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ebdb9701/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 cd5c6fd..6be7d6b 100644
--- a/platform/marmotta-core/src/main/resources/templates/admin.ftl
+++ b/platform/marmotta-core/src/main/resources/templates/admin.ftl
@@ -25,7 +25,7 @@
 <head>
 
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-    <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}">
+    <meta http-equiv="Default-Style" content="${DEFAULT_STYLE}" />
     <link href="${SERVER_URL}core/public/style/javadoc.css" rel="stylesheet" type="text/css" />
     <link href="${SERVER_URL}core/public/style/style.css" rel="stylesheet" type="text/css" />
     <link href="${SERVER_URL}core/public/style/scheme/blue.css" title="blue" rel="stylesheet" type="text/css" />
@@ -45,8 +45,10 @@
             }
         </script>
     </#if>
+
     ${HEAD}
-    <title>Apache Marmotta</title>
+
+</head>
 
 <body>
 
@@ -92,4 +94,4 @@
             </span>
         </div>
     </div>
-</div>
\ No newline at end of file
+</div>

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ebdb9701/platform/marmotta-core/src/main/resources/web/public/style/404.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/404.css b/platform/marmotta-core/src/main/resources/web/public/style/404.css
new file mode 100644
index 0000000..9d3b62a
--- /dev/null
+++ b/platform/marmotta-core/src/main/resources/web/public/style/404.css
@@ -0,0 +1,44 @@
+/**
+ * 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.
+ */
+
+div#header h1, div#center {
+    width: auto; 
+    min-height: 400px; 
+    margin: 0; 
+}
+
+div#center {
+    padding: 2em 30% 2em 30%;
+}
+
+div#center {
+    float: none; 
+    vertical-align: middle; 
+    padding: 2em 30% 5em 30%;
+}
+
+div#center > * {
+    margin-top: 2em;
+    font-size: 1.6em;
+}
+
+div#center > p > a > img {
+    vertical-align: text-top;
+    margin-left: 0.15em;
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ebdb9701/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css b/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
index 286130b..65ef3c4 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/rdfhtml.css
@@ -15,6 +15,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+
 p#rawrdf {
 	text-align: right;
 	font-size: 0.90em;

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ebdb9701/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css b/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
index 64612e6..697b5ca 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/scheme/dark.css
@@ -65,7 +65,7 @@ a:visited {
     border-color: #2c2c2c;
 }
 
-#footer_line span{
+#footer_line span {
     color:#b5b5b5;
 }
 
@@ -102,7 +102,7 @@ ul.submenu li.active a {
 
 table.simple_table tr.title td,
 table.simple_table th {
-    background-color: #4d4d4d;
+    background-color: #2c2c2c;
     color: #6dcff5;
     border-color:#b5b5b5;
 }
@@ -115,9 +115,9 @@ table.simple_table tr.subheading th,
 table.simple_table th.subheading {
     background-color: #b5b5b5;
     color: #2c2c2c;
-}
+}   
 
-table.simple_table tr td{
+table.simple_table tr td {
     color: #b5b5b5;
     border-color: #b5b5b5;
 }
@@ -127,5 +127,18 @@ table.simple_table tr {
 }
 
 table.simple_table tr.even {
-    background-color: #8d8d8d;
+    background-color: #2c2c2c;
+}
+
+div#top_serialisation_links a {
+    color: #6dcff5;
 }
+
+div#tab-raw-triples h2 {
+    background-color: #4d4d4d;
+}
+
+table#add-new-prefix tr td {
+    color: #4d4d4d;
+}
+

http://git-wip-us.apache.org/repos/asf/incubator-marmotta/blob/ebdb9701/platform/marmotta-core/src/main/resources/web/public/style/style.css
----------------------------------------------------------------------
diff --git a/platform/marmotta-core/src/main/resources/web/public/style/style.css b/platform/marmotta-core/src/main/resources/web/public/style/style.css
index 7946da1..b7d328c 100644
--- a/platform/marmotta-core/src/main/resources/web/public/style/style.css
+++ b/platform/marmotta-core/src/main/resources/web/public/style/style.css
@@ -132,9 +132,6 @@ a#logo img {
     display: block;
     padding-bottom: 10px;
 }
-#footer_line a {
-    color: #333;
-}
 
 .clear {
     clear: both;
@@ -213,4 +210,4 @@ table.simple_table tr td{
     text-align: left;
     border-width: 1px;
     border-style: solid;
-}
\ No newline at end of file
+}