You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@isis.apache.org by da...@apache.org on 2012/11/21 01:27:34 UTC
svn commit: r1411954 - in /isis/trunk/framework/viewer:
dnd-tck/ide/eclipse/launch/ html-tck/ide/eclipse/launch/
scimpi/scimpi-tck/ide/eclipse/launch/ wicket/wicket-tck/ide/eclipse/launch/
wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui...
Author: danhaywood
Date: Wed Nov 21 00:27:33 2012
New Revision: 1411954
URL: http://svn.apache.org/viewvc?rev=1411954&view=rev
Log:
finding lost changes :-(
Modified:
isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch
isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch
isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch
isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
Modified: isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch?rev=1411954&r1=1411953&r2=1411954&view=diff
==============================================================================
--- isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch (original)
+++ isis/trunk/framework/viewer/dnd-tck/ide/eclipse/launch/viewer-dnd-tck.launch Wed Nov 21 00:27:33 2012
@@ -1,20 +1,20 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.runtime/src/main/java/org/apache/isis/Isis.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration --viewer dnd"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.dnd-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.runtime/src/main/java/org/apache/isis/Isis.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.Isis"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROGRAM_ARGUMENTS" value="--type exploration --viewer dnd"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.dnd-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Modified: isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch?rev=1411954&r1=1411953&r2=1411954&view=diff
==============================================================================
--- isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch (original)
+++ isis/trunk/framework/viewer/html-tck/ide/eclipse/launch/viewer-html-tck.launch Wed Nov 21 00:27:33 2012
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.html-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.html-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Modified: isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch?rev=1411954&r1=1411953&r2=1411954&view=diff
==============================================================================
--- isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch (original)
+++ isis/trunk/framework/viewer/scimpi/scimpi-tck/ide/eclipse/launch/viewer-scimpi-tck.launch Wed Nov 21 00:27:33 2012
@@ -1,16 +1,16 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.scimpi-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.scimpi-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Modified: isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch?rev=1411954&r1=1411953&r2=1411954&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch (original)
+++ isis/trunk/framework/viewer/wicket/wicket-tck/ide/eclipse/launch/viewer-wicket-tck.launch Wed Nov 21 00:27:33 2012
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
-<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
-</listAttribute>
-<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
-<listEntry value="1"/>
-</listAttribute>
-<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
-<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
-</mapAttribute>
-<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
-<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
-<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
-<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
-<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.wicket-tck"/>
-<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
-</launchConfiguration>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<launchConfiguration type="org.eclipse.jdt.launching.localJavaApplication">
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
+<listEntry value="/org.apache.isis.runtimes.dflt.webserver/src/main/java/org/apache/isis/WebServer.java"/>
+</listAttribute>
+<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
+<listEntry value="1"/>
+</listAttribute>
+<mapAttribute key="org.eclipse.debug.core.preferred_launchers">
+<mapEntry key="[debug]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+<mapEntry key="[run]" value="org.eclipse.jdt.launching.localJavaApplication"/>
+</mapAttribute>
+<stringAttribute key="org.eclipse.debug.core.source_locator_id" value="org.eclipse.jdt.launching.sourceLocator.JavaSourceLookupDirector"/>
+<booleanAttribute key="org.eclipse.jdt.debug.ui.INCLUDE_EXTERNAL_JARS" value="true"/>
+<stringAttribute key="org.eclipse.jdt.launching.CLASSPATH_PROVIDER" value="org.eclipse.m2e.launchconfig.classpathProvider"/>
+<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value="org.apache.isis.WebServer"/>
+<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="org.apache.isis.viewer.wicket-tck"/>
+<stringAttribute key="org.eclipse.jdt.launching.SOURCE_PATH_PROVIDER" value="org.eclipse.m2e.launchconfig.sourcepathProvider"/>
+</launchConfiguration>
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css?rev=1411954&r1=1411953&r2=1411954&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/collectioncontents/ajaxtable/CollectionContentsAsAjaxTablePanel.css Wed Nov 21 00:27:33 2012
@@ -18,21 +18,22 @@
*/
.collectionContentsAsAjaxTablePanel table.contents {
- margin-bottom: 10px;
- border-bottom: 1px solid #407098;
- font-size: 1em;
- font-family: arial;
- width: 99%
+ font-size: 0.9em;
+ width: 100%;
+ border-collapse:collapse;
+ margin-top:10px;
}
.collectionContentsAsAjaxTablePanel table.contents caption { text-align: left; }
.collectionContentsAsAjaxTablePanel table.contents tr {
- padding-top: 2px;
- padding-bottom: 2px;
}
-.collectionContentsAsAjaxTablePanel table.contents tr.even { background-color: #fff; }
-.collectionContentsAsAjaxTablePanel table.contents tr.odd { background-color: #eee; }
+.collectionContentsAsAjaxTablePanel table.contents tr.even { background-color: #FFFFFF; }
+.collectionContentsAsAjaxTablePanel table.contents tr.odd { background-color: #F0EFEA; }
+
+.collectionContentsAsAjaxTablePanel table.contents tr:hover td {
+ background-color:#D2F0F3;
+}
.collectionContentsAsAjaxTablePanel table.contents tr td {
padding-left: 8px;
@@ -41,17 +42,12 @@
padding-right: 4px;
}
.collectionContentsAsAjaxTablePanel table.contents tr th {
- color: A66144;
- padding-top: 3px;
- padding-bottom: 3px;
- padding-left: 8px;
- padding-right: 10px;
- background-color: #EEEEEE;
- border-top: 1px solid #407098;
+ color: #FFFFFF;
+ background-color: #46423C;
text-align: left;
white-space: nowrap;
- background-position: right;
- background-repeat:no-repeat;
+ text-transform:uppercase;
+ font-weight:bold;
}
.collectionContentsAsAjaxTablePanel table.contents tr th.wicket_orderDown {
@@ -82,8 +78,8 @@
.collectionContentsAsAjaxTablePanel table.contents tbody td,
.collectionContentsAsAjaxTablePanel table.contents thead th {
- border-left: 1px #DDD solid;
- border-right: 1px #DDD solid;
+ padding:5px;
+ text-transform:uppercase;
}
.collectionContentsAsAjaxTablePanel table.contents tr.navigation div.navigatorLabel {
@@ -114,3 +110,17 @@
.collectionContentsAsAjaxTablePanel table.contents .navigator .goto em {
background-color: #DDD;
}
+
+.collectionContentsAsAjaxTablePanel table.contents a {
+ color:#46423C;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents a:hover {
+ text-decoration:underline;
+ color:#20B5C2;
+}
+
+.collectionContentsAsAjaxTablePanel table.contents .entityLinkSelect2Panel .entityImage {
+ vertical-align:text-bottom;
+ padding-right:5px;
+}
Modified: isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
URL: http://svn.apache.org/viewvc/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html?rev=1411954&r1=1411953&r2=1411954&view=diff
==============================================================================
--- isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html (original)
+++ isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html Wed Nov 21 00:27:33 2012
@@ -32,23 +32,23 @@
<body>
<div id="container" class="page">
-
- <div id="header">
- <h1><span wicket:id="applicationName">[application name]</span></h1>
- </div>
- <div id="secondaryMenu">
- <div class="links">
- <span>logged in as: </span><span wicket:id="userName">[username]</span>
- |
- <a href="#" wicket:id="logoutLink">logout</a>
- |
- <a href="#" wicket:id="aboutLink">about</a>
+ <div class="headerContainer">
+ <div id="header">
+ <h1><span wicket:id="applicationName">[application name]</span></h1>
+ </div>
+ <div id="secondaryMenu">
+ <div class="links">
+ <span wicket:id="userName">[username]</span>
+ <a href="#" wicket:id="logoutLink">logout</a>
+ <a href="#" wicket:id="aboutLink">about</a>
+ </div>
</div>
- </div>
<div class="clear"/>
<div wicket:id="applicationActions" id="applicationActions"></div>
+
+ </div>
<div id="body">
<wicket:child/>