Author: mattmann
Date: Sun Aug 23 15:56:47 2015
New Revision: 1697203
URL: http://svn.apache.org/r1697203
Log:
- OODT-842 WIP
- restore blackfade-syncd.jpg
- fix jquery.alerts.css images (info, help, important, title)
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/blackfade-syncd.jpg
(with props)
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/help.gif
(with props)
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/important.gif
(with props)
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/CurationApp.java
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
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=1697203&r1=1697202&r2=1697203&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
Sun Aug 23 15:56:47 2015
@@ -48,6 +48,10 @@ public class CurationApp extends WebAppl
resName).getSharedResourceKey());
}
}
+
+ mountSharedResource("/images/blackfade-syncd.jpg",
+ new ResourceReference(HomePage.class, "blackfade-syncd.jpg")
+ .getSharedResourceKey());
}
@Override
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css?rev=1697203&r1=1697202&r2=1697203&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.css
Sun Aug 23 15:56:47 2015
@@ -26,8 +26,7 @@ div#cas-header {
text-align:right;
border-bottom:solid 1px #000;
overflow:none;
- background:url(../../img/blackfade-syncd.jpg) scroll 0px 0px repeat-x;
- background-color:#000;
+ background:url(blackfade-syncd.jpg) scroll 0px 0px repeat-x;
}
/* DIV.CAS-LOGO-LEFT */
Modified:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html?rev=1697203&r1=1697202&r2=1697203&view=diff
==============================================================================
---
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
(original)
+++
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/HomePage.html
Sun Aug 23 15:56:47 2015
@@ -20,11 +20,14 @@
<title>Apache OODT Curation Interface</title>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<wicket:link>
- <link type="text/css" rel="stylesheet" href="HomePage.css"/>
+ <link type="text/css" rel="stylesheet" href="HomePage_wicket.css"/>
</wicket:link>
+<wicket:remove>
+ <link type="text/css" rel="stylesheet" href="HomePage.css"/>
+</wicket:remove>
</head>
-<body onload="refreshIngestTaskList();registerIngestionTaskListener();">
+<body>
<div id="page">
<div id="cas-header">
<div id="cas-logo-left"><!-- cas logo lhs --></div>
@@ -54,7 +57,7 @@
<!-- so that it previews right -->
<wicket:remove>
- <link type="text/css" rel="stylesheet" href="workbench/Workbench.css"/>
+ <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">
Added:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/blackfade-syncd.jpg
URL:
http://svn.apache.org/viewvc/oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/blackfade-syncd.jpg?rev=1697203&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/curator/webapp/src/main/java/org/apache/oodt/cas/curation/blackfade-syncd.jpg
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html?rev=1697203&r1=1697202&r2=1697203&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/Workbench.html
Sun Aug 23 15:56:47 2015
@@ -2,7 +2,7 @@
<wicket:panel>
<wicket:link>
<link type="text/css" rel="stylesheet" href="Workbench_wicket.css"/>
- <link type="text/css" rel="stylesheet" href="jquery.alerts.css"/>
+ <link type="text/css" rel="stylesheet" href="jquery.alerts_wicket.css"/>
<script type="text/javascript" src="jquery-1.3.2.js"></script>
<script type="text/javascript" src="jquery-ui-1.7.2.full.min.js"></script>
<script type="text/javascript" src="jquery.periodicalupdater.js"></script>
@@ -12,6 +12,7 @@
<wicket:remove>
<link type="text/css" rel="stylesheet" href="Workbench.css"/>
+ <link type="text/css" rel="stylesheet" href="jquery.alerts.css"/>
</wicket:remove>
<div class="page">
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/help.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/help.gif?rev=1697203&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/help.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/important.gif
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/important.gif?rev=1697203&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/important.gif
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css?rev=1697203&r1=1697202&r2=1697203&view=diff
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
(original)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts.css
Sun Aug 23 15:56:47 2015
@@ -34,7 +34,7 @@
text-align: center;
line-height: 1.75em;
color: #666;
- background: #CCC url(images/title.gif) top repeat-x;
+ background: #CCC url(title.gif) top repeat-x;
border: solid 1px #FFF;
border-bottom: solid 1px #999;
cursor: default;
@@ -43,21 +43,21 @@
}
#popup_content {
- background: 16px 16px no-repeat url(images/info.gif);
+ background: 16px 16px no-repeat url(info.gif);
padding: 1em 1.75em;
margin: 0em;
}
#popup_content.alert {
- background-image: url(images/info.gif);
+ background-image: url(info.gif);
}
#popup_content.confirm {
- background-image: url(images/important.gif);
+ background-image: url(important.gif);
}
#popup_content.prompt {
- background-image: url(images/help.gif);
+ background-image: url(help.gif);
}
#popup_message {
Added:
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
URL:
http://svn.apache.org/viewvc/oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css?rev=1697203&view=auto
==============================================================================
---
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
(added)
+++
oodt/trunk/webapp/components/src/main/java/org/apache/oodt/cas/webcomponents/curation/workbench/jquery.alerts_wicket.css
Sun Aug 23 15:56:47 2015
@@ -0,0 +1,77 @@
+/*
+ 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.
+*/
+
+#popup_container {
+ font-family: Arial, sans-serif;
+ font-size: 12px;
+ min-width: 300px; /* Dialog will be no smaller than this */
+ max-width: 600px; /* Dialog will wrap after this width */
+ background: #FFF;
+ border: solid 5px #999;
+ color: #000;
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+}
+
+#popup_title {
+ font-size: 14px;
+ font-weight: bold;
+ text-align: center;
+ line-height: 1.75em;
+ color: #666;
+ background: #CCC url(../../images/title.gif) top repeat-x;
+ border: solid 1px #FFF;
+ border-bottom: solid 1px #999;
+ cursor: default;
+ padding: 0em;
+ margin: 0em;
+}
+
+#popup_content {
+ background: 16px 16px no-repeat url(../../images/info.gif);
+ padding: 1em 1.75em;
+ margin: 0em;
+}
+
+#popup_content.alert {
+ background-image: url(../../images/info.gif);
+}
+
+#popup_content.confirm {
+ background-image: url(../../images/important.gif);
+}
+
+#popup_content.prompt {
+ background-image: url(../../images/help.gif);
+}
+
+#popup_message {
+ padding-left: 48px;
+}
+
+#popup_panel {
+ text-align: center;
+ margin: 1em 0em 0em 1em;
+}
+
+#popup_prompt {
+ margin: .5em 0em;
+}
+.popup_multiPrompt {
+ margin: 0.5em 0em;
+}
