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:14:31 UTC
svn commit: r1399040 [4/4] - in /incubator/isis/trunk/framework:
runtimes/dflt/webapp/src/main/java/org/apache/isis/runtimes/dflt/webapp/
viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/about/
viewer/wicket/wicket-ui/s...
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/entity/EntityPage.html Tue Oct 16 23:14:24 2012
@@ -29,10 +29,9 @@
</wicket:head>
<body>
<wicket:extend>
-
- <div wicket:id="breadcrumbs"/>
-
- <div wicket:id="entity" class="entityPage">
+ <div class="entityPage">
+ <div wicket:id="breadcrumbs"/>
+ <div wicket:id="entity"/>
</div>
</wicket:extend>
</body>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.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/login/WicketSignInPage.css?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css Tue Oct 16 23:14:24 2012
@@ -17,7 +17,7 @@
* under the License.
*/
- .signIn h2 {
+ .wicketSignInPanel h2 {
margin-top: 50px;
margin-bottom: 20px;
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html Tue Oct 16 23:14:24 2012
@@ -31,7 +31,7 @@
<link href="application.css" rel="stylesheet" type="text/css"/>
</head>
<body>
- <div id="container" class="signIn">
+ <div id="container" class="wicketSignInPanel">
<div id="header">
<h1><span wicket:id="applicationName">[application name]</span></h1>
</div>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.css Tue Oct 16 23:14:24 2012
@@ -16,6 +16,6 @@
* specific language governing permissions and limitations
* under the License.
*/
-.dropDownSelector > p {
+.dropDownSelectorPanel > p {
margin-bottom: 0.8em;
}
\ No newline at end of file
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.html Tue Oct 16 23:14:24 2012
@@ -21,7 +21,7 @@
<html>
<body>
<wicket:panel>
- <div class="dropDownSelector">
+ <div class="dropDownSelectorPanel">
<p wicket:id="views">
<select wicket:id="viewsDropDown"/>
</p>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/dropdown/DropDownSelectorPanelAbstract.java Tue Oct 16 23:14:24 2012
@@ -40,7 +40,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedPanelFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
public abstract class DropDownSelectorPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
@@ -86,7 +86,7 @@ public abstract class DropDownSelectorPa
? new Predicate<ComponentFactory>() {
@Override
public boolean apply(@Nullable ComponentFactory input) {
- return !(input instanceof CollectionContentsAsUnresolvedFactory);
+ return !(input instanceof CollectionContentsAsUnresolvedPanelFactory);
}
}
: Predicates.<ComponentFactory>alwaysTrue();
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.css Tue Oct 16 23:14:24 2012
@@ -17,19 +17,19 @@
* under the License.
*/
-.linksSelector .viewList {
+.linksSelectorPanel .viewList {
font-size: smaller;
}
-.linksSelector .viewList {
+.linksSelectorPanel .viewList {
display: inline;
}
-.linksSelector .viewList span {
+.linksSelectorPanel .viewList span {
margin-right: 8px;
}
-.linksSelector .viewItem {
+.linksSelectorPanel .viewItem {
display: inline;
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.html Tue Oct 16 23:14:24 2012
@@ -21,7 +21,7 @@
<html>
<body>
<wicket:panel>
- <div class="linksSelector">
+ <div class="linksSelectorPanel">
<p wicket:id="views">
<ul wicket:id="viewList" class="viewList">
<li wicket:id="viewItem" class="viewItem">
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java?rev=1399040&r1=1399039&r2=1399040&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/selector/links/LinksSelectorPanelAbstract.java Tue Oct 16 23:14:24 2012
@@ -46,7 +46,7 @@ import org.apache.isis.core.metamodel.sp
import org.apache.isis.viewer.wicket.model.models.EntityCollectionModel;
import org.apache.isis.viewer.wicket.ui.ComponentFactory;
import org.apache.isis.viewer.wicket.ui.ComponentType;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedPanelFactory;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
public abstract class LinksSelectorPanelAbstract<T extends IModel<?>> extends PanelAbstract<T> {
@@ -117,7 +117,7 @@ public abstract class LinksSelectorPanel
}
private String nameFor(final ComponentFactory componentFactory) {
- return componentFactory instanceof CollectionContentsAsUnresolvedFactory ? "hide" : componentFactory.getName();
+ return componentFactory instanceof CollectionContentsAsUnresolvedPanelFactory ? "hide" : componentFactory.getName();
}
};
container.add(listView);
@@ -139,7 +139,7 @@ public abstract class LinksSelectorPanel
? new Predicate<ComponentFactory>() {
@Override
public boolean apply(@Nullable ComponentFactory input) {
- return !(input instanceof CollectionContentsAsUnresolvedFactory);
+ return !(input instanceof CollectionContentsAsUnresolvedPanelFactory);
}
}
: Predicates.<ComponentFactory>alwaysTrue();
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=1399040&r1=1399039&r2=1399040&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:14:24 2012
@@ -33,19 +33,19 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.components.appactions.cssmenu.AppActionsCssMenuFactory;
import org.apache.isis.viewer.wicket.ui.components.bookmarkedpages.BookmarkedPagesPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.collection.CollectionPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTableFactory;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.icons.CollectionContentsAsIconsFactory;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.dropdown.CollectionContentsDropDownSelectorFactory;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.links.CollectionContentsLinksSelectorFactory;
-import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.ajaxtable.CollectionContentsAsAjaxTablePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.icons.CollectionContentsAsIconsPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.dropdown.CollectionContentsDropDownSelectorPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.selector.links.CollectionContentsLinksSelectorPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.collectioncontents.unresolved.CollectionContentsAsUnresolvedPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.empty.EmptyCollectionPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.blocks.icontitle.EntityIconAndTitlePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityCollectionsPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.blocks.propcoll.EntityPropertiesPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.blocks.summary.EntitySummaryPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.collections.EntityCollectionsPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.entity.combined.EntityCombinedPanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.selector.dropdown.EntityDropDownSelectorFactory;
-import org.apache.isis.viewer.wicket.ui.components.entity.selector.links.EntityLinksSelectorFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.header.EntityHeaderPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.icontitle.EntityIconAndTitlePanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.properties.EntityPropertiesPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.dropdown.EntityDropDownSelectorPanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.entity.selector.links.EntityLinksSelectorPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisColorPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDatePanelFactory;
import org.apache.isis.viewer.wicket.ui.components.scalars.isisapplib.IsisDateTimePanelFactory;
@@ -78,8 +78,8 @@ import org.apache.isis.viewer.wicket.ui.
import org.apache.isis.viewer.wicket.ui.components.value.StandaloneValuePanelFactory;
import org.apache.isis.viewer.wicket.ui.components.voidreturn.VoidReturnPanelFactory;
import org.apache.isis.viewer.wicket.ui.components.welcome.WelcomePanelFactory;
-import org.apache.isis.viewer.wicket.ui.components.widgets.entitylink.EntityLinkSelect2Factory;
-import org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices.ValueChoicesSelect2ComponentFactory;
+import org.apache.isis.viewer.wicket.ui.components.widgets.entitylink.EntityLinkSelect2PanelFactory;
+import org.apache.isis.viewer.wicket.ui.components.widgets.valuechoices.ValueChoicesSelect2PanelComponentFactory;
/**
* Default implementation of {@link ComponentFactoryRegistrar} that registers a
@@ -113,17 +113,17 @@ public class ComponentFactoryRegistrarDe
// ... or this set (but not both)
addLinksSelectorFactories(componentFactories);
- componentFactories.add(new CollectionContentsAsUnresolvedFactory()); // to prevent eager loading
+ componentFactories.add(new CollectionContentsAsUnresolvedPanelFactory()); // to prevent eager loading
}
protected void addLinksSelectorFactories(final ComponentFactoryList componentFactories) {
- componentFactories.add(new EntityLinksSelectorFactory());
- componentFactories.add(new CollectionContentsLinksSelectorFactory());
+ componentFactories.add(new EntityLinksSelectorPanelFactory());
+ componentFactories.add(new CollectionContentsLinksSelectorPanelFactory());
}
protected void addDropDownSelectorFactories(final ComponentFactoryList componentFactories) {
- componentFactories.add(new EntityDropDownSelectorFactory());
- componentFactories.add(new CollectionContentsDropDownSelectorFactory());
+ componentFactories.add(new EntityDropDownSelectorPanelFactory());
+ componentFactories.add(new CollectionContentsDropDownSelectorPanelFactory());
}
protected void addComponentFactoriesUsingServiceLoader(final ComponentFactoryList componentFactories) {
@@ -174,16 +174,16 @@ public class ComponentFactoryRegistrarDe
// lower-level
componentFactories.add(new EntityIconAndTitlePanelFactory());
- componentFactories.add(new EntitySummaryPanelFactory());
+ componentFactories.add(new EntityHeaderPanelFactory());
componentFactories.add(new EntityPropertiesPanelFactory());
componentFactories.add(new EntityCollectionsPanelFactory());
}
protected void addComponentFactoriesForEntityCollectionContents(final ComponentFactoryList componentFactories) {
- componentFactories.add(new CollectionContentsAsAjaxTableFactory());
+ componentFactories.add(new CollectionContentsAsAjaxTablePanelFactory());
// componentFactories.add(new CollectionContentsAsSimpleTableFactory());
// // work-in-progress
- componentFactories.add(new CollectionContentsAsIconsFactory());
+ componentFactories.add(new CollectionContentsAsIconsPanelFactory());
}
protected void addComponentFactoriesForEntityCollection(final ComponentFactoryList componentFactories) {
@@ -238,11 +238,11 @@ public class ComponentFactoryRegistrarDe
componentFactories.add(new ValuePanelFactory());
// or for choices
- componentFactories.add(new ValueChoicesSelect2ComponentFactory());
+ componentFactories.add(new ValueChoicesSelect2PanelComponentFactory());
}
protected void addComponentFactoriesForEntityLink(final ComponentFactoryList componentFactories) {
- componentFactories.add(new EntityLinkSelect2Factory());
+ componentFactories.add(new EntityLinkSelect2PanelFactory());
}
protected void addComponentFactoriesForVoidReturn(final ComponentFactoryList componentFactories) {