You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@olingo.apache.org by sk...@apache.org on 2014/05/19 15:28:04 UTC
[15/50] [abbrv] git commit: [OLINGO-266] pimp index.jsp
[OLINGO-266] pimp index.jsp
Project: http://git-wip-us.apache.org/repos/asf/olingo-odata4/repo
Commit: http://git-wip-us.apache.org/repos/asf/olingo-odata4/commit/15eb5875
Tree: http://git-wip-us.apache.org/repos/asf/olingo-odata4/tree/15eb5875
Diff: http://git-wip-us.apache.org/repos/asf/olingo-odata4/diff/15eb5875
Branch: refs/heads/master
Commit: 15eb5875c3f7c41a07f41273f9740118d51f97c5
Parents: d3e3074
Author: Stephan Klevenz <st...@sap.com>
Authored: Mon May 19 12:32:12 2014 +0200
Committer: Stephan Klevenz <st...@sap.com>
Committed: Mon May 19 14:27:05 2014 +0200
----------------------------------------------------------------------
lib/server-tecsvc/src/main/version/version.html | 2 +-
.../src/main/webapp/css/olingo.css | 54 ++++----------------
.../src/main/webapp/gen/version.html | 43 ----------------
lib/server-tecsvc/src/main/webapp/index.jsp | 13 ++---
4 files changed, 19 insertions(+), 93 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/15eb5875/lib/server-tecsvc/src/main/version/version.html
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/version/version.html b/lib/server-tecsvc/src/main/version/version.html
index d0b9d02..1537389 100644
--- a/lib/server-tecsvc/src/main/version/version.html
+++ b/lib/server-tecsvc/src/main/version/version.html
@@ -17,7 +17,7 @@
under the License.
-->
-<table border="1" rules="groups">
+<table border="1" rules="groups" >
<thead>
<tr>
<th colspan=2>Version Information</th>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/15eb5875/lib/server-tecsvc/src/main/webapp/css/olingo.css
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/webapp/css/olingo.css b/lib/server-tecsvc/src/main/webapp/css/olingo.css
index 6e3aa7f..c2323fc 100644
--- a/lib/server-tecsvc/src/main/webapp/css/olingo.css
+++ b/lib/server-tecsvc/src/main/webapp/css/olingo.css
@@ -20,35 +20,27 @@ body {
font-family: Arial, sans-serif;
font-size: 13px;
line-height: 18px;
- color: orange
+ color: #8904B1;
background-color: #ffffff;
}
a {
- color: blue;
- text-decoration: none;
+ color: #8904B1;
}
-a:focus {
- outline: thin dotted #4076cb;
- outline-offset: -1px;
+a:VISITED {
+ color: #D358F7;
}
-/* a:hover,a:active { */
-/* outline: 0; */
-/* } */
-
-/* a:hover { */
-/* color: #404a7e; */
-/* text-decoration: underline; */
-/* } */
+td {
+ padding:5px;
+}
h1,h2,h3,h4,h5,h6 {
- margin: 9px 0;
font-family: inherit;
font-weight: bold;
line-height: 1;
- color: orange;
+ color: #8904B1;
}
h1 {
@@ -82,39 +74,15 @@ h6 {
}
.logo {
- float: right;
-}
-
-ul {
- padding: 0;
- margin: 0 0 9px 25px;
-}
-
-ul ul {
- margin-bottom: 0;
-}
-
-li {
- line-height: 18px;
+ float: left;
}
hr {
margin: 9px 0;
- border: 0;
- border-top: 1px solid #cccccc;
- border-bottom: 1px solid #ffffff;
+ border-top: 1px solid #8904B1;
+ border-bottom: 1px solid #8904B1;
}
-/* table { */
-/* border-collapse: collapse; */
-/* border-spacing: 2px; */
-/* } */
-
-/* th,td { */
-/* border: 1px solid; */
-/* padding: 2px; */
-/* } */
-
.version {
font-family: "Courier New", monospace;
font-size: 9px;
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/15eb5875/lib/server-tecsvc/src/main/webapp/gen/version.html
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/webapp/gen/version.html b/lib/server-tecsvc/src/main/webapp/gen/version.html
deleted file mode 100644
index d0b9d02..0000000
--- a/lib/server-tecsvc/src/main/webapp/gen/version.html
+++ /dev/null
@@ -1,43 +0,0 @@
-<!--
- 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.
--->
-
-<table border="1" rules="groups">
- <thead>
- <tr>
- <th colspan=2>Version Information</th>
- </tr>
- </thead>
-
- <tfoot>
- <tr>
- <td colspan=2><a href="http://olingo.apache.org" target="self">Apache
- Olingo</a></td>
- </tr>
- </tfoot>
-
- <tbody>
- <td>name</td>
- <td>${name}</td>
- </tr>
- <tr>
- <td>version</td>
- <td>${version}</td>
- </tr>
- </tbody>
-</table>
http://git-wip-us.apache.org/repos/asf/olingo-odata4/blob/15eb5875/lib/server-tecsvc/src/main/webapp/index.jsp
----------------------------------------------------------------------
diff --git a/lib/server-tecsvc/src/main/webapp/index.jsp b/lib/server-tecsvc/src/main/webapp/index.jsp
index 22173bf..aa3bfcf 100644
--- a/lib/server-tecsvc/src/main/webapp/index.jsp
+++ b/lib/server-tecsvc/src/main/webapp/index.jsp
@@ -20,7 +20,7 @@
under the License.
-->
-<!DOCTYPE html>
+<!DOCTYPE html>
<html>
<header>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
@@ -33,22 +33,23 @@
<body>
<div>
<h1>
- Olingo OData 4.0
+ Olingo OData 4.0
<div class="logo">
- <img height="100" align="right" src="img/OlingoOrangeTM.png" />
+ <img height="40" src="img/OlingoOrangeTM.png" />
</div>
</h1>
+ <hr>
</div>
- <hr>
<h2>Technical Service</h2>
<lu>
<li><a href="odata.svc/">Service Document</a></li>
<li><a href="odata.svc/$metadata">Metadata</a></li>
</lu>
+ <p>
<hr>
-
-<div class="version">
+ <p>
+ <div class="version">
<%
String version = "gen/version.html";