Done 2012/9/18 Maxim Solodovnik <[email protected]>: > Hello Sebastian, > > I propose to use > item.add(AttributeModifier.append("class", (item.getIndex() % 2 == 1) ? > "even" : "odd")); > or > item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? > "even" : "odd")); > > instead of > item.add(AttributeModifier.replace("class", new > AbstractReadOnlyModel<String>() { > private static final long serialVersionUID = 1L; > @Override > public String getObject() { > return (item.getIndex() % 2 == 1) ? "even" : "odd"; > } > })); > > > I believe it is easier to read :) > > > On Tue, Sep 18, 2012 at 1:07 AM, <[email protected]> wrote: >> >> Author: sebawagner >> Date: Mon Sep 17 18:07:21 2012 >> New Revision: 1386755 >> >> URL: http://svn.apache.org/viewvc?rev=1386755&view=rev >> Log: >> OPENMEETINGS-428 Style tables with standard tools >> >> Modified: >> >> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css >> >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java >> >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java >> >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java >> >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java >> >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java >> >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css >> Mon Sep 17 18:07:21 2012 >> @@ -62,10 +62,25 @@ >> } >> >> .adminPanelColumnTable { >> - width: 540px; >> + >> } >> >> table.adminListTable { >> + max-width: 536px; >> + min-width: 536px; >> +} >> + >> +table.adminListTable th { >> + background: #BDC0DB; >> + color: #ffffff; >> +} >> + >> +table.adminListTable tr.even { >> + background-color: #ffebcd; >> +} >> + >> +table.adminListTable tr.odd { >> + background-color: #ffffff; >> } >> >> .adminPanelColumnForm { >> @@ -73,4 +88,5 @@ table.adminListTable { >> } >> >> .adminForm { >> -} >> + >> +} >> \ No newline at end of file >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java >> Mon Sep 17 18:07:21 2012 >> @@ -23,12 +23,14 @@ import org.apache.openmeetings.persisten >> import org.apache.openmeetings.web.components.admin.AdminPanel; >> import org.apache.openmeetings.web.components.admin.PagedEntityListPanel; >> import org.apache.openmeetings.web.data.OmDataProvider; >> +import org.apache.wicket.AttributeModifier; >> import org.apache.wicket.ajax.AjaxEventBehavior; >> import org.apache.wicket.ajax.AjaxRequestTarget; >> import org.apache.wicket.markup.html.WebMarkupContainer; >> import org.apache.wicket.markup.html.basic.Label; >> import org.apache.wicket.markup.repeater.Item; >> import org.apache.wicket.markup.repeater.data.DataView; >> +import org.apache.wicket.model.AbstractReadOnlyModel; >> >> public class ConfigsPanel extends AdminPanel { >> >> @@ -43,7 +45,7 @@ public class ConfigsPanel extends AdminP >> private static final long serialVersionUID = >> 8715559628755439596L; >> >> @Override >> - protected void populateItem(Item<Configuration> >> item) { >> + protected void populateItem(final >> Item<Configuration> item) { >> final Configuration configuration = >> item.getModelObject(); >> item.add(new Label("configuration_id", "" >> + configuration.getConfiguration_id())); >> item.add(new Label("conf_key", "" + >> configuration.getConf_key())); >> @@ -56,6 +58,14 @@ public class ConfigsPanel extends AdminP >> target.add(form); >> } >> }); >> + >> item.add(AttributeModifier.replace("class", new >> AbstractReadOnlyModel<String>() { >> + private static final long serialVersionUID = 1L; >> + >> + @Override >> + public String getObject() { >> + return (item.getIndex() % 2 == 1) ? "even" : >> "odd"; >> + } >> + })); >> } >> }; >> final WebMarkupContainer listContainer = new >> WebMarkupContainer("listContainer"); >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/groups/GroupsPanel.java >> Mon Sep 17 18:07:21 2012 >> @@ -24,6 +24,7 @@ import org.apache.openmeetings.data.user >> import org.apache.openmeetings.persistence.beans.domain.Organisation; >> import org.apache.openmeetings.web.app.Application; >> import org.apache.openmeetings.web.components.admin.AdminPanel; >> +import org.apache.wicket.AttributeModifier; >> import org.apache.wicket.ajax.AjaxEventBehavior; >> import org.apache.wicket.ajax.AjaxRequestTarget; >> import >> org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator; >> @@ -31,6 +32,7 @@ import org.apache.wicket.markup.html.bas >> import org.apache.wicket.markup.repeater.Item; >> import org.apache.wicket.markup.repeater.data.DataView; >> import org.apache.wicket.markup.repeater.data.IDataProvider; >> +import org.apache.wicket.model.AbstractReadOnlyModel; >> import org.apache.wicket.model.CompoundPropertyModel; >> import org.apache.wicket.model.IModel; >> >> @@ -66,7 +68,7 @@ public class GroupsPanel extends AdminPa >> private static final long serialVersionUID = >> 8715559628755439596L; >> >> @Override >> - protected void populateItem(Item<Organisation> >> item) { >> + protected void populateItem(final >> Item<Organisation> item) { >> final Organisation organisation = >> item.getModelObject(); >> item.add(new Label("organisation_id", "" + >> organisation.getOrganisation_id())); >> item.add(new Label("name", "" + >> organisation.getName())); >> @@ -78,6 +80,14 @@ public class GroupsPanel extends AdminPa >> target.add(form); >> } >> }); >> + >> item.add(AttributeModifier.replace("class", new >> AbstractReadOnlyModel<String>() { >> + private static final long serialVersionUID = 1L; >> + >> + @Override >> + public String getObject() { >> + return (item.getIndex() % 2 == 1) ? "even" : >> "odd"; >> + } >> + })); >> } >> }; >> dataView.setItemsPerPage(8); //FIXME need to be >> parametrized >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java >> Mon Sep 17 18:07:21 2012 >> @@ -31,6 +31,7 @@ import org.apache.openmeetings.web.compo >> import org.apache.openmeetings.web.components.admin.AdminPanel; >> import org.apache.openmeetings.web.components.admin.PagedEntityListPanel; >> import org.apache.openmeetings.web.data.OmDataProvider; >> +import org.apache.wicket.AttributeModifier; >> import org.apache.wicket.ajax.AjaxEventBehavior; >> import org.apache.wicket.ajax.AjaxRequestTarget; >> import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior; >> @@ -45,6 +46,7 @@ import org.apache.wicket.markup.html.for >> import org.apache.wicket.markup.html.form.TextField; >> import org.apache.wicket.markup.repeater.Item; >> import org.apache.wicket.markup.repeater.data.DataView; >> +import org.apache.wicket.model.AbstractReadOnlyModel; >> import org.apache.wicket.model.CompoundPropertyModel; >> import org.apache.wicket.model.Model; >> import org.apache.wicket.model.PropertyModel; >> @@ -109,7 +111,7 @@ public class LangPanel extends AdminPane >> private static final long serialVersionUID = >> 8715559628755439596L; >> >> @Override >> - protected void >> populateItem(Item<Fieldlanguagesvalues> item) { >> + protected void populateItem(final >> Item<Fieldlanguagesvalues> item) { >> final Fieldlanguagesvalues flv = >> item.getModelObject(); >> item.add(new Label("lblId", "" + >> flv.getFieldvalues_id())); >> item.add(new Label("name", >> flv.getFieldvalues().getName())); >> @@ -123,6 +125,14 @@ public class LangPanel extends AdminPane >> target.add(form); >> } >> }); >> + >> item.add(AttributeModifier.replace("class", new >> AbstractReadOnlyModel<String>() { >> + private static final long serialVersionUID = 1L; >> + >> + @Override >> + public String getObject() { >> + return (item.getIndex() % 2 == 1) ? "even" : >> "odd"; >> + } >> + })); >> } >> }; >> >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java >> Mon Sep 17 18:07:21 2012 >> @@ -23,12 +23,14 @@ import org.apache.openmeetings.persisten >> import org.apache.openmeetings.web.components.admin.AdminPanel; >> import org.apache.openmeetings.web.components.admin.PagedEntityListPanel; >> import org.apache.openmeetings.web.data.OmDataProvider; >> +import org.apache.wicket.AttributeModifier; >> import org.apache.wicket.ajax.AjaxEventBehavior; >> import org.apache.wicket.ajax.AjaxRequestTarget; >> import org.apache.wicket.markup.html.WebMarkupContainer; >> import org.apache.wicket.markup.html.basic.Label; >> import org.apache.wicket.markup.repeater.Item; >> import org.apache.wicket.markup.repeater.data.DataView; >> +import org.apache.wicket.model.AbstractReadOnlyModel; >> >> public class LdapsPanel extends AdminPanel { >> >> @@ -42,7 +44,7 @@ public class LdapsPanel extends AdminPan >> private static final long serialVersionUID = >> 8715559628755439596L; >> >> @Override >> - protected void populateItem(Item<LdapConfig> item) >> { >> + protected void populateItem(final Item<LdapConfig> >> item) { >> final LdapConfig ldapConfig = >> item.getModelObject(); >> item.add(new Label("ldapConfigId", "" + >> ldapConfig.getLdapConfigId())); >> item.add(new Label("name", "" + >> ldapConfig.getName())); >> @@ -55,6 +57,14 @@ public class LdapsPanel extends AdminPan >> target.add(form); >> } >> }); >> + >> item.add(AttributeModifier.replace("class", new >> AbstractReadOnlyModel<String>() { >> + private static final long serialVersionUID = 1L; >> + >> + @Override >> + public String getObject() { >> + return (item.getIndex() % 2 == 1) ? "even" : >> "odd"; >> + } >> + })); >> } >> }; >> final WebMarkupContainer listContainer = new >> WebMarkupContainer("listContainer"); >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/rooms/RoomsPanel.java >> Mon Sep 17 18:07:21 2012 >> @@ -24,6 +24,7 @@ import org.apache.openmeetings.data.conf >> import org.apache.openmeetings.persistence.beans.rooms.Rooms; >> import org.apache.openmeetings.web.app.Application; >> import org.apache.openmeetings.web.components.admin.AdminPanel; >> +import org.apache.wicket.AttributeModifier; >> import org.apache.wicket.ajax.AjaxEventBehavior; >> import org.apache.wicket.ajax.AjaxRequestTarget; >> import >> org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator; >> @@ -31,6 +32,7 @@ import org.apache.wicket.markup.html.bas >> import org.apache.wicket.markup.repeater.Item; >> import org.apache.wicket.markup.repeater.data.DataView; >> import org.apache.wicket.markup.repeater.data.IDataProvider; >> +import org.apache.wicket.model.AbstractReadOnlyModel; >> import org.apache.wicket.model.CompoundPropertyModel; >> import org.apache.wicket.model.IModel; >> >> @@ -64,7 +66,7 @@ public class RoomsPanel extends AdminPan >> private static final long serialVersionUID = >> 8715559628755439596L; >> >> @Override >> - protected void populateItem(Item<Rooms> item) { >> + protected void populateItem(final Item<Rooms> >> item) { >> final Rooms room = item.getModelObject(); >> item.add(new Label("rooms_id", "" + >> room.getRooms_id())); >> item.add(new Label("name", "" + >> room.getName())); >> @@ -77,6 +79,14 @@ public class RoomsPanel extends AdminPan >> target.add(form); >> } >> }); >> + >> item.add(AttributeModifier.replace("class", new >> AbstractReadOnlyModel<String>() { >> + private static final long serialVersionUID = 1L; >> + >> + @Override >> + public String getObject() { >> + return (item.getIndex() % 2 == 1) ? "even" : >> "odd"; >> + } >> + })); >> } >> }; >> dataView.setItemsPerPage(8); //FIXME need to be >> parametrized >> >> Modified: >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java >> URL: >> http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java?rev=1386755&r1=1386754&r2=1386755&view=diff >> >> ============================================================================== >> --- >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java >> (original) >> +++ >> incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/servers/ServersPanel.java >> Mon Sep 17 18:07:21 2012 >> @@ -24,6 +24,7 @@ import org.apache.openmeetings.data.basi >> import org.apache.openmeetings.persistence.beans.basic.Server; >> import org.apache.openmeetings.web.app.Application; >> import org.apache.openmeetings.web.components.admin.AdminPanel; >> +import org.apache.wicket.AttributeModifier; >> import org.apache.wicket.ajax.AjaxEventBehavior; >> import org.apache.wicket.ajax.AjaxRequestTarget; >> import >> org.apache.wicket.ajax.markup.html.navigation.paging.AjaxPagingNavigator; >> @@ -31,6 +32,7 @@ import org.apache.wicket.markup.html.bas >> import org.apache.wicket.markup.repeater.Item; >> import org.apache.wicket.markup.repeater.data.DataView; >> import org.apache.wicket.markup.repeater.data.IDataProvider; >> +import org.apache.wicket.model.AbstractReadOnlyModel; >> import org.apache.wicket.model.CompoundPropertyModel; >> import org.apache.wicket.model.IModel; >> >> @@ -64,7 +66,7 @@ public class ServersPanel extends AdminP >> private static final long serialVersionUID = >> 8715559628755439596L; >> >> @Override >> - protected void populateItem(Item<Server> item) { >> + protected void populateItem(final Item<Server> >> item) { >> final Server Server = >> item.getModelObject(); >> item.add(new Label("id", "" + >> Server.getId())); >> item.add(new Label("name", "" + >> Server.getName())); >> @@ -77,6 +79,14 @@ public class ServersPanel extends AdminP >> target.add(form); >> } >> }); >> + >> item.add(AttributeModifier.replace("class", new >> AbstractReadOnlyModel<String>() { >> + private static final long serialVersionUID = 1L; >> + >> + @Override >> + public String getObject() { >> + return (item.getIndex() % 2 == 1) ? "even" : >> "odd"; >> + } >> + })); >> } >> }; >> dataView.setItemsPerPage(8); //FIXME need to be >> parametrized >> >> > > > > -- > WBR > Maxim aka solomax
-- Sebastian Wagner https://twitter.com/#!/dead_lock http://www.webbase-design.de http://www.wagner-sebastian.com [email protected]
