Author: mattmann
Date: Mon Aug 24 16:12:06 2015
New Revision: 1697447
URL: http://svn.apache.org/r1697447
Log:
- OODT-842 WIP; finish!
- add EDRN skin
- make app skinnable and resources discoverable (images)
- add docs on skin param to context
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/bg-body.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-logo.png
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_hhs.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_nih.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_usagov.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-cdg.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-dcp.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nci.gif
(with props)
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nih.gif
(with props)
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java?rev=1697447&r1=1697446&r2=1697447&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
Mon Aug 24 16:12:06 2015
@@ -17,6 +17,7 @@
package org.apache.oodt.cas.curation;
+import java.util.HashSet;
import java.util.Set;
import java.util.logging.Level;
import java.util.logging.Logger;
@@ -42,7 +43,7 @@ public class CurationApp extends WebAppl
public static final String SSO_IMPL_CLASS =
"org.apache.oodt.security.sso.implClass";
public static final String CURATOR_HOMEPAGE = "curator.homepage";
-
+
public static final String CURATOR_SKIN = "org.apache.oodt.cas.curator.skin";
/*
@@ -53,19 +54,13 @@ public class CurationApp extends WebAppl
@Override
protected void init() {
super.init();
- Set<String> resources = Workbench.getImageFiles();
- if (resources != null) {
- for (String resource : resources) {
- String resName = new File(resource).getName();
- String resPath = "/images/" + resName;
- LOG.log(Level.INFO, "Mounting: [" + resPath + "]");
- mountSharedResource(resPath, new ResourceReference(Workbench.class,
- resName).getSharedResourceKey());
- }
- }
-
- mountSharedResource("/images/blackfade-syncd.jpg", new ResourceReference(
- HomePage.class, "blackfade-syncd.jpg").getSharedResourceKey());
+ Set<String> benchResources = Workbench.getImageFiles();
+ String localPath = HomePage.class.getPackage().getName();
+ Set<String> localResources = Workbench.getImageFiles(localPath);
+ benchResources = filterBenchResources(benchResources, localResources,
+ localPath);
+ doImageMounts(benchResources, (Class<?>) Workbench.class);
+ doImageMounts(localResources, (Class<?>) HomePage.class);
MixedParamUrlCodingStrategy loginPageMount = new
MixedParamUrlCodingStrategy(
"auth", LoginPage.class, new String[] { "action" });
@@ -93,8 +88,8 @@ public class CurationApp extends WebAppl
public String getSSOImplClass() {
return getServletContext().getInitParameter(SSO_IMPL_CLASS);
}
-
- public String getSkin(){
+
+ public String getSkin() {
return getServletContext().getInitParameter(CURATOR_SKIN);
}
@@ -109,10 +104,44 @@ public class CurationApp extends WebAppl
public Session newSession(Request request, Response response) {
CurationSession session = new CurationSession(request);
String skin = getSkin();
- if (skin != null && !skin.equals("")){
- session.setStyle(skin);
+ if (skin != null && !skin.equals("")) {
+ LOG.log(Level.INFO, "Setting skin to: [" + skin + "]");
+ session.setStyle(skin);
}
- return new CurationSession(request);
+ return session;
}
+ private Set<String> filterBenchResources(Set<String> bench,
+ Set<String> local, String localPrefix) {
+ if (local == null || (local != null && local.size() == 0))
+ return bench;
+ if (bench == null || (bench != null && bench.size() == 0))
+ return bench;
+ Set<String> filtered = new HashSet<String>();
+ for (String bResource : bench) {
+ String localName = new File(bResource).getName();
+ String compare = localPrefix + localName;
+ if (!local.contains(compare)) {
+ filtered.add(bResource);
+ } else {
+ LOG.log(Level.INFO, "Filtered conflicting bench resource: ["
+ + bResource + "]");
+ }
+
+ }
+ return filtered;
+ }
+
+ private void doImageMounts(Set<String> resources, Class<?> clazz) {
+ if (resources != null) {
+ for (String resource : resources) {
+ String resName = new File(resource).getName();
+ String resPath = "/images/" + resName;
+ LOG.log(Level.INFO, "Mounting: [" + resPath + "] origName: [" + resName
+ + "]: resource: [" + resource + "]");
+ mountSharedResource(resPath,
+ new ResourceReference(clazz, resName).getSharedResourceKey());
+ }
+ }
+ }
}
\ No newline at end of file
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html?rev=1697447&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage_edrn.html
Mon Aug 24 16:12:06 2015
@@ -0,0 +1,219 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd";>
+<!--
+ 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.
+-->
+<html
+
xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd";>
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+</head>
+<body>
+<div id="page">
+ <div id="ncibanner">
+
+ <div id="ncibanner-inner">
+ <a href="http://www.cancer.gov/";><h2 class="ncilogo">National Cancer
Institute</h2></a>
+ <a href="http://www.cancer.gov/";><h2
class="cdglogo">www.cancer.gov</h2></a>
+ <a href="http://www.nih.gov/";><h2 class="nihlogo">National
Institutes of Health</h2></a>
+ </div>
+ </div>
+ <br class="clr"/>
+
+ <div id="edrnlogo">
+ <h1 class="header-title"><wicket:link><img id="edrnlogo-logo"
src="edrn-logo.png"/></wicket:link>Early Detection Research Network</h1>
+ <h2 class="header-title">Biomarkers: The Key to Early Detection</h2>
+ </div>
+ <div id="dcplogo">
+ <h2 class="dcplogo"><a href="http://prevention.cancer.gov";>Division of
Cancer Prevention</a></h2>
+ </div>
+
+ <div class="userdetails">
+ <span wicket:id="loggedin_label">Not Logged In.</span> <a
href="#" wicket:id="login_link">Log In</a>
+ <a href="#" wicket:id="logout_link">Log Out</a>
+ </div>
+ <h2 class="app-title" style="margin-top:146px;"
wicket:id="project_name">Application Title Goes Here</h2>
+ <div class="menu">
+ <!-- Breadcrumbs Area -->
+ <div id="breadcrumbs">
+ <ul>
+ <li><a href="#" wicket:id="home_link">Home</a> / </li>
+ <li><span wicket:id="crumb_name">Main</span></li>
+ </ul>
+ </div>
+ </div><!-- End Breadcrumbs -->
+
+ <!-- page content -->
+<wicket:child/>
+
+ <!-- so that it previews right -->
+ <wicket:remove>
+ <link type="text/css" rel="stylesheet"
href="../../../../../../../../../../webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.css"/>
+
+ <div class="page">
+ <div class="container browsers">
+ <div id="browseStagingContainer">
+ <h5>Staging Area</h5>
+ <div id="browseStagingPath"
class="pathbar">initializing...</div>
+ <div id="browseStaging" class="browser">
+ <div id="browseStagingNav">
+ <ul class="fileTree">
+ <li class="directory nav"><a id="stagingNavUpRoot"
href="#" rel=".">.</a></li>
+ <li class="directory nav"><a id="stagingNavUpOne"
href="#" rel="..">..</a></li>
+ </ul>
+ </div>
+ <div id="browseStagingContents"></div>
+ </div>
+ <div id="stagedMetadataWorkbench" class="editor">
+ <div id="infoNoMetadataExtractorDefined" class="info
overlay">
+ <div class="infoContent">
+ No Metadata Detected...<br/>
+ </div>
+ </div>
+ <div id="stagingMetContainer">
+ <div id="stagingMetExtractorSelection">
+ <select id="stagingMetExtractorConfigList">
+ <option value="-1">Initializing...</option>
+ </select>
+ <input id="stagingMetExtractorRefreshButton"
type="button" value="Refresh"/>
+
+
+ </div>
+ <div id="stagedMetadataWorkbenchContent"></div>
+ </div>
+ </div>
+ </div>
+ <div id="browseCatalogContainer">
+ <h5>File Manager Catalog</h5>
+ <div id="browseCatalogPath"
class="pathbar">initializing...</div>
+ <div id="browseCatalog" class="browser">
+ <div id="browseCatalogNav">
+ <ul class="fileTree">
+ <li class="directory nav"><a id="catalogNavUpRoot"
href="#" rel=".">.</a></li>
+ <li class="directory nav"><a id="catalogNavUpOne"
href="#" rel="..">..</a></li>
+ </ul>
+ </div>
+ <div id="browseCatalogContents"></div>
+ </div>
+ <div id="catalogMetadataWorkbench" class="editor">
+ <div id="catalogMetadataWorkbenchContent"></div>
+ </div>
+ </div>
+ <br class="clr"/>
+ </div>
+ <div class="container tasks">
+ <div id="ingestionTaskList">
+ <h5>File Manager Ingestion Task List</h5>
+ <div id="ingestionTaskListContent">
+ <table cellspacing="0" cellpadding="0"
id="ingestionTaskListItems">
+ <thead>
+ <tr>
+ <th style="width:50px;">TaskId</th>
+ <th>Created</th>
+ <th>Files</th>
+ <th>Policy</th>
+ <th>ProductType</th>
+ <th>MetExtractor</th>
+ <th>MetExt Config</th>
+ <th>Status</th>
+ <th style="border-right-width:0px;">Action</th>
+ </tr>
+ </thead>
+ <tbody>
+
+ </tbody>
+
+ </table>
+ </div>
+ </div>
+ </div>
+ </div>
+
+ <!-- product type workbench -->
+ <div id="productTypeWorkbenchContents" style="display:none">
+ <ul>
+ <li><a href='#ptwbAddProducts'>Add Products</a></li>
+ <li><a href='#ptwbMetadata'>View Metadata</a></li>
+ </ul><br class="clr"/>
+ <div id="ptwbAddProducts">
+ <span class="instructions">
+ Add files from the staging area by dragging them into the target
box below. Once you have
+ Finished, click 'Save as Ingestion Task' to finalize.
+ </span>
+ <div id="droppedFileTarget" class="ptwbSectionBox">
+ <h5>File Drop Target...</h5>
+
+ </div>
+ <div id="droppedFileList" class="ptwbSectionBox">
+ <h5>Files to be ingested...</h5>
+ <ul></ul>
+ </div>
+ <div id="itMetExtractorSelector" class="ptwbSectionBox">
+ <h5>Metadata Extraction Configuration...</h5>
+ <span class="instructions">Choose a metadata extractor
configuration from
+ the list below:
+ </span>
+ <select name="itMetExtractorConfigId"
id="itMetExtractorConfigId">
+ <option value="">Initializing...</option>
+ </select><br/><br/>
+ </div>
+ <div id="itCreateIngestionTaskButton">
+ <span class="instructions">Click here to create an ingestion
task for these files</span>
+ <input type="button" value="Save as Ingestion Task"
onclick="createIngestionTask();"/>
+ </div>
+
+ </div>
+ <div id="ptwbMetadata">
+ <span class="instructions">
+ The following metadata has been defined for this product type.
+ </span>
+ <div class="ptwbMetadataList"></div>
+ </div>
+ </div>
+
+ </wicket:remove>
+
+
+
+<!-- end page content -->
+ </div>
+
+<div id="footer">
+ A Service of the National Cancer Institute<br/><br/>
+ <wicket:link>
+ <a href="http://hhs.gov"; style="text-decoration:none;">
+ <img src="footer_hhs.gif" alt="Department of Health and Human
Services"/>
+ </a>
+
+ <a href="http://nih.gov"; style="text-decoration:none;">
+ <img src="footer_nih.gif" alt="National Institutes of Health"/>
+ </a>
+ <a href="http://usa.gov"; style="text-decoration:none;">
+ <img src="footer_usagov.gif"/>
+ </a>
+ </wicket:link>
+</div>
+
+ <wicket:link>
+ <link rel="stylesheet" type="text/css"
href="edrn-informatics_wicket.css"/>
+ </wicket:link>
+
+ <wicket:remove>
+ <link rel="stylesheet" type="text/css" href="edrn-informatics.css"/>
+ </wicket:remove>
+
+</body>
+</html>
+
\ No newline at end of file
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/bg-body.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/bg-body.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/bg-body.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css?rev=1697447&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics.css
Mon Aug 24 16:12:06 2015
@@ -0,0 +1,406 @@
+@CHARSET "UTF-8";
+
+html, body {
+ padding:0px;
+ margin:0px auto;
+ background:transparent url(bg-body.gif) repeat-x scroll 0 0;
+ background-color:#fff;
+ font-family:"Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
+ font-size:14px;
+}
+
+/**
+ * DIV.NCIBANNER
+ * This is the red National Cancer Institute header bar
+ */
+div#ncibanner {
+ background:#a90101 none repeat;
+ position:relative;
+}
+div#ncibanner-inner {
+ width:974px;
+ margin:0px auto;
+ position:relative;
+}
+div.#ncibanner-inner a {
+ display:inline;
+}
+div#dcplogo {
+ width:974px;
+ margin:auto;
+}
+h2.ncilogo, h2.nihlogo, h2.cdglogo, h2.dcplogo {
+ border-bottom:0 none;
+ display:block;
+ float:left;
+ margin:0;
+ padding:0;
+ position:relative;
+ text-indent:-9999px;
+}
+
+h2.ncilogo {
+ background:transparent url(l-nci.gif) no-repeat scroll 0 0;
+ height:43px;
+ width:278px;
+}
+h2.cdglogo {
+ background:transparent url(l-cdg.gif) no-repeat scroll 0 0;
+ float:right;
+ height:43px;
+ width:90px;
+}
+h2.nihlogo {
+ background:transparent url(l-nih.gif) no-repeat scroll 0 0;
+ float:right;
+ height:43px;
+ width:173px;
+}
+h2.dcplogo {
+ background:transparent url(l-dcp.gif) no-repeat scroll 0 0;
+ float:right;
+ height:23px;
+ margin:-45px -12px 16px;
+ width:164px;
+}
+
+div#page, div#footer {
+ width:974px;
+ margin:0px auto;
+ position:relative;
+}
+
+/**
+ * DIV.EDRNINFORMATICS
+ * This is the header that preceeds application content.
+ */
+div#edrninformatics {
+ position:relative;
+ margin:auto;
+ width:974px;
+}
+
+/**
+ * DIV.CAS-HEADER
+ * This is the header that precedes application content.
+ */
+div#edrninformatics.cas-header {
+ background:url(blackfade-syncd.jpg) scroll 0px 0px repeat-x;
+}
+div#edrninformatics.cas-header div.menu {
+ padding-top:50px;
+}
+
+/**
+ * DIV.CAS-LOGO-LEFT
+ * This is the NCI/EDRN logo div which lives inside DIV.EDRNINFORMATICS.
+ */
+div#edrnlogo.cas-logo-left {
+ background:url(nci-small.jpg) scroll -2px 1px no-repeat;
+ font-size:14px;
+}
+/**
+ * DIV.CAS-LOGO-RIGHT
+ * This is the double-helix graphic
+ */
+div#edrn-dna.cas-logo-right {
+ background:url(edrn_dna-bigger.jpg) scroll left top no-repeat;
+}
+
+
+/**
+ * DIV.EDRNLOGO
+ * This is the NCI/EDRN logo div which lives inside DIV.EDRNINFORMATICS.
+ */
+div#edrnlogo {
+ height:68px;
+ width:974px;
+ margin:0px auto;
+}
+img#edrnlogo-logo {
+ width:64px;
+ margin-top:-20px;
+ padding:3px;
+ margin-right:5px;
+ vertical-align:top;
+ float:left;
+ border:solid 0px #955;
+}
+div#edrnlogo h1.header-title {
+ font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
+ padding-top:25px;
+ padding-bottom:15px;
+ margin-top:15px;
+ line-height:16px;
+ text-align:left;
+ width:974px;
+ font-size:31px;
+ font-weight:bold;
+ border:none;
+}
+div#edrnlogo h2 {
+ color:#222222;
+ font-size:12px;
+ font-style:italic;
+ font-weight:normal;
+ margin:-10px auto 16px;
+}
+div#edrnlogo h2.header-title {
+ padding:auto;
+ margin:-10px auto 16px auto;
+ font-size:12px;
+ font-weight:normal;
+ font-style:italic;
+ color:#222;
+ border:none;
+}
+
+div#edrnlogo span.smaller {
+ font-size:85%;
+ color:#bbb;
+}
+/**
+ * DIV.EDRN-DNA
+ * This is the double-helix graphic
+ */
+div#edrn-dna {
+ position:absolute;
+ top:0px;
+ right:0px;
+ height:67px;
+ width:290px;
+ background:url(edrn_dna-bigger.jpg) scroll left top no-repeat;
+}
+
+
+/**
+ * H2.APP-TITLE
+ * This is the title for the application. It lives on the right-hand side
+ * of DIV.EDRNINFORMATICS.
+ */
+h2.app-title {
+ position:absolute;
+ top:0px;
+ right:0px;
+ background-color:transparent;
+ margin:0px;
+ padding:5px;
+ padding-right:0px;
+ color:#722;
+ font-weight:normal;
+ font-size:13px;
+ font-weight:bold;
+ letter-spacing:0.00em;
+ text-transform:uppercase;
+ z-index:100;
+}
+
+/**
+ * DIV.ERROR
+ * This provides a red 'error' box suitable for displaying error
+ * messages.
+ */
+div.error {
+ background-color:#fcc;
+ padding:5px;
+ margin-right:15px;
+ border:solid 1px #f44;
+}
+
+/**
+ * DIV.SUCCESS
+ * This provides a green 'success' box suitable for displaying
+ * successful messages.
+ */
+div.success {
+ padding:5px;
+ border:solid 1px green;
+ background-color:#cfc;
+ margin-right:10px;
+}
+
+/**
+ * DIV.USERDETAILS
+ * This provides information about the login-status of the user.
+ * It should live within div#edrninformatics
+ */
+div.userdetails {
+ position:relative;
+ text-align:right;
+ width:974px;
+ margin:auto;
+ color:#111;
+ font-size:11px;
+}
+div.userdetails a {
+ text-decoration:underline;
+ color:#444;
+}
+
+/**
+ Overrides required to enable user details to not be overlayed
+ on top of container for the staging/fm area
+**/
+div.container{
+ top:11px;
+}
+
+/**
+ * DIV#BREADCRUMBS
+ * This provides the area for breadcrumbs navigation links
+ */
+
+div#breadcrumbs.cas-breadcrumbs a {
+ color:#333;
+}
+
+div#breadcrumbs {
+ position:relative;
+ margin-top:2px;
+ padding:4px;
+ padding-right:5px;
+ padding-left:5px;
+ border-top:solid 0px #700003;
+ border-bottom:solid 1px #700003;
+ padding-bottom:5px;
+ background-color:#fff;
+ color:#333;
+ font-size:85%;
+}
+div#breadcrumbs ul {
+ list-style:none;
+ margin:0px;
+ padding:0px;
+}
+div#breadcrumbs ul li {
+ display:inline;
+}
+
+div#breadcrumbs ul li a {
+ color:#222;
+ font-weight:normal;
+ text-decoration:underline;
+}
+
+/**
+ * DIV#FOOTER
+ * This provides the standard page footer with links to NCI,NIH,USAGOV
+ * and enterprise-wide informational links (privacy policy, etc).
+ */
+div#footer {
+ font-size:90%;
+ color:#666;
+ text-align:center;
+ margin-top:35px;
+ border-top:solid 1px #ddd;
+ padding-top:15px;
+ padding-bottom:8px;
+}
+div#footer img {
+ border:none;
+ padding-left:2px;
+ margin-left:5px;
+}
+
+/**
+ * HEADERS (H1,H2,H3,......)
+ */
+h2.title {
+ background-color:#555;
+ padding:5px;
+ margin:0px;
+ color:#fff;
+ border-top:solid 2px #900;
+ border-bottom:solid 1px #300;
+ font-weight:normal;
+ font-size:15px;
+}
+
+h2.title a {
+ color:#89b;
+ font-weight:normal;
+ text-decoration:none;
+}
+
+h2.title a:hover {
+ text-decoration:underline;
+ font-weight:normal;
+}
+
+h4 {
+ border-bottom:dotted 1px #888;
+}
+
+
+/**
+ * LOGIN FORM
+ */
+form#login-form {
+ border:solid 0px #f66;
+ background-color:#fff;
+ margin:5px;
+ padding:3px;
+ text-align:center;
+}
+form#login-form h3 {
+ color:#333;
+ margin-top:0px;
+ border-bottom:dotted 0px #444;
+
+}
+form#login-form input[type=text], form#login-form input[type=password] {
+ border:solid 1px #888;
+ padding:3px;
+ width:150px;
+}
+form#login-form table {
+ color:#333;
+ margin:5px;
+ margin-top:0px;
+ border:solid 1px #ccc;
+ width:242px;
+}
+form#login-form input[type=submit] {
+ padding:3px;
+}
+
+/**
+ * .CLR
+ * This is a utility which serves to reset things after a
+ * series of floated elements
+ */
+.clr {
+ clear:both;
+}
+
+div.infoContent {
+ padding:5px;
+}
+
+div#infoNoMetadataExtractorDefined {
+ position:absolute;
+ border:solid 1px #ccc;
+ top:28px;
+ right:-2px;
+ z-index:1000;
+ width:60%;
+ line-height:18px;
+}
+
+div.info {
+ font-size:13px;
+ background-color:#acf;
+ font-family:arial,sans-serif;
+ color:#345;
+ display:none;
+}
+div.info input[type=button] {
+ padding:2px;
+ margin:5px 0px;
+}
+
+#centered{
+ width:50%;
+ margin-left:15%;
+ margin-right:15%;
+}
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css?rev=1697447&view=auto
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
(added)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-informatics_wicket.css
Mon Aug 24 16:12:06 2015
@@ -0,0 +1,406 @@
+@CHARSET "UTF-8";
+
+html, body {
+ padding:0px;
+ margin:0px auto;
+ background:transparent url(../../images/bg-body.gif) repeat-x scroll 0 0;
+ background-color:#fff;
+ font-family:"Lucida Grande","Arial","Helvetica","Verdana","sans-serif";
+ font-size:14px;
+}
+
+/**
+ * DIV.NCIBANNER
+ * This is the red National Cancer Institute header bar
+ */
+div#ncibanner {
+ background:#a90101 none repeat;
+ position:relative;
+}
+div#ncibanner-inner {
+ width:974px;
+ margin:0px auto;
+ position:relative;
+}
+div.#ncibanner-inner a {
+ display:inline;
+}
+div#dcplogo {
+ width:974px;
+ margin:auto;
+}
+h2.ncilogo, h2.nihlogo, h2.cdglogo, h2.dcplogo {
+ border-bottom:0 none;
+ display:block;
+ float:left;
+ margin:0;
+ padding:0;
+ position:relative;
+ text-indent:-9999px;
+}
+
+h2.ncilogo {
+ background:transparent url(../../images/l-nci.gif) no-repeat scroll 0 0;
+ height:43px;
+ width:278px;
+}
+h2.cdglogo {
+ background:transparent url(../../images/l-cdg.gif) no-repeat scroll 0 0;
+ float:right;
+ height:43px;
+ width:90px;
+}
+h2.nihlogo {
+ background:transparent url(../../images/l-nih.gif) no-repeat scroll 0 0;
+ float:right;
+ height:43px;
+ width:173px;
+}
+h2.dcplogo {
+ background:transparent url(../../images/l-dcp.gif) no-repeat scroll 0 0;
+ float:right;
+ height:23px;
+ margin:-45px -12px 16px;
+ width:164px;
+}
+
+div#page, div#footer {
+ width:974px;
+ margin:0px auto;
+ position:relative;
+}
+
+/**
+ * DIV.EDRNINFORMATICS
+ * This is the header that preceeds application content.
+ */
+div#edrninformatics {
+ position:relative;
+ margin:auto;
+ width:974px;
+}
+
+/**
+ * DIV.CAS-HEADER
+ * This is the header that precedes application content.
+ */
+div#edrninformatics.cas-header {
+ background:url(../../images/blackfade-syncd.jpg) scroll 0px 0px repeat-x;
+}
+div#edrninformatics.cas-header div.menu {
+ padding-top:50px;
+}
+
+/**
+ * DIV.CAS-LOGO-LEFT
+ * This is the NCI/EDRN logo div which lives inside DIV.EDRNINFORMATICS.
+ */
+div#edrnlogo.cas-logo-left {
+ background:url(../../images/nci-small.jpg) scroll -2px 1px no-repeat;
+ font-size:14px;
+}
+/**
+ * DIV.CAS-LOGO-RIGHT
+ * This is the double-helix graphic
+ */
+div#edrn-dna.cas-logo-right {
+ background:url(../../images/edrn_dna-bigger.jpg) scroll left top no-repeat;
+}
+
+
+/**
+ * DIV.EDRNLOGO
+ * This is the NCI/EDRN logo div which lives inside DIV.EDRNINFORMATICS.
+ */
+div#edrnlogo {
+ height:68px;
+ width:974px;
+ margin:0px auto;
+}
+img#edrnlogo-logo {
+ width:64px;
+ margin-top:-20px;
+ padding:3px;
+ margin-right:5px;
+ vertical-align:top;
+ float:left;
+ border:solid 0px #955;
+}
+div#edrnlogo h1.header-title {
+ font-family:"Helvetica Neue",Helvetica,Arial,sans-serif;
+ padding-top:25px;
+ padding-bottom:15px;
+ margin-top:15px;
+ line-height:16px;
+ text-align:left;
+ width:974px;
+ font-size:31px;
+ font-weight:bold;
+ border:none;
+}
+div#edrnlogo h2 {
+ color:#222222;
+ font-size:12px;
+ font-style:italic;
+ font-weight:normal;
+ margin:-10px auto 16px;
+}
+div#edrnlogo h2.header-title {
+ padding:auto;
+ margin:-10px auto 16px auto;
+ font-size:12px;
+ font-weight:normal;
+ font-style:italic;
+ color:#222;
+ border:none;
+}
+
+div#edrnlogo span.smaller {
+ font-size:85%;
+ color:#bbb;
+}
+/**
+ * DIV.EDRN-DNA
+ * This is the double-helix graphic
+ */
+div#edrn-dna {
+ position:absolute;
+ top:0px;
+ right:0px;
+ height:67px;
+ width:290px;
+ background:url(../../images/edrn_dna-bigger.jpg) scroll left top no-repeat;
+}
+
+
+/**
+ * H2.APP-TITLE
+ * This is the title for the application. It lives on the right-hand side
+ * of DIV.EDRNINFORMATICS.
+ */
+h2.app-title {
+ position:absolute;
+ top:0px;
+ right:0px;
+ background-color:transparent;
+ margin:0px;
+ padding:5px;
+ padding-right:0px;
+ color:#722;
+ font-weight:normal;
+ font-size:13px;
+ font-weight:bold;
+ letter-spacing:0.00em;
+ text-transform:uppercase;
+ z-index:100;
+}
+
+/**
+ * DIV.ERROR
+ * This provides a red 'error' box suitable for displaying error
+ * messages.
+ */
+div.error {
+ background-color:#fcc;
+ padding:5px;
+ margin-right:15px;
+ border:solid 1px #f44;
+}
+
+/**
+ * DIV.SUCCESS
+ * This provides a green 'success' box suitable for displaying
+ * successful messages.
+ */
+div.success {
+ padding:5px;
+ border:solid 1px green;
+ background-color:#cfc;
+ margin-right:10px;
+}
+
+/**
+ * DIV.USERDETAILS
+ * This provides information about the login-status of the user.
+ * It should live within div#edrninformatics
+ */
+div.userdetails {
+ position:relative;
+ text-align:right;
+ width:974px;
+ margin:auto;
+ color:#111;
+ font-size:11px;
+}
+div.userdetails a {
+ text-decoration:underline;
+ color:#444;
+}
+
+/**
+ Overrides required to enable user details to not be overlayed
+ on top of container for the staging/fm area
+**/
+div.container{
+ top:11px;
+}
+
+/**
+ * DIV#BREADCRUMBS
+ * This provides the area for breadcrumbs navigation links
+ */
+
+div#breadcrumbs.cas-breadcrumbs a {
+ color:#333;
+}
+
+div#breadcrumbs {
+ position:relative;
+ margin-top:2px;
+ padding:4px;
+ padding-right:5px;
+ padding-left:5px;
+ border-top:solid 0px #700003;
+ border-bottom:solid 1px #700003;
+ padding-bottom:5px;
+ background-color:#fff;
+ color:#333;
+ font-size:85%;
+}
+div#breadcrumbs ul {
+ list-style:none;
+ margin:0px;
+ padding:0px;
+}
+div#breadcrumbs ul li {
+ display:inline;
+}
+
+div#breadcrumbs ul li a {
+ color:#222;
+ font-weight:normal;
+ text-decoration:underline;
+}
+
+/**
+ * DIV#FOOTER
+ * This provides the standard page footer with links to NCI,NIH,USAGOV
+ * and enterprise-wide informational links (privacy policy, etc).
+ */
+div#footer {
+ font-size:90%;
+ color:#666;
+ text-align:center;
+ margin-top:35px;
+ border-top:solid 1px #ddd;
+ padding-top:15px;
+ padding-bottom:8px;
+}
+div#footer img {
+ border:none;
+ padding-left:2px;
+ margin-left:5px;
+}
+
+/**
+ * HEADERS (H1,H2,H3,......)
+ */
+h2.title {
+ background-color:#555;
+ padding:5px;
+ margin:0px;
+ color:#fff;
+ border-top:solid 2px #900;
+ border-bottom:solid 1px #300;
+ font-weight:normal;
+ font-size:15px;
+}
+
+h2.title a {
+ color:#89b;
+ font-weight:normal;
+ text-decoration:none;
+}
+
+h2.title a:hover {
+ text-decoration:underline;
+ font-weight:normal;
+}
+
+h4 {
+ border-bottom:dotted 1px #888;
+}
+
+
+/**
+ * LOGIN FORM
+ */
+form#login-form {
+ border:solid 0px #f66;
+ background-color:#fff;
+ margin:5px;
+ padding:3px;
+ text-align:center;
+}
+form#login-form h3 {
+ color:#333;
+ margin-top:0px;
+ border-bottom:dotted 0px #444;
+
+}
+form#login-form input[type=text], form#login-form input[type=password] {
+ border:solid 1px #888;
+ padding:3px;
+ width:150px;
+}
+form#login-form table {
+ color:#333;
+ margin:5px;
+ margin-top:0px;
+ border:solid 1px #ccc;
+ width:242px;
+}
+form#login-form input[type=submit] {
+ padding:3px;
+}
+
+/**
+ * .CLR
+ * This is a utility which serves to reset things after a
+ * series of floated elements
+ */
+.clr {
+ clear:both;
+}
+
+div.infoContent {
+ padding:5px;
+}
+
+div#infoNoMetadataExtractorDefined {
+ position:absolute;
+ border:solid 1px #ccc;
+ top:28px;
+ right:-2px;
+ z-index:1000;
+ width:60%;
+ line-height:18px;
+}
+
+div.info {
+ font-size:13px;
+ background-color:#acf;
+ font-family:arial,sans-serif;
+ color:#345;
+ display:none;
+}
+div.info input[type=button] {
+ padding:2px;
+ margin:5px 0px;
+}
+
+#centered{
+ width:50%;
+ margin-left:15%;
+ margin-right:15%;
+}
\ No newline at end of file
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-logo.png
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-logo.png?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/edrn-logo.png
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_hhs.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_hhs.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_hhs.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_nih.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_nih.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_nih.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_usagov.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_usagov.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/footer_usagov.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-cdg.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-cdg.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-cdg.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-dcp.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-dcp.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-dcp.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nci.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nci.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nci.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nih.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nih.gif?rev=1697447&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/l-nih.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml?rev=1697447&r1=1697446&r2=1697447&view=diff
==============================================================================
--- oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml (original)
+++ oodt/trunk/curator/webapp/src/main/webapp/META-INF/context.xml Mon Aug 24
16:12:06 2015
@@ -45,6 +45,9 @@ the License.
<Parameter name="org.apache.oodt.cas.curator.metExtension"
value=".met"/>
+ <!-- switch to edrn to see the NCI Early Detection Research Network
+ curator skin
+ -->
<Parameter name="org.apache.oodt.cas.curator.skin"
value=""/>
