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 2018/04/28 07:58:13 UTC
[openmeetings] branch 4.0.x updated: [OPENMEETINGS-1865] minor
clean-up in UI and code
This is an automated email from the ASF dual-hosted git repository.
solomax pushed a commit to branch 4.0.x
in repository https://gitbox.apache.org/repos/asf/openmeetings.git
The following commit(s) were added to refs/heads/4.0.x by this push:
new 87a0a5b [OPENMEETINGS-1865] minor clean-up in UI and code
87a0a5b is described below
commit 87a0a5bc1cafa6e432154ca84738d202d55864fe
Author: Maxim Solodovnik <so...@gmail.com>
AuthorDate: Sat Apr 28 14:58:01 2018 +0700
[OPENMEETINGS-1865] minor clean-up in UI and code
---
.../org/apache/openmeetings/web/user/calendar/CalendarDialog.java | 6 ++++--
.../org/apache/openmeetings/web/user/calendar/CalendarPanel.html | 6 +++---
.../org/apache/openmeetings/web/user/calendar/CalendarPanel.java | 8 +++++---
openmeetings-web/src/main/webapp/css/admin.css | 2 +-
4 files changed, 13 insertions(+), 9 deletions(-)
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
index 83ea245..4104c6d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarDialog.java
@@ -579,13 +579,15 @@ public class CalendarDialog extends AbstractFormDialog<OmCalendar> {
AppointmentManager appointmentManager = calendarPanel.getAppointmentManager();
try {
OmCalendar calendar = getModelObject();
- if (url.isEnabled())
+ if (url.isEnabled()) {
calendar.setHref(url.getInput());
+ }
HttpClient client = calendarPanel.getHttpClient();
appointmentManager.provideCredentials(client, calendar,
new UsernamePasswordCredentials(username.getInput(), pass.getInput()));
- if (appointmentManager.testConnection(client, calendar))
+ if (appointmentManager.testConnection(client, calendar)) {
return;
+ }
} catch (Exception e) {
log.error("Error executing the TestConnection");
}
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
index 6498ce2..3f78612 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
@@ -25,9 +25,9 @@
<button wicket:id="submitCalendar"><span><wicket:message key="calendar.addCalendar"/></span></button>
<button wicket:id="syncCalendarButton"><span>Sync</span></button>
</div>
- <ul class="calendarlist" wicket:id="calendarListContainer">
- <li wicket:id="items">
- <input type="button" wicket:id="item"/>
+ <ul class="calendarlist striped-table" wicket:id="calendarListContainer">
+ <li wicket:id="items" class="ui-widget-content striped-row clickable">
+ <div wicket:id="item"><span wicket:id="name"></span></div>
</li>
</ul>
</div>
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
index e456192..731ded0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.java
@@ -48,12 +48,12 @@ import org.apache.wicket.core.request.handler.IPartialPageRequestHandler;
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.JavaScriptHeaderItem;
import org.apache.wicket.markup.html.WebMarkupContainer;
+import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.CompoundPropertyModel;
import org.apache.wicket.model.LoadableDetachableModel;
-import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.util.time.Duration;
import org.red5.logging.Red5LoggerFactory;
import org.slf4j.Logger;
@@ -255,7 +255,9 @@ public class CalendarPanel extends UserBasePanel {
protected void populateItem(final ListItem<OmCalendar> item) {
item.setOutputMarkupId(true);
final OmCalendar cal = item.getModelObject();
- item.add(new Button("item", new PropertyModel<String>(cal, "title")).add(new AjaxEventBehavior(EVT_CLICK) {
+ item.add(new WebMarkupContainer("item")
+ .add(new Label("name", cal.getTitle())));
+ item.add(new AjaxEventBehavior(EVT_CLICK) {
private static final long serialVersionUID = 1L;
@Override
@@ -263,7 +265,7 @@ public class CalendarPanel extends UserBasePanel {
calendarDialog.open(target, CalendarDialog.DIALOG_TYPE.UPDATE_CALENDAR, cal);
target.add(calendarDialog);
}
- }));
+ });
}
});
diff --git a/openmeetings-web/src/main/webapp/css/admin.css b/openmeetings-web/src/main/webapp/css/admin.css
index a863b4e..01f0b44 100644
--- a/openmeetings-web/src/main/webapp/css/admin.css
+++ b/openmeetings-web/src/main/webapp/css/admin.css
@@ -32,7 +32,7 @@
max-width: 518px;
min-width: 518px;
}
-.adminListTable tr:nth-child(odd), .adminListTableSmall tr:nth-child(odd) {
+.adminListTable tr:nth-child(odd), .adminListTableSmall tr:nth-child(odd), .striped-table .striped-row:nth-child(odd) {
opacity: .8;
}
.adminListTable tr.deleted {
--
To stop receiving notification emails like this one, please contact
solomax@apache.org.