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/15 20:14:28 UTC
svn commit: r1398428 - in /incubator/isis/trunk: examples/quickstart/
examples/quickstart/dom/src/main/java/dom/todo/
examples/quickstart/viewer-wicket/src/main/resources/app/
framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/a...
Author: danhaywood
Date: Mon Oct 15 18:14:27 2012
New Revision: 1398428
URL: http://svn.apache.org/viewvc?rev=1398428&view=rev
Log:
ISIS-188, ISIS-232: more on quickstart example + minor wicket improvements
* mandatory class missing for some scalar panels
* change rendering of entity actions and grouped actions
* application name shown on sign-in page
Added:
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css
- copied, changed from r1397856, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
Modified:
incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
incubator/isis/trunk/examples/quickstart/pom.xml
incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusApplicationComponents.java
incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusObjectStore.java
incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
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/components/widgets/entitylink/EntityLinkSelect2.java
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2.java
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-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.html
incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItem.java Mon Oct 15 18:14:27 2012
@@ -24,7 +24,6 @@ import java.util.List;
import javax.jdo.JDOHelper;
import javax.jdo.annotations.IdentityType;
-import javax.jdo.annotations.Persistent;
import javax.jdo.annotations.VersionStrategy;
import javax.jdo.spi.PersistenceCapable;
@@ -40,6 +39,8 @@ import org.apache.isis.applib.annotation
import org.apache.isis.applib.annotation.Named;
import org.apache.isis.applib.annotation.ObjectType;
import org.apache.isis.applib.annotation.Optional;
+import org.apache.isis.applib.annotation.Resolve;
+import org.apache.isis.applib.annotation.Resolve.Type;
import org.apache.isis.applib.annotation.Title;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.runtimes.dflt.objectstores.jdo.applib.annotations.Auditable;
@@ -58,7 +59,7 @@ import org.apache.isis.runtimes.dflt.obj
value="SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy && category == :category"),
@javax.jdo.annotations.Query(
name="todo_autoComplete", language="JDOQL",
- value="SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy && description.matches(:description)")
+ value="SELECT FROM dom.todo.ToDoItem WHERE ownedBy == :ownedBy && description.startsWith(:description)")
})
@javax.jdo.annotations.Version(strategy=VersionStrategy.VERSION_NUMBER, column="VERSION")
@ObjectType("TODO")
@@ -198,11 +199,12 @@ public class ToDoItem {
}
// }}
- // {{ Dependencies (Collection)
+ // {{ dependencies (Collection)
private List<ToDoItem> dependencies = new ArrayList<ToDoItem>();
@Disabled
@MemberOrder(sequence = "1")
+ @Resolve(Type.EAGERLY)
public List<ToDoItem> getDependencies() {
return dependencies;
}
Modified: incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java (original)
+++ incubator/isis/trunk/examples/quickstart/dom/src/main/java/dom/todo/ToDoItems.java Mon Oct 15 18:14:27 2012
@@ -48,7 +48,7 @@ public class ToDoItems extends AbstractF
}
// }}
- // {{ NotYetDone (action)
+ // {{ notYetDone (action)
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "1")
public List<ToDoItem> notYetDone() {
@@ -61,7 +61,7 @@ public class ToDoItems extends AbstractF
}
// }}
- // {{ Done (action)
+ // {{ done (action)
@ActionSemantics(Of.SAFE)
@MemberOrder(sequence = "2")
public List<ToDoItem> done() {
@@ -74,12 +74,11 @@ public class ToDoItems extends AbstractF
}
// }}
-
// {{ newToDo (action)
@MemberOrder(sequence = "2")
public ToDoItem newToDo(
@Named("Description") String description,
- Category category) {
+ @Named("Category") Category category) {
final String ownedBy = getContainer().getUser().getName();
return newToDo(description, category, ownedBy);
}
Modified: incubator/isis/trunk/examples/quickstart/pom.xml
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/pom.xml?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/pom.xml (original)
+++ incubator/isis/trunk/examples/quickstart/pom.xml Mon Oct 15 18:14:27 2012
@@ -149,11 +149,11 @@
<module>dom</module>
<module>fixture</module>
<module>objstore-jdo</module>
+ <module>viewer-restfulobjects</module>
+ <module>viewer-wicket</module>
<module>viewer-dnd</module>
<module>viewer-html</module>
- <module>viewer-restfulobjects</module>
<module>viewer-scimpi</module>
- <module>viewer-wicket</module>
<module>tests-junit</module>
<module>tests-bdd</module>
</modules>
Modified: incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html (original)
+++ incubator/isis/trunk/examples/quickstart/viewer-wicket/src/main/resources/app/welcome.html Mon Oct 15 18:14:27 2012
@@ -19,7 +19,7 @@ To change the objectstore implementation
<br/>
<p>
-The wicket viewer initially is configured using Wicket's 'development' mode, and Isis' authentication and authorization modules are disabled.
+The wicket viewer initially is configured using Wicket's 'development' mode, with Isis' authorization modules are disabled.
For deployment, typically Wicket viewer should be switched to 'deployment' mode, by editing <tt>WEB-INF/web.xml</tt>.
-Isis' authentication and authorization should also be enabled (again, by editing the <tt>WEB-INF/isis.properties</tt> config file).
+Isis' authorization should also be enabled (again, by editing the <tt>WEB-INF/isis.properties</tt> config file).
</p>
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusApplicationComponents.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusApplicationComponents.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusApplicationComponents.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusApplicationComponents.java Mon Oct 15 18:14:27 2012
@@ -6,7 +6,6 @@ import java.util.Map;
import java.util.Properties;
import java.util.Set;
-import javax.jdo.JDOEnhancer;
import javax.jdo.JDOHelper;
import javax.jdo.PersistenceManager;
import javax.jdo.PersistenceManagerFactory;
Modified: incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusObjectStore.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusObjectStore.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusObjectStore.java (original)
+++ incubator/isis/trunk/framework/runtimes/dflt/objectstores/jdo/jdo-datanucleus/src/main/java/org/apache/isis/runtimes/dflt/objectstores/jdo/datanucleus/DataNucleusObjectStore.java Mon Oct 15 18:14:27 2012
@@ -19,7 +19,6 @@ import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import org.apache.log4j.Logger;
-import org.datanucleus.identity.OIDImpl;
import org.apache.isis.core.commons.config.ConfigurationConstants;
import org.apache.isis.core.commons.config.IsisConfiguration;
@@ -37,11 +36,9 @@ import org.apache.isis.core.metamodel.ad
import org.apache.isis.core.metamodel.spec.ObjectSpecId;
import org.apache.isis.core.metamodel.spec.ObjectSpecification;
import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpi;
-import org.apache.isis.core.metamodel.spec.SpecificationLoaderSpiAware;
import org.apache.isis.core.metamodel.spec.feature.ObjectAssociation;
import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer;
import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.FrameworkSynchronizer.CalledFrom;
-import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.IsisLifecycleListener;
import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.commands.DataNucleusCreateObjectCommand;
import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.commands.DataNucleusDeleteObjectCommand;
import org.apache.isis.runtimes.dflt.objectstores.jdo.datanucleus.persistence.commands.DataNucleusUpdateObjectCommand;
@@ -104,13 +101,11 @@ public class DataNucleusObjectStore impl
private PersistenceManager persistenceManager;
private final Map<Class<?>, PersistenceQueryProcessor<?>> persistenceQueryProcessorByClass = Maps.newHashMap();
- // private final LoadPostProcessor loadPostProcessor;
+ private final FrameworkSynchronizer frameworkSynchronizer;
private State state;
private TransactionMode transactionMode;
-
- private final FrameworkSynchronizer frameworkSynchronizer;
public DataNucleusObjectStore(ObjectAdapterFactory adapterFactory, DataNucleusApplicationComponents applicationComponents) {
ensureThatArg(adapterFactory, is(notNullValue()));
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-model/src/main/java/org/apache/isis/viewer/wicket/model/mementos/PageParameterNames.java Mon Oct 15 18:14:27 2012
@@ -113,6 +113,9 @@ public enum PageParameterNames {
}
public String getStringFrom(PageParameters pageParameters, String defaultValue) {
+ if(pageParameters == null) {
+ return defaultValue;
+ }
return pageParameters.get(this.toString()).toString(defaultValue);
}
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/ScalarPanelAbstract.java Mon Oct 15 18:14:27 2012
@@ -28,7 +28,6 @@ import org.apache.wicket.model.Model;
import org.apache.isis.applib.annotation.Where;
import org.apache.isis.viewer.wicket.model.models.EntityModel.RenderingHint;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
-import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract.Rendering;
import org.apache.isis.viewer.wicket.ui.components.scalars.TextFieldValueModel.ScalarModelProvider;
import org.apache.isis.viewer.wicket.ui.panels.PanelAbstract;
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/primitive/BooleanPanel.java Mon Oct 15 18:14:27 2012
@@ -30,6 +30,7 @@ import org.apache.wicket.model.Model;
import org.apache.isis.core.metamodel.adapter.ObjectAdapter;
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* Panel for rendering scalars of type {@link Boolean} or <tt>boolean</tt>.
@@ -61,7 +62,10 @@ public class BooleanPanel extends Scalar
final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR, checkBox);
labelIfRegular.add(checkBox);
-
+ if(getModel().isRequired()) {
+ labelIfRegular.add(new CssClassAppender("mandatory"));
+ }
+
final String describedAs = getModel().getDescribedAs();
if(describedAs != null) {
labelIfRegular.add(new AttributeModifier("title", Model.of(describedAs)));
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java
URL: http://svn.apache.org/viewvc/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/scalars/reference/ReferencePanel.java Mon Oct 15 18:14:27 2012
@@ -93,6 +93,10 @@ public class ReferencePanel extends Scal
final FormComponentLabel labelIfRegular = new FormComponentLabel(ID_SCALAR_IF_REGULAR, entityLink);
labelIfRegular.add(entityLink);
+ if(getModel().isRequired()) {
+ labelIfRegular.add(new CssClassAppender("mandatory"));
+ }
+
final String describedAs = getModel().getDescribedAs();
if(describedAs != null) {
labelIfRegular.add(new AttributeModifier("title", Model.of(describedAs)));
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=1398428&r1=1398427&r2=1398428&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 Mon Oct 15 18:14:27 2012
@@ -202,4 +202,83 @@ li.cssSubMenuItem p.disabled {
display:inline;
}
+
+
+
+
+.groupedActions li.cssMenuItem > p.top-parent {
+ display:none;
+}
+
+.groupedActions .menuh ul ul {
+ position: relative;
+ display: inline-block;
+}
+
+
+.groupedActions .menuh li,
+.groupedActions .menuh li p {
+ display: inline;
+}
+
+.groupedActions .menuh a,
+.groupedActions .menuh p {
+ display: inline-block;
+ border: none;
+}
+
+.groupedActions .menuh a:link,
+.groupedActions .menuh a:visited,
+.groupedActions .menuh a:active,
+.groupedActions .menuh p {
+ background-color: #fff;
+}
+
+.groupedActions .menuh a:hover,
+.groupedActions .menuh p:hover {
+ color: #000;
+}
+
+.entityActions li.cssMenuItem > p.top-parent {
+ display:none;
+}
+
+.entityActions .menuh ul ul {
+ position: relative;
+ display: inline-block;
+}
+
+
+.entityActions .menuh li,
+.entityActions .menuh li p {
+ display: inline;
+}
+
+.entityActions .menuh a,
+.entityActions .menuh p {
+ display: inline-block;
+ border: none;
+}
+
+
+
+.entityActions .menuh a:link,
+.entityActions .menuh a:visited,
+.entityActions .menuh a:active,
+.entityActions .menuh p {
+ background-color: #fff;
+}
+
+.entityActions .menuh a:focus {
+ text-decoration: underline;
+}
+
+.entityActions .menuh a:hover,
+.entityActions .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/components/widgets/entitylink/EntityLinkSelect2.java
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/entitylink/EntityLinkSelect2.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/entitylink/EntityLinkSelect2.java Mon Oct 15 18:14:27 2012
@@ -105,47 +105,12 @@ public class EntityLinkSelect2 extends E
* Builds the parts of the GUI that are not dynamic.
*/
private void buildGui() {
- //addOrReplaceOidField();
rebuildFindUsingMenu();
addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, this));
syncWithInput();
}
-// private void addOrReplaceOidField() {
-// pendingOid = new TextField<ObjectAdapterMemento>(ID_ENTITY_OID, new Model<ObjectAdapterMemento>() {
-//
-// private static final long serialVersionUID = 1L;
-//
-//
-// @Override
-// public ObjectAdapterMemento getObject() {
-// if (hasPending) {
-// return pending;
-// }
-// final ObjectAdapter adapter = EntityLinkSelect2.this.getModelObject();
-// return ObjectAdapterMemento.createOrNull(adapter);
-// }
-//
-// @Override
-// public void setObject(final ObjectAdapterMemento adapterMemento) {
-// pending = adapterMemento;
-// hasPending = true;
-// }
-//
-// }) {
-// private static final long serialVersionUID = 1L;
-//
-// @Override
-// protected void onModelChanged() {
-// super.onModelChanged();
-// syncWithInput();
-// }
-// };
-// pendingOid.setType(ObjectAdapterMemento.class);
-// addOrReplace(pendingOid);
-// pendingOid.setVisible(false);
-// }
void rebuildFindUsingMenu() {
final EntityModel entityModel = getEntityModel();
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2.java
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/valuechoices/ValueChoicesSelect2.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/components/widgets/valuechoices/ValueChoicesSelect2.java Mon Oct 15 18:14:27 2012
@@ -45,6 +45,7 @@ import org.apache.isis.viewer.wicket.mod
import org.apache.isis.viewer.wicket.model.models.ScalarModel;
import org.apache.isis.viewer.wicket.model.util.Mementos;
import org.apache.isis.viewer.wicket.ui.components.scalars.ScalarPanelAbstract;
+import org.apache.isis.viewer.wicket.ui.util.CssClassAppender;
/**
* Initial skeleton - trying to add support for value choices.
@@ -78,9 +79,11 @@ public class ValueChoicesSelect2 extends
valueField = createDropDownChoices(choicesMementos, modelObject);
addStandardSemantics();
- // addSemantics();
final FormComponentLabel labelIfRegular = createFormComponentLabel();
+ if(getModel().isRequired()) {
+ labelIfRegular.add(new CssClassAppender("mandatory"));
+ }
addOrReplace(labelIfRegular);
addOrReplace(new ComponentFeedbackPanel(ID_FEEDBACK, valueField));
@@ -129,7 +132,6 @@ public class ValueChoicesSelect2 extends
protected void addStandardSemantics() {
setRequiredIfSpecified();
- // setSizeIfSpecified();
}
private void setRequiredIfSpecified() {
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=1398428&r1=1398427&r2=1398428&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 Mon Oct 15 18:14:27 2012
@@ -38,7 +38,7 @@
clear: both;
}
-#footer {
+.links {
padding-top: 4px;
padding-bottom: 4px;
clear: both;
Modified: incubator/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/incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/PageAbstract.html Mon Oct 15 18:14:27 2012
@@ -37,7 +37,10 @@
<h1><span wicket:id="applicationName">[application name]</span></h1>
</div>
<div id="secondaryMenu">
- <span>logged in as: </span><span wicket:id="userName">[username]</span>
+ <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>
</div>
<div class="clear"/>
@@ -46,11 +49,16 @@
<div id="body">
<wicket:child/>
+
+ <div class="clear"/>
</div>
<div id="footer">
- <a href="#" wicket:id="logoutLink">logout</a> | <a href="#" wicket:id="aboutLink">about</a> | powered by <a href="http://incubator.apache.org/isis">Apache Isis (incubating)</a>
+ <div class="links">
+ powered by: <a href="http://incubator.apache.org/isis">Apache Isis (incubating)</a>
+ </div>
</div>
+
</div>
</body>
</html>
Copied: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css (from r1397856, incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java)
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?p2=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css&p1=incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java&r1=1397856&r2=1398428&rev=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.css Mon Oct 15 18:14:27 2012
@@ -17,22 +17,7 @@
* under the License.
*/
-package org.apache.isis.viewer.wicket.ui.pages.login;
-
-import org.apache.wicket.authroles.authentication.pages.SignInPage;
-import org.apache.wicket.request.mapper.parameter.PageParameters;
-
-/**
- * Boilerplate, pick up our HTML and CSS.
- */
-public final class WicketSignInPage extends SignInPage {
-
- private static final long serialVersionUID = 1L;
-
- public WicketSignInPage() {
- }
-
- public WicketSignInPage(final PageParameters parameters) {
- }
-
-}
\ No newline at end of file
+ .signIn 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=1398428&r1=1398427&r2=1398428&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 Mon Oct 15 18:14:27 2012
@@ -17,18 +17,23 @@
specific language governing permissions and limitations
under the License.
-->
-<html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:wicket="http://wicket.apache.org/dtds.data/wicket-xhtml1.4-strict.dtd"
+ xml:lang="en"
+ lang="en">
<head>
- <title>Sign In</title>
+ <title wicket:id="pageTitle"></title>
<wicket:link>
<link href="../PageAbstract.css" rel="stylesheet" />
+ <link href="WicketSignInPage.css" rel="stylesheet" />
+ <link href="../cssreset.css" rel="stylesheet" type="text/css"/>
</wicket:link>
<link href="application.css" rel="stylesheet" type="text/css"/>
</head>
<body>
- <div id="container">
- <div id="header" >
- <h1>Wicket Viewer</h1>
+ <div id="container" class="signIn">
+ <div id="header">
+ <h1><span wicket:id="applicationName">[application name]</span></h1>
</div>
<div class="clear"/>
<h2>Sign In</h2>
Modified: incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java
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.java?rev=1398428&r1=1398427&r2=1398428&view=diff
==============================================================================
--- incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java (original)
+++ incubator/isis/trunk/framework/viewer/wicket/wicket-ui/src/main/java/org/apache/isis/viewer/wicket/ui/pages/login/WicketSignInPage.java Mon Oct 15 18:14:27 2012
@@ -19,9 +19,15 @@
package org.apache.isis.viewer.wicket.ui.pages.login;
+import com.google.inject.Inject;
+import com.google.inject.name.Named;
+
import org.apache.wicket.authroles.authentication.pages.SignInPage;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.request.mapper.parameter.PageParameters;
+import org.apache.isis.viewer.wicket.model.mementos.PageParameterNames;
+
/**
* Boilerplate, pick up our HTML and CSS.
*/
@@ -29,10 +35,30 @@ public final class WicketSignInPage exte
private static final long serialVersionUID = 1L;
+ private static final String ID_PAGE_TITLE = "pageTitle";
+ private static final String ID_APPLICATION_NAME = "applicationName";
+
public WicketSignInPage() {
+ this(null);
}
+ /**
+ * {@link Inject}ed when {@link #init() initialized}.
+ */
+ @Inject
+ @Named("applicationName")
+ private String applicationName;
+
public WicketSignInPage(final PageParameters parameters) {
+ addPageTitle(parameters);
+ addApplicationName();
}
+ private void addPageTitle(final PageParameters parameters) {
+ add(new Label(ID_PAGE_TITLE, PageParameterNames.PAGE_TITLE.getStringFrom(parameters, applicationName)));
+ }
+
+ private void addApplicationName() {
+ add(new Label(ID_APPLICATION_NAME, applicationName));
+ }
}
\ No newline at end of file