You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2013/08/28 20:47:45 UTC
svn commit: r1518325 - in /openmeetings/trunk/singlewebapp/src/main:
java/org/apache/openmeetings/web/admin/configurations/
java/org/apache/openmeetings/web/admin/groups/
java/org/apache/openmeetings/web/admin/labels/
java/org/apache/openmeetings/web/a...
Author: solomax
Date: Wed Aug 28 18:47:44 2013
New Revision: 1518325
URL: http://svn.apache.org/r1518325
Log:
[OPENMEETINGS-692] selected item is highlighted;
admin.css is separated;
Added:
openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css
openmeetings/trunk/singlewebapp/src/main/webapp/css/forms.css
- copied unchanged from r1518278, openmeetings/trunk/singlewebapp/src/main/webapp/css/openmeetings-forms.css
Removed:
openmeetings/trunk/singlewebapp/src/main/webapp/css/openmeetings-forms.css
Modified:
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Wed Aug 28 18:47:44 2013
@@ -42,6 +42,7 @@ import org.apache.wicket.markup.repeater
public class ConfigsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
private ConfigForm form;
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
@@ -58,25 +59,25 @@ public class ConfigsPanel extends AdminP
@Override
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()));
- item.add(new Label("conf_value", configuration.getConf_value()));
+ final Configuration c = item.getModelObject();
+ item.add(new Label("configuration_id", c.getConfiguration_id()));
+ item.add(new Label("conf_key", c.getConf_key()));
+ item.add(new Label("conf_value", c.getConf_value()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
protected void onEvent(AjaxRequestTarget target) {
form.hideNewRecord();
- form.setModelObject(configuration);
- target.add(form);
+ form.setModelObject(c);
+ target.add(form, listContainer);
target.appendJavaScript("omConfigPanelInit();");
}
});
item.add(AttributeModifier.replace("class", "clickable "
- + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (c.getConfiguration_id().equals(form.getModelObject().getConfiguration_id()) ? " selected" : "")));
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Wed Aug 28 18:47:44 2013
@@ -98,20 +98,23 @@ public class GroupsPanel extends AdminPa
@Override
protected void populateItem(Item<Organisation> item) {
- final Organisation organisation = item.getModelObject();
- item.add(new Label("organisation_id", "" + organisation.getOrganisation_id()));
- item.add(new Label("name", "" + organisation.getName()));
+ final Organisation o = item.getModelObject();
+ item.add(new Label("organisation_id", "" + o.getOrganisation_id()));
+ item.add(new Label("name", "" + o.getName()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
protected void onEvent(AjaxRequestTarget target) {
form.hideNewRecord();
- form.setModelObject(organisation);
+ form.setModelObject(o);
form.updateView(target);
+ target.add(listContainer);
target.appendJavaScript("groupsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable " + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ item.add(AttributeModifier.append("class", "clickable "
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (o.getOrganisation_id().equals(form.getModelObject().getOrganisation_id()) ? " selected" : "")));
}
};
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Wed Aug 28 18:47:44 2013
@@ -136,12 +136,13 @@ public class LangPanel extends AdminPane
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(fv.getFieldlanguagesvalue());
form.hideNewRecord();
- target.add(form);
+ target.add(form, listContainer);
target.appendJavaScript("labelsInit();");
}
});
item.add(AttributeModifier.append("class", "clickable "
- + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues_id()) ? " selected" : "")));
}
};
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Wed Aug 28 18:47:44 2013
@@ -41,6 +41,7 @@ import org.apache.wicket.markup.repeater
*/
public class LdapsPanel extends AdminPanel {
private static final long serialVersionUID = -1L;
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private LdapForm form;
@Override
@@ -57,24 +58,25 @@ public class LdapsPanel extends AdminPan
@Override
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()));
- item.add(new Label("configFileName", "" + ldapConfig.getConfigFileName()));
+ final LdapConfig lc = item.getModelObject();
+ item.add(new Label("ldapConfigId", "" + lc.getLdapConfigId()));
+ item.add(new Label("name", "" + lc.getName()));
+ item.add(new Label("configFileName", "" + lc.getConfigFileName()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
protected void onEvent(AjaxRequestTarget target) {
- form.setModelObject(ldapConfig);
+ form.setModelObject(lc);
form.hideNewRecord();
- target.add(form);
+ target.add(form, listContainer);
target.appendJavaScript("omLdapPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? "even" : "odd"));
+ item.add(AttributeModifier.replace("class", "clickable "
+ + ((item.getIndex() % 2 == 1) ? "even" : "odd")
+ + (lc.getLdapConfigId() == form.getModelObject().getLdapConfigId() ? " selected" : "")));
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Wed Aug 28 18:47:44 2013
@@ -34,8 +34,8 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.repeater.Item;
public class OAuthPanel extends AdminPanel {
-
private static final long serialVersionUID = -1L;
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private OAuthForm form;
@SuppressWarnings("unchecked")
@@ -59,16 +59,17 @@ public class OAuthPanel extends AdminPan
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(server);
form.hideNewRecord();
- target.add(form);
+ target.add(form, listContainer);
target.appendJavaScript("oauthPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? "even" : "odd"));
+ item.add(AttributeModifier.replace("class", "clickable "
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (server.getId().equals(form.getModelObject().getId()) ? " selected" : "")));
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Wed Aug 28 18:47:44 2013
@@ -36,9 +36,9 @@ import org.apache.wicket.markup.html.bas
import org.apache.wicket.markup.repeater.Item;
public class RoomsPanel extends AdminPanel {
-
private static final long serialVersionUID = -1L;
private final AddUsersDialog addModeratorsDialog;
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private RoomForm form;
@Override
@@ -65,15 +65,16 @@ public class RoomsPanel extends AdminPan
form.hideNewRecord();
form.setModelObject(room);
form.updateView(target);
- target.add(form);
+ target.add(form, listContainer);
target.appendJavaScript("omRoomPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? "even" : "odd"));
+ item.add(AttributeModifier.replace("class", "clickable "
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (room.getRooms_id().equals(form.getModelObject().getRooms_id()) ? " selected" : "")));
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = -1L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Wed Aug 28 18:47:44 2013
@@ -41,6 +41,7 @@ import org.apache.wicket.markup.repeater
*/
public class ServersPanel extends AdminPanel {
private static final long serialVersionUID = -2197334608577346569L;
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private ServerForm form;
@Override
@@ -57,25 +58,26 @@ public class ServersPanel extends AdminP
@Override
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()));
- item.add(new Label("address", "" + Server.getAddress()));
+ final Server server = item.getModelObject();
+ item.add(new Label("id", "" + server.getId()));
+ item.add(new Label("name", "" + server.getName()));
+ item.add(new Label("address", "" + server.getAddress()));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
protected void onEvent(AjaxRequestTarget target) {
- form.setModelObject(Server);
+ form.setModelObject(server);
form.hideNewRecord();
- target.add(form);
+ target.add(form, listContainer);
target.appendJavaScript("omServerPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", (item.getIndex() % 2 == 1) ? "even" : "odd"));
+ item.add(AttributeModifier.replace("class", "clickable "
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (server.getId().equals(form.getModelObject().getId()) ? " selected" : "")));
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Wed Aug 28 18:47:44 2013
@@ -44,6 +44,7 @@ import com.googlecode.wicket.jquery.ui.w
public class UsersPanel extends AdminPanel {
private static final long serialVersionUID = -4463107742579790120L;
+ final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
private final MessageDialog warning = new MessageDialog("warning", WebSession.getString(797), WebSession.getString(343), DialogButtons.OK, DialogIcon.WARN) {
private static final long serialVersionUID = 1L;
@@ -73,22 +74,22 @@ public class UsersPanel extends AdminPan
item.add(new Label("login", u.getLogin()));
item.add(new Label("firstName", u.getFirstname()));
item.add(new Label("lastName", u.getLastname()));
- item.add(AttributeModifier.append("class", "clickable "
- + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
item.add(new AjaxEventBehavior("onclick") {
private static final long serialVersionUID = -8069413566800571061L;
protected void onEvent(AjaxRequestTarget target) {
form.setModelObject(u);
form.hideNewRecord();
- target.add(form);
+ target.add(form, listContainer);
//re-initialize height
target.appendJavaScript("omUserPanelInit();");
}
});
+ item.add(AttributeModifier.append("class", "clickable "
+ + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ + (u.getUser_id().equals(form.getModelObject().getUser_id()) ? " selected" : "")));
}
};
- final WebMarkupContainer listContainer = new WebMarkupContainer("listContainer");
add(listContainer.add(dataView).setOutputMarkupId(true));
PagedEntityListPanel navigator = new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID = 5097048616003411362L;
Modified: openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/BasePage.html?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/BasePage.html (original)
+++ openmeetings/trunk/singlewebapp/src/main/java/org/apache/openmeetings/web/pages/BasePage.html Wed Aug 28 18:47:44 2013
@@ -24,9 +24,10 @@
<link rel="shortcut icon" href="public/favicon.ico" type="image/x-icon"/>
<title wicket:id="pageTitle">[title]</title>
<link media="screen" type="text/css" rel="stylesheet" href="css/jquery-ui-1.10.3.custom.min.css"/>
- <link rel="stylesheet" type="text/css" href="css/openmeetings-forms.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/theme.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/forms.css"/>
<link media="screen" type="text/css" rel="stylesheet" href="css/calendar.css"/>
+ <link media="screen" type="text/css" rel="stylesheet" href="css/admin.css"/>
</head>
<body>
<div wicket:id="header"></div>
Added: openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css?rev=1518325&view=auto
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css (added)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/admin.css Wed Aug 28 18:47:44 2013
@@ -0,0 +1,347 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License") + you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+.adminPanel {
+ min-width: 1070px;
+}
+/*
+ ################################
+ Column layout admin section
+ ################################
+ */
+.adminPanelColumnTable {
+ display: inline-block;
+ vertical-align: top;
+}
+
+table.adminListTable {
+ max-width: 518px;
+ min-width: 518px;
+}
+
+table.adminListTable th {
+ background: #AFCBFB;
+ color: #ffffff;
+}
+
+table.adminListTableSmall th {
+ background: #AFCBFB;
+ color: #ffffff;
+}
+
+table.adminListTable th.two_column_layout_column1 {
+ width: 136px;
+}
+
+table.adminListTable th.two_column_layout_column2 {
+ width: 354px;
+}
+
+table.adminListTable td.two_column_layout_column1 {
+ width: 136px;
+}
+
+table.adminListTable td.two_column_layout_column2 {
+ width: 354px;
+}
+
+table.adminListTable td div.two_column_layout_divcolumn1 {
+ word-wrap: break-word;
+ width: 136px;
+}
+
+table.adminListTable td div.two_column_layout_divcolumn2 {
+ word-wrap: break-word;
+ width: 354px;
+}
+
+table.adminListTable th.three_column_layout_column1 {
+ width: 96px;
+}
+
+table.adminListTable th.three_column_layout_column2 {
+ width: 150px;
+}
+
+table.adminListTable th.three_column_layout_column3 {
+ width: 244px;
+}
+
+table.adminListTableSmall th.three_column_layout_column1 {
+ width: 50px;
+}
+
+table.adminListTableSmall th.three_column_layout_column2 {
+ width: 50px;
+}
+
+table.adminListTableSmall th.three_column_layout_column3 {
+ width: 218px;
+}
+table.adminListTableSmall th.three_column_layout_column4 {
+ width: 150px;
+}
+table.adminListTableSmall th.three_column_layout_column5 {
+ width: 50px;
+}
+
+table.adminListTable td.three_column_layout_column1 {
+ width: 96px;
+}
+
+table.adminListTable td.three_column_layout_column2 {
+ width: 150px;
+}
+
+table.adminListTable td.three_column_layout_column3 {
+ width: 244px;
+}
+
+table.adminListTableSmall td.three_column_layout_column1 {
+ width: 50px;
+}
+
+table.adminListTableSmall td.three_column_layout_column2 {
+ width: 50px;
+}
+
+table.adminListTableSmall td.three_column_layout_column3 {
+ width: 218px;
+}
+table.adminListTableSmall td.three_column_layout_column4 {
+ width: 150px;
+}
+table.adminListTableSmall td.three_column_layout_column5 {
+ width: 50px;
+}
+
+table.adminListTable td div.three_column_layout_divcolumn1 {
+ word-wrap: break-word;
+ width: 96px;
+}
+
+table.adminListTable td div.three_column_layout_divcolumn2 {
+ word-wrap: break-word;
+ width: 150px;
+}
+
+table.adminListTable td div.three_column_layout_divcolumn3 {
+ word-wrap: break-word;
+ width: 244px;
+}
+
+table.adminListTableSmall td div.three_column_layout_divcolumn1 {
+ width: 50px;
+}
+
+table.adminListTableSmall td div.three_column_layout_divcolumn2 {
+ width: 50px;
+}
+
+table.adminListTableSmall td div.three_column_layout_divcolumn3 {
+ width: 218px;
+}
+
+table.adminListTableSmall td div.three_column_layout_divcolumn4 {
+ width: 150px;
+}
+
+table.adminListTableSmall td div.three_column_layout_divcolumn5 {
+ width: 50px;
+}
+
+table.adminListTable th.four_column_layout_column1 {
+ width: 96px;
+}
+
+table.adminListTable th.four_column_layout_column2 {
+ width: 130px;
+}
+
+table.adminListTable th.four_column_layout_column3 {
+ width: 132px;
+}
+
+table.adminListTable th.four_column_layout_column4 {
+ width: 132px;
+}
+
+table.adminListTable td.four_column_layout_column1 {
+ width: 96px;
+}
+
+table.adminListTable td.four_column_layout_column2 {
+ width: 130px;
+}
+
+table.adminListTable td.four_column_layout_column3 {
+ width: 132px;
+}
+
+table.adminListTable td.four_column_layout_column4 {
+ width: 132px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn1 {
+ word-wrap: break-word;
+ width: 96px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn2 {
+ word-wrap: break-word;
+ width: 130px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn3 {
+ word-wrap: break-word;
+ width: 132px;
+}
+
+table.adminListTable td div.four_column_layout_divcolumn4 {
+ word-wrap: break-word;
+ width: 132px;
+}
+
+table.adminListTable tr.even {
+ background-color: #EDF2FF;
+}
+
+table.adminListTableSmall tr.even {
+ background-color: #EDF2FF;
+}
+
+table.adminListTable tr.odd {
+ background-color: #F2FAFF;
+}
+
+table.adminListTableSmall tr.odd {
+ background-color: #F2FAFF;
+}
+
+table.adminListTable tr:hover {
+ background-color: #CCDCE8;
+}
+.adminPanelColumnForm {
+ display: inline-block;
+ vertical-align: top;
+ margin-top: 2px;
+}
+
+.adminPanelColumnForm div.scrollcontent {
+ vertical-align: top;
+ height: 500px;
+ overflow-y: scroll;
+}
+
+.adminForm {
+
+}
+
+.adminForm input {
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 280px;
+ height: 20px;
+ margin: 2px 2px;
+}
+
+.adminForm input.formcheckbox {
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: none;
+ width: 20px;
+ height: 20px;
+ margin: 2px 2px;
+}
+
+.adminForm fieldset {
+ background-color: #F2FAFF;
+ border: solid 1px #aacfe4;
+ margin-top: 4px;
+ padding: 4px;
+}
+
+.adminForm legend {
+ background-color: #F2FAFF;
+ padding: 0.2em 0.5em;
+ margin: 0px 10px;
+ border: solid 1px #aacfe4;
+ color: #000000;
+ font-style: italic;
+ text-align: right;
+}
+
+.adminForm textarea {
+ display: block;
+ float: left;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 280px;
+ height: 60px;
+ margin: 2px 2px;
+}
+
+.adminForm div.formelement {
+ display: block;
+ clear: both;
+ max-width: 490px;
+}
+
+.adminForm select {
+ float: left;
+ height: 20px;
+ font-size: 14px;
+ padding: 0px 0px;
+ border: solid 1px #aacfe4;
+ width: 282px;
+ margin: 2px 2px 2px;
+}
+
+.adminForm label {
+ display: block;
+ font-size: 14px;
+ font-weight: bold;
+ text-align: right;
+ width: 180px;
+ float: left;
+ margin: 4px 2px 2px;
+}
+
+.adminBackupForm div.formelement {
+ display: block;
+ clear: both;
+ max-width: 1240px;
+}
+.adminFormsFeedbackPanel {
+ background-color: #F2FAFF;
+ color: #ff3300;
+ position:absolute;
+ left:550px;
+ width: 480px;
+ bottom: 16px;
+ z-index:999;
+}
+.adminPanel .adminListTable .selected {
+ background-color: #2779aa;
+}
Modified: openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css?rev=1518325&r1=1518324&r2=1518325&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css (original)
+++ openmeetings/trunk/singlewebapp/src/main/webapp/css/theme.css Wed Aug 28 18:47:44 2013
@@ -75,10 +75,6 @@ html, body {
font-size: 1em;
}
-.adminPanel {
- min-width: 1070px;
-}
-
#chatPanel {
position: fixed;
z-index: 2000;
@@ -113,224 +109,6 @@ html, body {
height: 50px;
max-height: 50px;
}
-/*
- ################################
- Column layout admin section
- ################################
- */
-.adminPanelColumnTable {
- display: inline-block;
- vertical-align: top;
-}
-
-table.adminListTable {
- max-width: 518px;
- min-width: 518px;
-}
-
-table.adminListTable th {
- background: #AFCBFB;
- color: #ffffff;
-}
-
-table.adminListTableSmall th {
- background: #AFCBFB;
- color: #ffffff;
-}
-
-table.adminListTable th.two_column_layout_column1 {
- width: 136px;
-}
-
-table.adminListTable th.two_column_layout_column2 {
- width: 354px;
-}
-
-table.adminListTable td.two_column_layout_column1 {
- width: 136px;
-}
-
-table.adminListTable td.two_column_layout_column2 {
- width: 354px;
-}
-
-table.adminListTable td div.two_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 136px;
-}
-
-table.adminListTable td div.two_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 354px;
-}
-
-table.adminListTable th.three_column_layout_column1 {
- width: 96px;
-}
-
-table.adminListTable th.three_column_layout_column2 {
- width: 150px;
-}
-
-table.adminListTable th.three_column_layout_column3 {
- width: 244px;
-}
-
-table.adminListTableSmall th.three_column_layout_column1 {
- width: 50px;
-}
-
-table.adminListTableSmall th.three_column_layout_column2 {
- width: 50px;
-}
-
-table.adminListTableSmall th.three_column_layout_column3 {
- width: 218px;
-}
-table.adminListTableSmall th.three_column_layout_column4 {
- width: 150px;
-}
-table.adminListTableSmall th.three_column_layout_column5 {
- width: 50px;
-}
-
-table.adminListTable td.three_column_layout_column1 {
- width: 96px;
-}
-
-table.adminListTable td.three_column_layout_column2 {
- width: 150px;
-}
-
-table.adminListTable td.three_column_layout_column3 {
- width: 244px;
-}
-
-table.adminListTableSmall td.three_column_layout_column1 {
- width: 50px;
-}
-
-table.adminListTableSmall td.three_column_layout_column2 {
- width: 50px;
-}
-
-table.adminListTableSmall td.three_column_layout_column3 {
- width: 218px;
-}
-table.adminListTableSmall td.three_column_layout_column4 {
- width: 150px;
-}
-table.adminListTableSmall td.three_column_layout_column5 {
- width: 50px;
-}
-
-table.adminListTable td div.three_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 96px;
-}
-
-table.adminListTable td div.three_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 150px;
-}
-
-table.adminListTable td div.three_column_layout_divcolumn3 {
- word-wrap: break-word;
- width: 244px;
-}
-
-table.adminListTableSmall td div.three_column_layout_divcolumn1 {
- width: 50px;
-}
-
-table.adminListTableSmall td div.three_column_layout_divcolumn2 {
- width: 50px;
-}
-
-table.adminListTableSmall td div.three_column_layout_divcolumn3 {
- width: 218px;
-}
-
-table.adminListTableSmall td div.three_column_layout_divcolumn4 {
- width: 150px;
-}
-
-table.adminListTableSmall td div.three_column_layout_divcolumn5 {
- width: 50px;
-}
-
-table.adminListTable th.four_column_layout_column1 {
- width: 96px;
-}
-
-table.adminListTable th.four_column_layout_column2 {
- width: 130px;
-}
-
-table.adminListTable th.four_column_layout_column3 {
- width: 132px;
-}
-
-table.adminListTable th.four_column_layout_column4 {
- width: 132px;
-}
-
-table.adminListTable td.four_column_layout_column1 {
- width: 96px;
-}
-
-table.adminListTable td.four_column_layout_column2 {
- width: 130px;
-}
-
-table.adminListTable td.four_column_layout_column3 {
- width: 132px;
-}
-
-table.adminListTable td.four_column_layout_column4 {
- width: 132px;
-}
-
-table.adminListTable td div.four_column_layout_divcolumn1 {
- word-wrap: break-word;
- width: 96px;
-}
-
-table.adminListTable td div.four_column_layout_divcolumn2 {
- word-wrap: break-word;
- width: 130px;
-}
-
-table.adminListTable td div.four_column_layout_divcolumn3 {
- word-wrap: break-word;
- width: 132px;
-}
-
-table.adminListTable td div.four_column_layout_divcolumn4 {
- word-wrap: break-word;
- width: 132px;
-}
-
-table.adminListTable tr.even {
- background-color: #EDF2FF;
-}
-
-table.adminListTableSmall tr.even {
- background-color: #EDF2FF;
-}
-
-table.adminListTable tr.odd {
- background-color: #F2FAFF;
-}
-
-table.adminListTableSmall tr.odd {
- background-color: #F2FAFF;
-}
-
-table.adminListTable tr:hover {
- background-color: #CCDCE8;
-}
-
.clickable {
cursor: pointer;
}
@@ -351,104 +129,6 @@ div.tableWrapperSmall {
overflow-y: scroll;
}
-.adminPanelColumnForm {
- display: inline-block;
- vertical-align: top;
- margin-top: 2px;
-}
-
-.adminPanelColumnForm div.scrollcontent {
- vertical-align: top;
- height: 500px;
- overflow-y: scroll;
-}
-
-.adminForm {
-
-}
-
-.adminForm input {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 280px;
- height: 20px;
- margin: 2px 2px;
-}
-
-.adminForm input.formcheckbox {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
- border: none;
- width: 20px;
- height: 20px;
- margin: 2px 2px;
-}
-
-.adminForm fieldset {
- background-color: #F2FAFF;
- border: solid 1px #aacfe4;
- margin-top: 4px;
- padding: 4px;
-}
-
-.adminForm legend {
- background-color: #F2FAFF;
- padding: 0.2em 0.5em;
- margin: 0px 10px;
- border: solid 1px #aacfe4;
- color: #000000;
- font-style: italic;
- text-align: right;
-}
-
-.adminForm textarea {
- display: block;
- float: left;
- font-size: 14px;
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 280px;
- height: 60px;
- margin: 2px 2px;
-}
-
-.adminForm div.formelement {
- display: block;
- clear: both;
- max-width: 490px;
-}
-
-.adminForm select {
- float: left;
- height: 20px;
- font-size: 14px;
- padding: 0px 0px;
- border: solid 1px #aacfe4;
- width: 282px;
- margin: 2px 2px 2px;
-}
-
-.adminForm label {
- display: block;
- font-size: 14px;
- font-weight: bold;
- text-align: right;
- width: 180px;
- float: left;
- margin: 4px 2px 2px;
-}
-
-.adminBackupForm div.formelement {
- display: block;
- clear: both;
- max-width: 1240px;
-}
-
.formelementradiobox {
margin-left: 100px;
}
@@ -618,15 +298,6 @@ div.tableWrapperSmall {
padding: 0px;
}
-.adminFormsFeedbackPanel {
- background-color: #F2FAFF;
- color: #ff3300;
- position:absolute;
- left:550px;
- width: 480px;
- bottom: 16px;
- z-index:999;
-}
.start_step1, .start_step2, .start_step3, .start_step4 {
padding-left: 30px;
margin: 5px 0px 5px 0px;