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/10/17 01:20:23 UTC
svn commit: r1399041 - in /incubator/isis/trunk/framework/viewer/wicket: ./
src/site/ wicket-applib/
wicket-applib/src/main/java/org/apache/isis/viewer/wicket/applib/
wicket-applib/src/site/ wicket-applib/src/site/apt/ wicket-metamodel/
wicket-metamode...
Author: danhaywood
Date: Tue Oct 16 23:20:22 2012
New Revision: 1399041
URL: http://svn.apache.org/viewvc?rev=1399041&view=rev
Log:
ISIS-232: more tidy up of Wicket
* tidying up the CSS
* removing the wicket-applib and wicket-metamodel modules, since not used/almost empty
Removed:
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/NOTICE
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/pom.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/src/main/java/org/apache/isis/viewer/wicket/applib/CssClass.java
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/src/main/java/org/apache/isis/viewer/wicket/applib/WizardPageDescription.java
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/src/site/apt/index.apt
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/src/site/apt/jottings.apt
incubator/isis/trunk/framework/viewer/wicket/wicket-applib/src/site/site.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/NOTICE
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/pom.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionAnnotationFacetFactory.java
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacet.java
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAbstract.java
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/main/java/org/apache/isis/viewer/wicket/metamodel/wizardpagedesc/WizardPageDescriptionFacetAnnotation.java
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/site/apt/index.apt
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/site/apt/jottings.apt
incubator/isis/trunk/framework/viewer/wicket/wicket-metamodel/src/site/site.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanel.css
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanel.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/wizardpagedesc/WizardPageDescriptionPanelFactory.java
Modified:
incubator/isis/trunk/framework/viewer/wicket/pom.xml
incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-model/pom.xml
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
Modified: incubator/isis/trunk/framework/viewer/wicket/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/pom.xml?rev=1399041&r1=1399040&r2=1399041&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/pom.xml Tue Oct 16 23:20:22 2012
@@ -51,9 +51,7 @@
<url>http://incubator.apache.org/isis/${relativeUrl}</url>
<modules>
- <module>wicket-applib</module>
<module>wicket-model</module>
- <module>wicket-metamodel</module>
<module>wicket-ui</module>
<module>wicket-viewer</module>
<module>wicket-tck</module>
@@ -83,30 +81,6 @@
<!-- Apache Isis Wicket Viewer -->
<dependency>
<groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-applib</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-applib</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-metamodel</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-metamodel</artifactId>
- <version>0.3.1-incubating-SNAPSHOT</version>
- <scope>test</scope>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>org.apache.isis.viewer</groupId>
<artifactId>wicket-model</artifactId>
<version>0.3.1-incubating-SNAPSHOT</version>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml?rev=1399041&r1=1399040&r2=1399041&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/src/site/site.xml Tue Oct 16 23:20:22 2012
@@ -40,8 +40,6 @@
</menu>
<menu name="Wicket Modules">
- <item name="Applib" href="./wicket-applib/index.html" />
- <item name="Metamodel" href="./wicket-metamodel/index.html" />
<item name="Model" href="./wicket-model/index.html" />
<item name="UI" href="./wicket-ui/index.html" />
<item name="Viewer" href="./wicket-viewer/index.html" />
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/pom.xml?rev=1399041&r1=1399040&r2=1399041&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/pom.xml (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/pom.xml Tue Oct 16 23:20:22 2012
@@ -40,11 +40,6 @@
<dependencies>
<dependency>
- <groupId>org.apache.isis.viewer</groupId>
- <artifactId>wicket-metamodel</artifactId>
- </dependency>
-
- <dependency>
<groupId>org.apache.wicket</groupId>
<artifactId>wicket-core</artifactId>
</dependency>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css?rev=1399041&r1=1399040&r2=1399041&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/cssmenu/CssMenuPanel.css Tue Oct 16 23:20:22 2012
@@ -19,13 +19,8 @@
.cssMenuPanel span.clear {
line-height: 3px;
}
-
-
-#applicationActions .menuh {
- background-color: #EEEEEE;
-}
-.menuh
+.cssMenuPanel .menuh
{
font-family: arial, helvetica, sans-serif;
float:left;
@@ -34,12 +29,12 @@
width:100%;
}
-.menuh .small {
+.cssMenuPanel .menuh .small {
float:none;
display: inline;
}
-.menuh p .small {
+.cssMenuPanel .menuh p .small {
float:none;
display: inline;
}
@@ -57,61 +52,54 @@
cursor:default;
}
-.menuh a:link, .menuh a:visited, .menuh a:active, .menuh p /* menu at rest */
- {
+.cssMenuPanel .menuh a:link,
+.cssMenuPanel .menuh a:visited,
+.cssMenuPanel .menuh a:active,
+.cssMenuPanel .menuh p {
color: #00477F;
background-color: #EEEEEE;
text-decoration:none;
-/* -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px; */
- }
+}
-.menuh a:hover, .menuh p:hover /* menu on mouse-over */
- {
+.cssMenuPanel .menuh a:hover,
+.cssMenuPanel .menuh p:hover {
color: #D7E7F5;
background-color: #407098;
- }
+}
-.menuh a:hover /* menu on mouse-over */
- {
+.cssMenuPanel .menuh a:hover {
text-decoration:underline;
- }
-
+}
-.menuh a.top-parent, .menuh p.top-parent /* attaches down-arrow to all top-parents */
- {
+.cssMenuPanel .menuh a.top-parent,
+.cssMenuPanel .menuh p.top-parent {
background-image: url(navdown_secondarydark.gif);
background-position: right center;
background-repeat: no-repeat;
-/* -moz-border-radius: 6px;
- -webkit-border-radius: 6px;
- border-radius: 6px; */
}
-.menuh a.top-parent:hover, .menuh p.top-parent:hover /* attaches down-arrow to all top-parents */
- {
+.cssMenuPanel .menuh a.top-parent:hover,
+.cssMenuPanel .menuh p.top-parent:hover {
background-image: url(navdown_primarypale.gif);
background-position: right center;
background-repeat: no-repeat;
- }
+}
-.menuh a.parent, .menuh p.parent /* attaches side-arrow to all parents */
- {
+.cssMenuPanel .menuh a.parent,
+.cssMenuPanel .menuh p.parent {
background-image: url(nav_secondarydark.gif);
background-position: right center;
background-repeat: no-repeat;
- }
+}
-.menuh a.parent:hover, .menuh p.parent:hover /* attaches side-arrow to all parents */
- {
+.cssMenuPanel .menuh a.parent:hover,
+.cssMenuPanel .menuh p.parent:hover {
background-image: url(nav_primarypale.gif);
background-position: right center;
background-repeat: no-repeat;
- }
+}
-.menuh ul
- {
+.cssMenuPanel .menuh ul {
list-style:none;
margin:0;
padding:0;
@@ -119,157 +107,122 @@
display: inline;
}
-.menuh li
- {
+.cssMenuPanel .menuh li {
position:relative;
min-height: 1px;
}
-.menuh ul ul
- {
+.cssMenuPanel .menuh ul ul {
position:absolute;
z-index:500;
top:auto;
display:none;
padding: 1em;
margin:-1em 0 0 -1em;
- }
+}
-.menuh ul ul ul
- {
+.cssMenuPanel .menuh ul ul ul {
top:0;
left:100%;
- }
+}
-span.menuh a:hover
- {
+.cssMenuPanel span.menuh a:hover {
cursor:pointer;
z-index:100;
- }
-
-span.menuh li:hover ul ul,
-span.menuh li li:hover ul ul,
-span.menuh li li li:hover ul ul,
-span.menuh li li li li:hover ul ul
-{display:none;}
-
-span.menuh li:hover ul,
-span.menuh li li:hover ul,
-span.menuh li li li:hover ul,
-span.menuh li li li li:hover ul
-{display:block;}
-
-
-
-li.cssSubMenuItem p.disabled {
- color: gray;
-}
-
-
-/** TODO: tidy up this gunk, was experimenting in inlining; it may not be needed */
-
-.small .menuh
-{
- float:none;
}
-.small .cssMenuItemsPanel
-{
- float:none;
+.cssMenuPanel span.menuh li:hover ul ul,
+.cssMenuPanel span.menuh li li:hover ul ul,
+.cssMenuPanel span.menuh li li li:hover ul ul,
+.cssMenuPanel span.menuh li li li li:hover ul ul {
+ display:none;
}
-.small p.top-parent
-{
- display:inline;
- position: relative;
+.cssMenuPanel span.menuh li:hover ul,
+.cssMenuPanel span.menuh li li:hover ul,
+.cssMenuPanel span.menuh li li li:hover ul,
+.cssMenuPanel span.menuh li li li li:hover ul {
+ display:block;
}
-.small li.cssMenuItemPanel {
- display:inline;
-}
-.small ul {
- position: relative;
- display:inline;
+.cssMenuPanel li.cssSubMenuItem p.disabled {
+ color: gray;
}
+/******** overrides for grouped actions and entity actions ***************/
-.groupedActions li.cssMenuItemPanel > p.top-parent {
+.groupedActions .cssMenuPanel li.cssMenuItemPanel > p.top-parent {
display:none;
}
-.groupedActions .menuh ul ul {
+.groupedActions .cssMenuPanel .menuh ul ul {
position: relative;
display: inline-block;
}
-.groupedActions .menuh li,
-.groupedActions .menuh li p {
+.groupedActions .cssMenuPanel .menuh li,
+.groupedActions .cssMenuPanel .menuh li p {
display: inline;
}
-.groupedActions .menuh a,
-.groupedActions .menuh p {
+.groupedActions .cssMenuPanel .menuh a,
+.groupedActions .cssMenuPanel .menuh p {
display: inline-block;
border: none;
}
-.groupedActions .menuh a:link,
-.groupedActions .menuh a:visited,
-.groupedActions .menuh a:active,
-.groupedActions .menuh p {
+.groupedActions .cssMenuPanel .menuh a:link,
+.groupedActions .cssMenuPanel .menuh a:visited,
+.groupedActions .cssMenuPanel .menuh a:active,
+.groupedActions .cssMenuPanel .menuh p {
background-color: #fff;
}
-.groupedActions .menuh a:hover,
-.groupedActions .menuh p:hover {
+.groupedActions .cssMenuPanel .menuh a:hover,
+.groupedActions .cssMenuPanel .menuh p:hover {
color: #000;
}
-.entityActions li.cssMenuItemPanel > p.top-parent {
+
+
+.entityActions .cssMenuPanel li.cssMenuItemPanel > p.top-parent {
display:none;
}
-.entityActions .menuh ul ul {
+.entityActions .cssMenuPanel .menuh ul ul {
position: relative;
display: inline-block;
}
-.entityActions .menuh li,
-.entityActions .menuh li p {
+.entityActions .cssMenuPanel .menuh li,
+.entityActions .cssMenuPanel .menuh li p {
display: inline;
}
-.entityActions .menuh a,
-.entityActions .menuh p {
+.entityActions .cssMenuPanel .menuh a,
+.entityActions .cssMenuPanel .menuh p {
display: inline-block;
border: none;
}
-
-
-.entityActions .menuh a:link,
-.entityActions .menuh a:visited,
-.entityActions .menuh a:active,
-.entityActions .menuh p {
+.entityActions .cssMenuPanel .menuh a:link,
+.entityActions .cssMenuPanel .menuh a:visited,
+.entityActions .cssMenuPanel .menuh a:active,
+.entityActions .cssMenuPanel .menuh p {
background-color: #fff;
}
-.entityActions .menuh a:focus {
+.entityActions .cssMenuPanel .menuh a:focus {
text-decoration: underline;
}
-.entityActions .menuh a:hover,
-.entityActions .menuh p:hover {
+.entityActions .cssMenuPanel .menuh a:hover,
+.entityActions .cssMenuPanel .menuh p:hover {
color: #000;
}
-
-/* End CSS Drop Down Menu */
-
-
-
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css?rev=1399041&r1=1399040&r2=1399041&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.css Tue Oct 16 23:20:22 2012
@@ -76,6 +76,11 @@
width: 520px;
}
+/**************** APPLICATION MENU **************/
+
+#applicationActions .menuh {
+ background-color: #EEEEEE;
+}
/**************** ELEMENTS **************/
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java?rev=1399041&r1=1399040&r2=1399041&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-viewer/src/main/java/org/apache/isis/viewer/wicket/viewer/registries/components/ComponentFactoryRegistrarDefault.java Tue Oct 16 23:20:22 2012
@@ -73,7 +73,6 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.components.scalars.reference.ReferencePanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.string.StringPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.value.ValuePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.scalars.wizardpagedesc.WizardPageDescriptionPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.unknown.UnknownModelPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.value.StandaloneValuePanelFactory;
import org.apache.isis.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
@@ -135,7 +134,6 @@ public class ComponentFactoryRegistrarDe
}
private void addBuiltInComponentFactories(final ComponentFactoryList componentFactories) {
- addComponentFactoriesForSpecial(componentFactories);
addComponentFactoriesForWelcomeAndAbout(componentFactories);
addComponentFactoriesForApplicationActions(componentFactories);
addComponentFactoriesForEntity(componentFactories);
@@ -153,12 +151,6 @@ public class ComponentFactoryRegistrarDe
addComponentFactoriesForBreadcrumbs(componentFactories);
addComponentFactoriesForUnknown(componentFactories);
-
- }
-
-
- protected void addComponentFactoriesForSpecial(final ComponentFactoryList componentFactories) {
- componentFactories.add(new WizardPageDescriptionPanelFactory());
}
protected void addComponentFactoriesForWelcomeAndAbout(final ComponentFactoryList componentFactories) {