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 2017/06/21 16:54:16 UTC
[1/2] openmeetings git commit: no jira: 'Edit settings' panel is
refactored
Repository: openmeetings
Updated Branches:
refs/heads/3.3.x 3909a8577 -> 7816c156e
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
index 19cabc1..dea9f72 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.html
@@ -7,68 +7,64 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div class="formelement">
- <label><wicket:message key="133" /></label><input type="password" wicket:id="password" />
+ <label wicket:for="address.email"><wicket:message key="137" /></label><input type="text" wicket:id="address.email" />
</div>
- <wicket:child/>
<div class="formelement">
- <label><wicket:message key="135" /></label><select
+ <label wicket:for="firstname"><wicket:message key="135" /></label><select
wicket:id="salutation" style="width: 60px;" /><input type="text"
wicket:id="firstname" style="width: 216px;" />
</div>
<div class="formelement">
- <label><wicket:message key="136" /></label><input type="text" wicket:id="lastname" />
+ <label wicket:for="lastname"><wicket:message key="136" /></label><input type="text" wicket:id="lastname" />
</div>
<div class="formelement">
- <label><wicket:message key="1143" /></label><select wicket:id="timeZoneId" />
+ <label wicket:for="timeZoneId"><wicket:message key="1143" /></label><select wicket:id="timeZoneId" />
</div>
<div class="formelement">
- <label><wicket:message key="111" /></label><select wicket:id="languageId" />
+ <label wicket:for="languageId"><wicket:message key="111" /></label><select wicket:id="languageId" />
</div>
<div class="formelement">
- <label><wicket:message key="137" /></label><input type="text" wicket:id="address.email" />
+ <label wicket:for="address.phone"><wicket:message key="607" /></label><input type="text" wicket:id="address.phone" />
</div>
<div class="formelement">
- <label><wicket:message key="607" /></label><input type="text" wicket:id="address.phone" />
+ <label wicket:for="sendSMS"><wicket:message key="1503" /></label><input class="formcheckbox" type="checkbox" wicket:id="sendSMS" />
</div>
<div class="formelement">
- <label><wicket:message key="1503" /></label><input class="formcheckbox" type="checkbox" wicket:id="sendSMS" />
+ <label wicket:for="age"><wicket:message key="138" /></label><input type="text" class="date time picker" wicket:id="age" style="width: 258px;" />
</div>
<div class="formelement">
- <label><wicket:message key="138" /></label><input type="text" class="date time picker" wicket:id="age" style="width: 258px;" />
- </div>
- <div class="formelement">
- <label><wicket:message key="139" /></label><input type="text"
+ <label wicket:for="address.street"><wicket:message key="139" /></label><input type="text"
wicket:id="address.street" style="width: 244px;" /> <input
type="text" wicket:id="address.additionalname" style="width: 30px;" />
</div>
<div class="formelement">
- <label><wicket:message key="140" /></label><input type="text"
+ <label wicket:for="address.town"><wicket:message key="140" /></label><input type="text"
wicket:id="address.zip" style="width: 60px;" /> <input type="text"
wicket:id="address.town" style="width: 214px;" />
</div>
<div class="formelement">
- <label><wicket:message key="141" /></label><select wicket:id="address.country" />
+ <label wicket:for="address.country"><wicket:message key="141" /></label><select wicket:id="address.country" />
</div>
<div class="formelement">
- <label><wicket:message key="142" /></label>
+ <label wicket:for="address.comment"><wicket:message key="142" /></label>
<textarea wicket:id="address.comment" />
</div>
<div class="formelement">
- <label><wicket:message key="161" /></label><div class="om-select2"><select class="input" wicket:id="groupUsers"></select></div>
+ <label wicket:for="groupUsers"><wicket:message key="161" /></label><div class="om-select2"><select class="input" wicket:id="groupUsers"></select></div>
</div>
</wicket:panel>
</html>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
index d8a6bac..ce74aba 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/GeneralUserForm.java
@@ -19,7 +19,6 @@
package org.apache.openmeetings.web.common;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
-import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.AVAILABLE_TIMEZONES;
import static org.apache.openmeetings.web.app.WebSession.getRights;
@@ -30,8 +29,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import org.apache.openmeetings.core.util.StrongPasswordValidator;
-import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.user.GroupDao;
import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.Group;
@@ -50,7 +47,6 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
-import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.form.TextArea;
import org.apache.wicket.markup.html.form.TextField;
@@ -68,24 +64,23 @@ import com.googlecode.wicket.kendo.ui.form.datetime.local.AjaxDatePicker;
public class GeneralUserForm extends Form<User> {
private static final long serialVersionUID = 1L;
+ private final RequiredTextField<String> email = new RequiredTextField<>("address.email");
private LocalDate age;
- private final PasswordTextField passwordField;
- private final RequiredTextField<String> email;
private final List<GroupUser> grpUsers = new ArrayList<>();
- private final StrongPasswordValidator passValidator;
private final boolean isAdminForm;
public GeneralUserForm(String id, IModel<User> model, boolean isAdminForm) {
super(id, model);
this.isAdminForm = isAdminForm;
-
- //TODO should throw exception if non admin User edit somebody else (or make all fields read-only)
- add(passwordField = new PasswordTextField("password", new Model<String>()));
- ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- passwordField.setResetPassword(false)
- .add(passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), model.getObject()));
-
updateModelObject(getModelObject(), isAdminForm);
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(email);
+ email.setLabel(Model.of(Application.getString(137)));
+ email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new DropDownChoice<>("salutation"
, Arrays.asList(Salutation.values())
, new ChoiceRenderer<Salutation>() {
@@ -103,14 +98,8 @@ public class GeneralUserForm extends Form<User> {
}));
add(new TextField<String>("firstname"));
add(new TextField<String>("lastname"));
-
add(new DropDownChoice<>("timeZoneId", AVAILABLE_TIMEZONES));
-
add(new LanguageDropDown("languageId"));
-
- add(email = new RequiredTextField<>("address.email"));
- email.setLabel(Model.of(Application.getString(137)));
- email.add(RfcCompliantEmailAddressValidator.getInstance());
add(new TextField<String>("address.phone"));
add(new CheckBox("sendSMS"));
add(new AjaxDatePicker("age", new PropertyModel<LocalDate>(this, "age"), WebSession.get().getLocale()) {
@@ -128,11 +117,6 @@ public class GeneralUserForm extends Form<User> {
add(new TextField<String>("address.town"));
add(new CountryDropDown("address.country"));
add(new TextArea<String>("address.comment"));
- }
-
- @Override
- protected void onInitialize() {
- super.onInitialize();
add(new Select2MultiChoice<>("groupUsers", null, new RestrictiveChoiceProvider<GroupUser>() {
private static final long serialVersionUID = 1L;
@@ -171,7 +155,6 @@ public class GeneralUserForm extends Form<User> {
public void updateModelObject(User u, boolean isAdminForm) {
grpUsers.clear();
grpUsers.addAll(u.getGroupUsers());
- passValidator.setUser(u);
if (isAdminForm) {
List<Group> grpList = hasGroupAdminLevel(getRights())
? getBean(GroupDao.class).get(null, getUserId(), 0, Integer.MAX_VALUE, null)
@@ -196,14 +179,6 @@ public class GeneralUserForm extends Form<User> {
super.onValidate();
}
- public PasswordTextField getPasswordField() {
- return passwordField;
- }
-
- public String getEmail() {
- return email.getValue();
- }
-
@Override
protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
return new PanelMarkupSourcingStrategy(false);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
index 24c7a40..e3e2690 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -24,4 +24,4 @@
<span wicket:id="appName"></span>
</div>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
index a1b15da..5c36069 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/InvitationDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
index b83c5e8..76d4f0b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -26,4 +26,4 @@
<input type="submit" wicket:id="search" wicket:message="value:715"/>
</form>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
index a3728e5..09b875a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagingNavigatorPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
index 3a18a74..fedd65a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/UploadableImagePanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
index c9f997f..618ff88 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/menu/MenuPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
index 5087055..5c5e9c8 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/BasePage.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org" wicket:id="html">
<head>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
index a6896fa..a48716e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/NotInitedPage.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
index 5e39f7b..c0d7c69 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/ResetPage.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
index e10aae7..0bac14e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ForgetPasswordDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -47,4 +47,4 @@
</form>
<div wicket:id="confirmDialog"></div>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
index a72f866..436a059 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/KickMessageDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -26,4 +26,4 @@
</tr>
</table>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
index 476a5d2..ea22f9c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/ResetPasswordDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -27,11 +27,11 @@
<td><input type="text" readonly wicket:id="login" /></td>
</tr>
<tr>
- <td><label><wicket:message key="328" /></label></td>
+ <td><label wicket:for="password"><wicket:message key="328" /></label></td>
<td><input type="password" wicket:id="password" /></td>
</tr>
<tr>
- <td><label><wicket:message key="329" /></label></td>
+ <td><label wicket:for="confirmPassword"><wicket:message key="329" /></label></td>
<td><input type="password" wicket:id="confirmPassword" /></td>
</tr>
</table>
@@ -40,4 +40,4 @@
</form>
<div wicket:id="confirmReset"></div>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
index f9ede65..3ccc2f2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInDialog.java
@@ -206,7 +206,7 @@ public class SignInDialog extends NonClosableDialog<String> {
try {
Thread.sleep(6 + (long)(10 * Math.random() * 1000));
} catch (InterruptedException e) {
- log.error("Unexpected exception while sleeting", e);
+ log.error("Unexpected exception while sleeping", e);
}
strategy.remove();
shake(target);
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
index 3b0451f..42b1893 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/auth/SignInPage.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
index 0e66813..697a87f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/EventDetailDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
index e8697bf..0198f94 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/RoomMenuPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
index 2acbce2..2fa2772 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/menu/SipDialerDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
index d7fd00a..681812f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/CreatePollDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
index 9fcd956..59899fa 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/PollResultsDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
index fa3f733..a4c11e5 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/room/poll/VoteDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
index a69db09..8bb1d84 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/AboutDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -37,6 +37,6 @@
<td><wicket:message key="1553" /></td>
<td wicket:id="buildDate">[buildDate]</td>
</tr>
- </table>
+ </table>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
index 3dfb5fa..266a27a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserMessageDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
index 8d56172..12445fb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/InviteUserToRoomDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
index 364210f..1b60e5a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/MessageDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:head>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
index f450843..a68a31d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/UserInfoDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/calendar/CalendarPanel.html
----------------------------------------------------------------------
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 d365bca..6498ce2 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
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
index 4736e23..e624f2c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/WelcomeWidgetView.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
index 065886c..820e317 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminCleanupInfoDialog.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
index 1912617..1728c9b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/AdminWidgetView.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
index c501f30..76c4fd4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupEntityUnitPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
index f9b4fa5..1850f6bb 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/dashboard/admin/CleanupUnitPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
new file mode 100644
index 0000000..b7748e5
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.html
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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.
+
+-->
+<html xmlns:wicket="http://wicket.apache.org">
+<wicket:panel>
+ <form wicket:id="form">
+ <div wicket:id="feedback"></div>
+ <table>
+ <tr>
+ <td class="desc"><label wicket:for="current"><wicket:message key="current.password" /></label></td>
+ <td><input wicket:id="current" type="password" value="" /></td>
+ </tr>
+ <tr>
+ <td class="desc"><label wicket:for="pass"><wicket:message key="328" /></label></td>
+ <td><input wicket:id="pass" type="password" value="" /></td>
+ </tr>
+ <tr>
+ <td class="desc"><label wicket:for="pass2"><wicket:message key="329" /></label></td>
+ <td><input wicket:id="pass2" type="password" value="" /></td>
+ </tr>
+ </table>
+ </form>
+</wicket:panel>
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
new file mode 100644
index 0000000..538012e
--- /dev/null
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ChangePasswordDialog.java
@@ -0,0 +1,132 @@
+/*
+ * 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.
+ */
+package org.apache.openmeetings.web.user.profile;
+
+import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
+import static org.apache.openmeetings.web.app.Application.getBean;
+import static org.apache.openmeetings.web.app.WebSession.getUserId;
+
+import java.util.Arrays;
+import java.util.List;
+
+import org.apache.openmeetings.core.util.StrongPasswordValidator;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
+import org.apache.openmeetings.db.dao.user.UserDao;
+import org.apache.openmeetings.web.app.Application;
+import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
+
+import com.googlecode.wicket.jquery.core.Options;
+import com.googlecode.wicket.jquery.ui.widget.dialog.AbstractFormDialog;
+import com.googlecode.wicket.jquery.ui.widget.dialog.DialogButton;
+import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+
+public class ChangePasswordDialog extends AbstractFormDialog<String> {
+ private static final long serialVersionUID = 1L;
+ private static final Logger log = Red5LoggerFactory.getLogger(ChangePasswordDialog.class, webAppRootKey);
+ private final DialogButton update = new DialogButton("update", Model.of(Application.getString("327"))) {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public boolean isIndicating() {
+ return true;
+ }
+ };
+ private final DialogButton cancel = new DialogButton("cancel", Model.of(Application.getString("25")));
+ private final PasswordTextField current = new PasswordTextField("current", Model.of((String)null));
+ private final PasswordTextField pass = new PasswordTextField("pass", Model.of((String)null));
+ private final PasswordTextField pass2 = new PasswordTextField("pass2", Model.of((String)null));
+ private StrongPasswordValidator passValidator;
+ private final Form<String> form = new Form<String>("form") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onValidate() {
+ String p = current.getConvertedInput();
+ if (!Strings.isEmpty(p) && !getBean(UserDao.class).verifyPassword(getUserId(), p)) {
+ error(getString("231"));
+ // add random timeout
+ try {
+ Thread.sleep(6 + (long)(10 * Math.random() * 1000));
+ } catch (InterruptedException e) {
+ log.error("Unexpected exception while sleeting", e);
+ }
+ }
+ String p1 = pass.getConvertedInput();
+ if (!Strings.isEmpty(p1) && !p1.equals(pass2.getConvertedInput())) {
+ error(Application.getString(232));
+ }
+ super.onValidate();
+ }
+ };
+ private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
+
+ public ChangePasswordDialog(String id) {
+ super(id, Model.of(Application.getString("327")));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
+ passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), getBean(UserDao.class).get(getUserId()));
+ add(form.add(
+ current.setLabel(Model.of(getString("current.password"))).setRequired(true)
+ , pass.setLabel(Model.of(getString("328"))).add(passValidator)
+ , pass2.setLabel(Model.of(getString("329")))
+ , feedback.setOutputMarkupId(true)
+ ));
+ }
+
+ @Override
+ protected List<DialogButton> getButtons() {
+ return Arrays.asList(update, cancel);
+ }
+
+ @Override
+ public DialogButton getSubmitButton() {
+ return update;
+ }
+
+ @Override
+ public Form<?> getForm() {
+ return form;
+ }
+
+ @Override
+ protected void onError(AjaxRequestTarget target) {
+ target.add(feedback);
+ }
+
+ @Override
+ protected void onSubmit(AjaxRequestTarget target) {
+ try {
+ getBean(UserDao.class).update(getBean(UserDao.class).get(getUserId()), pass.getModelObject(), getUserId());
+ } catch (Exception e) {
+ error(e.getMessage());
+ target.add(feedback);
+ }
+ }
+}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
index 0c8bc10..e23062b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/MessagesContactsPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
index 2b594e7..b836d6e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
@@ -7,21 +7,20 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<div wicket:id="buttons"></div>
- <div wicket:id="feedback"></div>
<table style="width: 100%; height: 100%">
<tr>
<td rowspan="2">
@@ -29,6 +28,10 @@
<legend class="ui-widget-header">
<wicket:message key="143" />
</legend>
+ <button type="button" wicket:id="changePwd" id="changePwd" style="margin-left: 180px;"><wicket:message key="327"/></button>
+ <div class="formelement">
+ <label wicket:for="passwd"><wicket:message key="current.password" /></label><input type="password" wicket:id="passwd" />
+ </div>
<form wicket:id="general"></form>
</fieldset>
</td>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
index 25e280c..5aa8251 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfileForm.java
@@ -18,6 +18,7 @@
*/
package org.apache.openmeetings.web.user.profile;
+import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
import static org.apache.openmeetings.web.app.WebSession.getUserId;
@@ -25,27 +26,43 @@ import org.apache.openmeetings.db.dao.user.UserDao;
import org.apache.openmeetings.db.entity.user.User;
import org.apache.openmeetings.web.common.ComunityUserForm;
import org.apache.openmeetings.web.common.FormSaveRefreshPanel;
+import org.apache.openmeetings.web.common.GeneralUserForm;
import org.apache.openmeetings.web.common.UploadableProfileImagePanel;
+import org.apache.wicket.ajax.AjaxEventBehavior;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.form.AjaxFormValidatingBehavior;
+import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.util.string.Strings;
import org.apache.wicket.util.time.Duration;
+import org.red5.logging.Red5LoggerFactory;
+import org.slf4j.Logger;
-import com.googlecode.wicket.jquery.core.Options;
-import com.googlecode.wicket.kendo.ui.panel.KendoFeedbackPanel;
+import com.googlecode.wicket.jquery.ui.form.button.ButtonBehavior;
public class ProfileForm extends Form<User> {
private static final long serialVersionUID = 1L;
- private final UserForm userForm;
- private final KendoFeedbackPanel feedback = new KendoFeedbackPanel("feedback", new Options("button", true));
+ private static final Logger log = Red5LoggerFactory.getLogger(ProfileForm.class, webAppRootKey);
+ private final PasswordTextField passwd = new PasswordTextField("passwd", new Model<String>());
+ private final GeneralUserForm userForm;
+ private final ChangePasswordDialog chPwdDlg;
- public ProfileForm(String id) {
+ public ProfileForm(String id, final ChangePasswordDialog chPwdDlg) {
super(id, new CompoundPropertyModel<>(getBean(UserDao.class).get(getUserId())));
+ userForm = new GeneralUserForm("general", getModel(), false);
+ this.chPwdDlg = chPwdDlg;
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ add(passwd.setLabel(Model.of(getString("current.password"))).setRequired(true));
- add(feedback.setOutputMarkupId(true));
add(new FormSaveRefreshPanel<User>("buttons", this) {
private static final long serialVersionUID = 1L;
@@ -62,7 +79,7 @@ public class ProfileForm extends Form<User> {
@Override
protected void onSaveSubmit(AjaxRequestTarget target, Form<?> form) {
try {
- getBean(UserDao.class).update(getModelObject(), userForm.getPasswordField().getConvertedInput(), getUserId());
+ getBean(UserDao.class).update(getModelObject(), null, getUserId());
} catch (Exception e) {
error(e.getMessage());
}
@@ -86,7 +103,15 @@ public class ProfileForm extends Form<User> {
// FIXME update feedback with the error details
}
});
- add(userForm = new UserForm("general", getModel()));
+ add(new WebMarkupContainer("changePwd").add(new ButtonBehavior("#changePwd"), new AjaxEventBehavior("click") {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onEvent(AjaxRequestTarget target) {
+ chPwdDlg.open(target);
+ }
+ }));
+ add(userForm);
add(new UploadableProfileImagePanel("img", getUserId()));
add(new ComunityUserForm("comunity", getModel()));
@@ -96,6 +121,21 @@ public class ProfileForm extends Form<User> {
}
@Override
+ protected void onValidate() {
+ String p = passwd.getConvertedInput();
+ if (!Strings.isEmpty(p) && !getBean(UserDao.class).verifyPassword(getModelObject().getId(), p)) {
+ error(getString("231"));
+ // add random timeout
+ try {
+ Thread.sleep(6 + (long)(10 * Math.random() * 1000));
+ } catch (InterruptedException e) {
+ log.error("Unexpected exception while sleeting", e);
+ }
+ }
+ super.onValidate();
+ }
+
+ @Override
protected IMarkupSourcingStrategy newMarkupSourcingStrategy() {
return new PanelMarkupSourcingStrategy(false);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html
index 3335891..e215f2a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.html
@@ -7,19 +7,20 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
<form wicket:id="form" class="adminForm"/>
+ <div wicket:id="changePasswd"></div>
</wicket:panel>
</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
index 8aab3a7..c3c2468 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/ProfilePanel.java
@@ -26,7 +26,8 @@ public class ProfilePanel extends UserPanel {
public ProfilePanel(String id) {
super(id);
setOutputMarkupId(true);
-
- add(new ProfileForm("form"));
+
+ final ChangePasswordDialog chPwdDlg = new ChangePasswordDialog("changePasswd");
+ add(chPwdDlg, new ProfileForm("form", chPwdDlg));
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
index c02100a..6c52e55 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/SettingsPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.html
deleted file mode 100644
index 9d9b117..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.html
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
- 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.
-
--->
-<html xmlns:wicket="http://wicket.apache.org">
-<wicket:extend>
- <div class="formelement">
- <label><wicket:message key="134" /></label><input type="password" wicket:id="confirmPassword" />
- </div>
-</wicket:extend>
-</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
deleted file mode 100644
index f8fc088..0000000
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserForm.java
+++ /dev/null
@@ -1,46 +0,0 @@
-/*
- * 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.
- */
-package org.apache.openmeetings.web.user.profile;
-
-import org.apache.openmeetings.db.entity.user.User;
-import org.apache.openmeetings.web.app.Application;
-import org.apache.openmeetings.web.common.GeneralUserForm;
-import org.apache.wicket.markup.html.form.PasswordTextField;
-import org.apache.wicket.model.IModel;
-import org.apache.wicket.model.Model;
-
-public class UserForm extends GeneralUserForm {
- private static final long serialVersionUID = 1L;
- private final PasswordTextField confirmPassword;
-
- public UserForm(String id, IModel<User> model) {
- super(id, model, false);
- add(confirmPassword = new PasswordTextField("confirmPassword", new Model<String>()));
- confirmPassword.setRequired(false);
- }
-
- @Override
- protected void onValidate() {
- String pass = getPasswordField().getConvertedInput();
- if (pass != null && !pass.isEmpty() && !pass.equals(confirmPassword.getConvertedInput())) {
- error(Application.getString(232));
- }
- super.onValidate();
- }
-}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
index 7df1978..99a90c2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserProfilePanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
index 33b62b6..c2ded01 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/UserSearchPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -66,4 +66,4 @@
</tr>
</table>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
index eeabc06..11f260c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/profile/WidgetsPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -28,4 +28,4 @@
</tr>
</table>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
index 15c9138..4053014 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
index 82e1b93..734fdb0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomListPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
index 4a57ffe..00c863e 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -29,23 +29,23 @@
<!-- Users in this Room -->
<fieldset class="ui-widget-content" wicket:id="details">
<div class="formelement" style="font-style: italic;">
- <label><wicket:message key="404" /></label>
+ <label><wicket:message key="404" /></label>
</div>
<div class="formelement">
- <label style="font-weight: bold;"><wicket:message key="406" /></label>
- <span wicket:id="roomName"></span> #<span wicket:id="roomId"></span>
+ <label style="font-weight: bold;"><wicket:message key="406" /></label>
+ <span wicket:id="roomName"></span> #<span wicket:id="roomId"></span>
</div>
<div class="formelement">
- <label style="font-weight: bold;"><wicket:message key="270" /></label>
- <span wicket:id="roomComment"></span>
+ <label style="font-weight: bold;"><wicket:message key="270" /></label>
+ <span wicket:id="roomComment"></span>
</div>
<div class="formelement">
- <label><wicket:message key="407" /></label>
+ <label><wicket:message key="407" /></label>
</div>
<div class="tableWrapper" id="adminTable">
<table class="adminListTable">
- <tbody wicket:id="clientsContainer">
- <tr wicket:id="clients">
+ <tbody wicket:id="clientsContainer">
+ <tr wicket:id="clients">
<td style="width: 50px;"><img wicket:id="clientImage" style="min-width: 50px; height:50px" /></td>
<td style="width: 350px; height:50px">
<div style="width: 350px; height:50px"><span wicket:id="clientLogin"></span> <wicket:message key="408"/> <span wicket:id="from"></span></div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
index f433301..4865b9b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsSelectorPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
index a92599d..2863b7a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/rooms/RoomsTabbedPanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
[2/2] openmeetings git commit: no jira: 'Edit settings' panel is
refactored
Posted by so...@apache.org.
no jira: 'Edit settings' panel is refactored
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/7816c156
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/7816c156
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/7816c156
Branch: refs/heads/3.3.x
Commit: 7816c156eb3efcc25e3307f559a8cee801358d1b
Parents: 3909a85
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Wed Jun 21 23:54:06 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Wed Jun 21 23:54:06 2017 +0700
----------------------------------------------------------------------
.../service/mail/template/FeedbackTemplate.html | 8 +-
.../mail/template/InvitationTemplate.html | 6 +-
.../template/RequestContactConfirmTemplate.html | 8 +-
.../mail/template/RequestContactTemplate.html | 8 +-
.../web/admin/backup/BackupPanel.html | 2 +-
.../web/admin/configurations/ConfigsPanel.html | 6 +-
.../web/admin/groups/GroupsPanel.html | 20 +--
.../web/admin/labels/LangPanel.html | 4 +-
.../web/admin/ldaps/LdapsPanel.html | 12 +-
.../web/admin/oauth/OAuthPanel.html | 30 ++--
.../web/admin/rooms/RoomsPanel.html | 52 +++----
.../web/admin/servers/ServersPanel.html | 20 +--
.../openmeetings/web/admin/users/UserForm.html | 13 +-
.../openmeetings/web/admin/users/UserForm.java | 141 ++++++++++---------
.../web/app/Application.properties.xml | 1 +
.../web/app/Application_ar.properties.xml | 1 +
.../web/app/Application_bg.properties.xml | 1 +
.../web/app/Application_ca.properties.xml | 1 +
.../web/app/Application_cs.properties.xml | 1 +
.../web/app/Application_da.properties.xml | 1 +
.../web/app/Application_de.properties.xml | 1 +
.../web/app/Application_el.properties.xml | 1 +
.../web/app/Application_es.properties.xml | 1 +
.../web/app/Application_fa.properties.xml | 1 +
.../web/app/Application_fi.properties.xml | 1 +
.../web/app/Application_fr.properties.xml | 1 +
.../web/app/Application_gl.properties.xml | 1 +
.../web/app/Application_hu.properties.xml | 1 +
.../web/app/Application_id.properties.xml | 1 +
.../web/app/Application_it.properties.xml | 1 +
.../web/app/Application_ja.properties.xml | 1 +
.../web/app/Application_ko.properties.xml | 1 +
.../web/app/Application_nl.properties.xml | 1 +
.../web/app/Application_pl.properties.xml | 1 +
.../web/app/Application_pt.properties.xml | 1 +
.../web/app/Application_pt_BR.properties.xml | 1 +
.../web/app/Application_ru.properties.xml | 1 +
.../web/app/Application_sk.properties.xml | 1 +
.../web/app/Application_sv.properties.xml | 1 +
.../web/app/Application_th.properties.xml | 1 +
.../web/app/Application_tr.properties.xml | 1 +
.../web/app/Application_uk.properties.xml | 1 +
.../web/app/Application_zh_CN.properties.xml | 1 +
.../web/app/Application_zh_TW.properties.xml | 1 +
.../web/common/ComunityUserForm.html | 12 +-
.../web/common/ConfirmableAjaxBorder.html | 6 +-
.../web/common/ErrorMessagePanel.html | 6 +-
.../web/common/GeneralUserForm.html | 36 +++--
.../web/common/GeneralUserForm.java | 43 ++----
.../openmeetings/web/common/HeaderPanel.html | 8 +-
.../web/common/InvitationDialog.html | 6 +-
.../web/common/PagedEntityListPanel.html | 8 +-
.../web/common/PagingNavigatorPanel.html | 6 +-
.../web/common/UploadableImagePanel.html | 6 +-
.../openmeetings/web/common/menu/MenuPanel.html | 6 +-
.../apache/openmeetings/web/pages/BasePage.html | 6 +-
.../openmeetings/web/pages/NotInitedPage.html | 6 +-
.../openmeetings/web/pages/ResetPage.html | 6 +-
.../web/pages/auth/ForgetPasswordDialog.html | 8 +-
.../web/pages/auth/KickMessageDialog.html | 8 +-
.../web/pages/auth/ResetPasswordDialog.html | 12 +-
.../web/pages/auth/SignInDialog.java | 2 +-
.../openmeetings/web/pages/auth/SignInPage.html | 6 +-
.../web/room/EventDetailDialog.html | 6 +-
.../web/room/menu/RoomMenuPanel.html | 6 +-
.../web/room/menu/SipDialerDialog.html | 6 +-
.../web/room/poll/CreatePollDialog.html | 6 +-
.../web/room/poll/PollResultsDialog.html | 6 +-
.../openmeetings/web/room/poll/VoteDialog.html | 6 +-
.../openmeetings/web/user/AboutDialog.html | 8 +-
.../web/user/InviteUserMessageDialog.html | 6 +-
.../web/user/InviteUserToRoomDialog.html | 6 +-
.../openmeetings/web/user/MessageDialog.html | 6 +-
.../openmeetings/web/user/UserInfoDialog.html | 6 +-
.../web/user/calendar/CalendarPanel.html | 6 +-
.../web/user/dashboard/WelcomeWidgetView.html | 6 +-
.../dashboard/admin/AdminCleanupInfoDialog.html | 6 +-
.../user/dashboard/admin/AdminWidgetView.html | 6 +-
.../dashboard/admin/CleanupEntityUnitPanel.html | 6 +-
.../user/dashboard/admin/CleanupUnitPanel.html | 6 +-
.../web/user/profile/ChangePasswordDialog.html | 41 ++++++
.../web/user/profile/ChangePasswordDialog.java | 132 +++++++++++++++++
.../web/user/profile/MessagesContactsPanel.html | 6 +-
.../web/user/profile/ProfileForm.html | 11 +-
.../web/user/profile/ProfileForm.java | 56 ++++++--
.../web/user/profile/ProfilePanel.html | 7 +-
.../web/user/profile/ProfilePanel.java | 5 +-
.../web/user/profile/SettingsPanel.html | 6 +-
.../openmeetings/web/user/profile/UserForm.html | 27 ----
.../openmeetings/web/user/profile/UserForm.java | 46 ------
.../web/user/profile/UserProfilePanel.html | 6 +-
.../web/user/profile/UserSearchPanel.html | 8 +-
.../web/user/profile/WidgetsPanel.html | 8 +-
.../user/record/RecordingInvitationForm.html | 6 +-
.../web/user/rooms/RoomListPanel.html | 6 +-
.../openmeetings/web/user/rooms/RoomsPanel.html | 22 +--
.../web/user/rooms/RoomsSelectorPanel.html | 6 +-
.../web/user/rooms/RoomsTabbedPanel.html | 6 +-
98 files changed, 611 insertions(+), 455 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
index 68b10b4..555053c 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/FeedbackTemplate.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
@@ -27,4 +27,4 @@
<b>Click on this link to participate in the Meeting:</b><br/>
<a wicket:id="invitation_link">Click here to enter room</a><br/>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
index d47fbcf..b82995e 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/InvitationTemplate.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
index 0c73eb5..97be226 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactConfirmTemplate.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
@@ -24,4 +24,4 @@
<br/>
<span wicket:id="addedFirstName"></span> <span wicket:id="addedLastName"></span> <span wicket:id="confirmed"></span><br/>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
----------------------------------------------------------------------
diff --git a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
index 967bfce..156b0db 100644
--- a/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
+++ b/openmeetings-service/src/main/java/org/apache/openmeetings/service/mail/template/RequestContactTemplate.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:extend>
@@ -28,4 +28,4 @@
<br/>
<a wicket:id="link"><span wicket:id="contactList"></span></a><br/>
</wicket:extend>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
index edb9ff7..0e1d036 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
@@ -33,7 +33,7 @@
<div class="info-text"><wicket:message key="1065" /></div>
</div>
<div class="formelement">
- <label><wicket:message key="1537" /></label> <input type="checkbox" wicket:id="includeFilesInBackup" />
+ <label wicket:for="includeFilesInBackup"><wicket:message key="1537" /></label> <input type="checkbox" wicket:id="includeFilesInBackup" />
</div>
<div class="formelement">
<span wicket:id="progress"></span>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
index e806ac9..b41c0c6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
@@ -50,10 +50,10 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="266" /></legend>
<div class="formelement">
- <label><wicket:message key="267" /></label><input type="text" wicket:id="key"/>
+ <label wicket:for="key"><wicket:message key="267" /></label><input type="text" wicket:id="key"/>
</div>
<div class="formelement">
- <label><wicket:message key="271" /></label><input type="text" wicket:id="value"/>
+ <label wicket:for="value"><wicket:message key="271" /></label><input type="text" wicket:id="value"/>
</div>
<div class="formelement">
<label><wicket:message key="268" /></label><span wicket:id="updated"/>
@@ -62,7 +62,7 @@
<label><wicket:message key="269" /></label><span wicket:id="user.login"/>
</div>
<div class="formelement">
- <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+ <label wicket:for="comment"><wicket:message key="270" /></label><textarea wicket:id="comment"/>
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
index a1e5637..b8b00b9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
@@ -46,40 +46,40 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="170" /></legend>
<div class="formelement">
- <label><wicket:message key="171" /></label><input type="text" wicket:id="name" />
+ <label wicket:for="name"><wicket:message key="171" /></label><input type="text" wicket:id="name" />
</div>
<div class="formelement">
<label><wicket:message key="admin.group.form.logo" /></label><div wicket:id="logo" class="input group logo"></div>
</div>
<div class="formelement">
- <label><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" />
+ <label wicket:for="tag"><wicket:message key="admin.group.form.tag" /></label><input type="text" wicket:id="tag" />
</div>
<div class="formelement">
- <label style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div>
+ <label wicket:for="user2add" style="font-weight: bold;"><wicket:message key="178" /></label><div class="om-select2"><select wicket:id="user2add" class="input"></select></div>
</div>
<div class="formelement">
<div wicket:id="users"></div>
</div>
<div class="formelement">
- <label><wicket:message key="restricted.group.files" /></label><input type="checkbox" wicket:id="restricted" />
+ <label wicket:for="restricted"><wicket:message key="restricted.group.files" /></label><input type="checkbox" wicket:id="restricted" />
</div>
<div class="formelement">
- <label><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" />
+ <label wicket:for="limited"><wicket:message key="admin.group.form.limited" /></label><input type="checkbox" wicket:id="limited" />
</div>
<div class="formelement" style="display:none">
- <label><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/>
+ <label wicket:for="maxFilesSize"><wicket:message key="admin.group.form.maxFilesSize" /></label><input type="number" wicket:id="maxFilesSize" /><wicket:message key="network.test.mb"/>
</div>
<div class="formelement" style="display:none">
- <label><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/>
+ <label wicket:for="maxRecordingsSize"><wicket:message key="admin.group.form.maxRecordingsSize" /></label><input type="number" wicket:id="maxRecordingsSize" /><wicket:message key="network.test.mb"/>
</div>
<div class="formelement" style="display:none">
- <label><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" />
+ <label wicket:for="maxRooms"><wicket:message key="admin.group.form.maxRooms" /></label><input type="number" wicket:id="maxRooms" />
</div>
<div class="formelement">
- <label><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/>
+ <label wicket:for="recordingTtl"><wicket:message key="admin.group.form.recordingTtl" /></label><input type="number" wicket:id="recordingTtl" /><wicket:message key="admin.group.form.days"/>
</div>
<div class="formelement">
- <label><wicket:message key="admin.group.form.reminderDays" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/>
+ <label wicket:for="reminderDays"><wicket:message key="admin.group.form.reminderDays" /></label><input type="number" wicket:id="reminderDays" /><wicket:message key="admin.group.form.days"/>
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
index 1e346f3..fe4e6e9 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
@@ -82,10 +82,10 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="353" /></legend>
<div class="formelement">
- <label><wicket:message key="354" /></label><input type="text" wicket:id="key"/>
+ <label wicket:for="key"><wicket:message key="354" /></label><input type="text" wicket:id="key"/>
</div>
<div class="formelement">
- <label><wicket:message key="355" /></label><textarea wicket:id="value"></textarea>
+ <label wicket:for="value"><wicket:message key="355" /></label><textarea wicket:id="value"></textarea>
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
index fdccaf8..db898d2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
@@ -50,10 +50,10 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1107" /></legend>
<div class="formelement">
- <label><wicket:message key="1108" /></label><input type="text" wicket:id="name"/>
+ <label wicket:for="name"><wicket:message key="1108" /></label><input type="text" wicket:id="name"/>
</div>
<div class="formelement">
- <label><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/>
+ <label wicket:for="active"><wicket:message key="1109" /></label><input type="checkbox" class="formcheckbox" wicket:id="active"/>
</div>
<div class="formelement">
<label><wicket:message key="1110" /></label><span wicket:id="inserted"/>
@@ -70,18 +70,18 @@
<div class="formelement">
<div class="info-text"><wicket:message key="1114" /></div>
<br/>
- <label><wicket:message key="1115" /></label><input type="text" wicket:id="configFileName"/>
+ <label wicket:for="configFileName"><wicket:message key="1115" /></label><input type="text" wicket:id="configFileName"/>
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="1116" /></div>
<br/>
- <label><wicket:message key="1117" /></label><input type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/>
+ <label wicket:for="addDomainToUserName"><wicket:message key="1117" /></label><input type="checkbox" class="formcheckbox" wicket:id="addDomainToUserName"/>
</div>
<div class="formelement">
- <label><wicket:message key="1118" /></label><input type="text" wicket:id="domain"/>
+ <label wicket:for="domain"><wicket:message key="1118" /></label><input type="text" wicket:id="domain"/>
</div>
<div class="formelement">
- <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+ <label wicket:for="comment"><wicket:message key="270" /></label><textarea wicket:id="comment"/>
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
index 77b0daa..08f2fe0 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
@@ -48,49 +48,49 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1581" /></legend>
<div class="formelement">
- <label><wicket:message key="1574" /></label><input type="checkbox" class="formcheckbox" wicket:id="isEnabled"/>
+ <label wicket:for="isEnabled"><wicket:message key="1574" /></label><input type="checkbox" class="formcheckbox" wicket:id="isEnabled"/>
</div>
<div class="formelement">
- <label><wicket:message key="1573" /></label><input type="text" wicket:id="name"/>
+ <label wicket:for="name"><wicket:message key="1573" /></label><input type="text" wicket:id="name"/>
</div>
<div class="formelement">
- <label><wicket:message key="1575" /></label><input type="text" wicket:id="iconUrl"/>
+ <label wicket:for="iconUrl"><wicket:message key="1575" /></label><input type="text" wicket:id="iconUrl"/>
</div>
<div class="formelement">
- <label><wicket:message key="1576" /></label><input type="text" wicket:id="clientId"/>
+ <label wicket:for="clientId"><wicket:message key="1576" /></label><input type="text" wicket:id="clientId"/>
</div>
<div class="formelement">
- <label><wicket:message key="1577" /></label><input type="text" wicket:id="clientSecret"/>
+ <label wicket:for="clientSecret"><wicket:message key="1577" /></label><input type="text" wicket:id="clientSecret"/>
</div>
<div class="formelement">
- <label><wicket:message key="1587" /></label><input type="text" readonly="readonly" wicket:id="redirectUri"/>
+ <label wicket:for="redirectUri"><wicket:message key="1587" /></label><input type="text" readonly="readonly" wicket:id="redirectUri"/>
</div>
<div class="formelement">
- <label><wicket:message key="1578" /></label><input type="text" wicket:id="requestKeyUrl"/>
+ <label wicket:for="requestKeyUrl"><wicket:message key="1578" /></label><input type="text" wicket:id="requestKeyUrl"/>
</div>
<div class="formelement">
- <label><wicket:message key="1579" /></label><input type="text" wicket:id="requestTokenUrl"/>
+ <label wicket:for="requestTokenUrl"><wicket:message key="1579" /></label><input type="text" wicket:id="requestTokenUrl"/>
</div>
<div class="formelement">
- <label><wicket:message key="1586" /></label><input type="text" wicket:id="requestTokenAttributes"/>
+ <label wicket:for="requestTokenAttributes"><wicket:message key="1586" /></label><input type="text" wicket:id="requestTokenAttributes"/>
</div>
<div class="formelement">
- <label><wicket:message key="1580" /></label><input type="text" wicket:id="requestInfoUrl"/>
+ <label wicket:for="requestInfoUrl"><wicket:message key="1580" /></label><input type="text" wicket:id="requestInfoUrl"/>
</div>
<div class="formelement">
- <label>Request method</label><select wicket:id="requestTokenMethod"></select>
+ <label wicket:for="requestTokenMethod">Request method</label><select wicket:id="requestTokenMethod"></select>
</div>
<div class="formelement">
- <label><wicket:message key="1582" /></label><input type="text" wicket:id="loginParamName"/>
+ <label wicket:for="loginParamName"><wicket:message key="1582" /></label><input type="text" wicket:id="loginParamName"/>
</div>
<div class="formelement">
- <label><wicket:message key="1583" /></label><input type="text" wicket:id="emailParamName"/>
+ <label wicket:for="emailParamName"><wicket:message key="1583" /></label><input type="text" wicket:id="emailParamName"/>
</div>
<div class="formelement">
- <label><wicket:message key="1584" /></label><input type="text" wicket:id="firstnameParamName"/>
+ <label wicket:for="firstnameParamName"><wicket:message key="1584" /></label><input type="text" wicket:id="firstnameParamName"/>
</div>
<div class="formelement">
- <label><wicket:message key="1585" /></label><input type="text" wicket:id="lastnameParamName"/>
+ <label wicket:for="lastnameParamName"><wicket:message key="1585" /></label><input type="text" wicket:id="lastnameParamName"/>
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
index 70e0e19..d8d1473 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
@@ -52,19 +52,19 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="187" /></legend>
<div class="formelement">
- <label><wicket:message key="193" /></label><input type="text" wicket:id="name" />
+ <label wicket:for="name"><wicket:message key="193" /></label><input type="text" wicket:id="name" />
</div>
<div class="formelement">
- <label><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/>
+ <label wicket:for="numberOfPartizipants"><wicket:message key="482" /></label><select wicket:id="numberOfPartizipants"/>
</div>
<div class="formelement">
- <label><wicket:message key="194" /></label><select wicket:id="type"/>
+ <label wicket:for="type"><wicket:message key="194" /></label><select wicket:id="type"/>
</div>
<div class="formelement">
- <label><wicket:message key="196" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
+ <label wicket:for="comment"><wicket:message key="196" /></label><textarea style="width: 200px; height: 100px;" wicket:id="comment"/>
</div>
<div class="formelement">
- <label><wicket:message key="620" /></label><input type="checkbox" class="formcheckbox" wicket:id="appointment" />
+ <label wicket:for="appointment"><wicket:message key="620" /></label><input type="checkbox" class="formcheckbox" wicket:id="appointment" />
</div>
</fieldset>
@@ -72,11 +72,11 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="191" /></legend>
<div class="formelement">
- <label><wicket:message key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
+ <label wicket:for="ispublic"><wicket:message key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="828" /></div>
- <label><wicket:message key="191" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div>
+ <label wicket:for="roomGroups"><wicket:message key="191" /></label><div class="om-select2"><select class="input" wicket:id="roomGroups"></select></div>
</div>
</fieldset>
@@ -84,10 +84,10 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="830" /></legend>
<div class="formelement">
- <label><wicket:message key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" />
+ <label wicket:for="isDemoRoom"><wicket:message key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" />
</div>
<div class="formelement">
- <label><wicket:message key="637" /></label><input type="text" wicket:id="demoTime" />
+ <label wicket:for="demoTime"><wicket:message key="637" /></label><input type="text" wicket:id="demoTime" />
</div>
</fieldset>
@@ -96,29 +96,29 @@
<legend class="ui-widget-header"><wicket:message key="881" /></legend>
<div class="formelement">
<div class="info-text"><wicket:message key="880" /></div>
- <label><wicket:message key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" />
+ <label wicket:for="allowUserQuestions"><wicket:message key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" />
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="1077" /></div>
- <label><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" />
+ <label wicket:for="audioOnly"><wicket:message key="1076" /></label><input type="checkbox" class="formcheckbox" wicket:id="audioOnly" />
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="1101" /></div>
- <label><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" />
+ <label wicket:for="closed"><wicket:message key="1099" /></label><input type="checkbox" class="formcheckbox" wicket:id="closed" />
</div>
<div class="formelement">
- <label><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" />
+ <label wicket:for="redirectURL"><wicket:message key="1100" /></label><input type="text" wicket:id="redirectURL" />
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="1102" /></div>
<br/>
- <label><wicket:message key="1356" /></label><input type="checkbox" class="formcheckbox" wicket:id="waitForRecording" />
+ <label wicket:for="waitForRecording"><wicket:message key="1356" /></label><input type="checkbox" class="formcheckbox" wicket:id="waitForRecording" />
</div>
<div class="formelement">
- <label><wicket:message key="1355" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowRecording" />
+ <label wicket:for="allowRecording"><wicket:message key="1355" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowRecording" />
</div>
<div class="formelement">
- <label><wicket:message key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatModerated" />
+ <label wicket:for="chatModerated"><wicket:message key="1513" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatModerated" />
</div>
</fieldset>
@@ -126,17 +126,17 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1443" /></legend>
<div class="formelement">
- <label><wicket:message key="admin.room.hidden.elements" /></label>
+ <label wicket:for="hiddenElements"><wicket:message key="admin.room.hidden.elements" /></label>
<div class="om-select2"><select class="input" wicket:id="hiddenElements"></select></div>
</div>
<div class="formelement">
- <label><wicket:message key="1515" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatOpened" />
+ <label wicket:for="chatOpened"><wicket:message key="1515" /></label><input type="checkbox" class="formcheckbox" wicket:id="chatOpened" />
</div>
<div class="formelement">
- <label><wicket:message key="1516" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" />
+ <label wicket:for="filesOpened"><wicket:message key="1516" /></label><input type="checkbox" class="formcheckbox" wicket:id="filesOpened" />
</div>
<div class="formelement">
- <label><wicket:message key="1528" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" />
+ <label wicket:for="autoVideoSelect"><wicket:message key="1528" /></label><input type="checkbox" class="formcheckbox" wicket:id="autoVideoSelect" />
</div>
</fieldset>
@@ -169,10 +169,10 @@
<fieldset class="ui-widget-content">
<div class="formelement">
<div class="info-text"><wicket:message key="823" /></div>
- <label><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" />
+ <label wicket:for="moderated"><wicket:message key="640" /></label><input type="checkbox" class="formcheckbox" wicket:id="moderated" />
</div>
<div class="formelement">
- <label><wicket:message key="816" /></label><div class="om-select2"><select wicket:id="moderator2add" class="input"></select></div>
+ <label wicket:for="moderator2add"><wicket:message key="816" /></label><div class="om-select2"><select wicket:id="moderator2add" class="input"></select></div>
</div>
<div class="formelement" wicket:id="moderatorContainer">
<table class="adminListTableSmall">
@@ -209,16 +209,16 @@
<br/>
</div>
<div class="formelement">
- <label><wicket:message key="1003" /></label><input type="text" wicket:id="confno" />
+ <label wicket:for="confno"><wicket:message key="1003" /></label><input type="text" wicket:id="confno" />
</div>
<div class="formelement">
- <label><wicket:message key="1004" /></label><input type="text" wicket:id="pin" />
+ <label wicket:for="pin"><wicket:message key="1004" /></label><input type="text" wicket:id="pin" />
</div>
<div class="formelement">
- <label><wicket:message key="1308" /></label><input type="text" wicket:id="ownerId" />
+ <label wicket:for="ownerId"><wicket:message key="1308" /></label><input type="text" wicket:id="ownerId" />
</div>
<div class="formelement">
- <label><wicket:message key="1538" /></label><input type="checkbox" class="formcheckbox" wicket:id="sipEnabled" />
+ <label wicket:for="sipEnabled"><wicket:message key="1538" /></label><input type="checkbox" class="formcheckbox" wicket:id="sipEnabled" />
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
index eb68275..187b748 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
@@ -50,35 +50,35 @@
<fieldset class="ui-widget-content">
<legend class="ui-widget-header"><wicket:message key="1502" /></legend>
<div class="formelement">
- <label><wicket:message key="1500" /></label><input type="text" wicket:id="name"/>
+ <label wicket:for="name"><wicket:message key="1500" /></label><input type="text" wicket:id="name"/>
</div>
<div class="formelement">
- <label><wicket:message key="1525" /></label><input type="checkbox" class="formcheckbox" wicket:id="active" />
+ <label wicket:for="active"><wicket:message key="1525" /></label><input type="checkbox" class="formcheckbox" wicket:id="active" />
</div>
<div class="formelement">
- <label><wicket:message key="1501" /></label><input type="text" wicket:id="address"/>
+ <label wicket:for="address"><wicket:message key="1501" /></label><input type="text" wicket:id="address"/>
</div>
<div class="formelement">
- <label><wicket:message key="1519" /></label><input type="text" wicket:id="port"/>
+ <label wicket:for="port"><wicket:message key="1519" /></label><input type="text" wicket:id="port"/>
</div>
<div class="formelement">
- <label><wicket:message key="1520" /></label><input type="text" wicket:id="user"/>
+ <label wicket:for="user"><wicket:message key="1520" /></label><input type="text" wicket:id="user"/>
</div>
<div class="formelement">
- <label><wicket:message key="1521" /></label><input type="text" wicket:id="pass"/>
+ <label wicket:for="pass"><wicket:message key="1521" /></label><input type="text" wicket:id="pass"/>
</div>
<div class="formelement">
- <label><wicket:message key="1522" /></label><input type="text" wicket:id="webapp"/>
+ <label wicket:for="webapp"><wicket:message key="1522" /></label><input type="text" wicket:id="webapp"/>
</div>
<div class="formelement">
- <label><wicket:message key="1523" /></label><input type="text" wicket:id="protocol"/>
+ <label wicket:for="protocol"><wicket:message key="1523" /></label><input type="text" wicket:id="protocol"/>
</div>
<div class="formelement">
<div class="info-text"><wicket:message key="1518" /></div>
<br/>
<label><wicket:message key="1517" /></label><span wicket:id="lastPing"/>
<!-- br/>
- <label><wicket:message key="1524" /></label><span wicket:id="pingRunning"/-->
+ <label wicket:for="pingRunning"><wicket:message key="1524" /></label><span wicket:id="pingRunning"/-->
</div>
<div class="formelement">
<label><wicket:message key="1110" /></label><span wicket:id="inserted"/>
@@ -93,7 +93,7 @@
<label><wicket:message key="1113" /></label><span wicket:id="updatedby.login"/>
</div>
<div class="formelement">
- <label><wicket:message key="270" /></label><textarea wicket:id="comment"/>
+ <label wicket:for="comment"><wicket:message key="270" /></label><textarea wicket:id="comment"/>
</div>
</fieldset>
</div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
index e6c25c2..bedb57c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
@@ -27,14 +27,17 @@
<wicket:message key="143" />
</legend>
<div class="formelement">
- <label><wicket:message key="132" /></label><input type="text" wicket:id="login" />
+ <label wicket:for="login"><wicket:message key="132" /></label><input type="text" wicket:id="login" />
+ </div>
+ <div class="formelement">
+ <label wicket:for="password"><wicket:message key="133" /></label><input type="password" wicket:id="password" />
</div>
<form wicket:id="general"></form>
<div class="formelement">
- <label><wicket:message key="45" /></label><select wicket:id="type"></select>
+ <label wicket:for="type"><wicket:message key="45" /></label><select wicket:id="type"></select>
</div>
<div class="formelement" wicket:id="domain">
- <label><wicket:message key="1118" /></label><select wicket:id="domainId"></select>
+ <label wicket:for="domainId"><wicket:message key="1118" /></label><select wicket:id="domainId"></select>
</div>
<div class="formelement">
<label><wicket:message key="1308" /></label><span wicket:id="ownerId"></span>
@@ -49,11 +52,11 @@
<div class="info-text">
<wicket:message key="1149" />
</div>
- <br /> <label><wicket:message key="1148" /></label><input class="formcheckbox" type="checkbox"
+ <br /> <label wicket:for="forceTimeZoneCheck"><wicket:message key="1148" /></label><input class="formcheckbox" type="checkbox"
wicket:id="forceTimeZoneCheck" />
</div>
<div class="formelement">
- <label><wicket:message key="881" /></label><div class="om-select2"><select class="input" wicket:id="rights"></select></div>
+ <label wicket:for="rights"><wicket:message key="881" /></label><div class="om-select2"><select class="input" wicket:id="rights"></select></div>
</div>
</fieldset>
<fieldset class="ui-widget-content">
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
index af82e9e..9ac496f 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.java
@@ -20,6 +20,7 @@ package org.apache.openmeetings.web.admin.users;
import static org.apache.openmeetings.db.util.AuthLevelUtil.hasGroupAdminLevel;
import static org.apache.openmeetings.db.util.UserHelper.getMinLoginLength;
+import static org.apache.openmeetings.db.util.UserHelper.getMinPasswdLength;
import static org.apache.openmeetings.util.OpenmeetingsVariables.WEB_DATE_PATTERN;
import static org.apache.openmeetings.util.OpenmeetingsVariables.webAppRootKey;
import static org.apache.openmeetings.web.app.Application.getBean;
@@ -35,6 +36,7 @@ import java.util.List;
import java.util.Map;
import java.util.UUID;
+import org.apache.openmeetings.core.util.StrongPasswordValidator;
import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.db.dao.server.LdapConfigDao;
import org.apache.openmeetings.db.dao.server.OAuth2Dao;
@@ -59,6 +61,7 @@ import org.apache.wicket.markup.html.form.CheckBox;
import org.apache.wicket.markup.html.form.ChoiceRenderer;
import org.apache.wicket.markup.html.form.DropDownChoice;
import org.apache.wicket.markup.html.form.Form;
+import org.apache.wicket.markup.html.form.PasswordTextField;
import org.apache.wicket.markup.html.form.RequiredTextField;
import org.apache.wicket.markup.html.panel.IMarkupSourcingStrategy;
import org.apache.wicket.markup.html.panel.PanelMarkupSourcingStrategy;
@@ -86,6 +89,8 @@ public class UserForm extends AdminBaseForm<User> {
private final WebMarkupContainer domain = new WebMarkupContainer("domain");
private GeneralUserForm generalForm;
private final RequiredTextField<String> login = new RequiredTextField<>("login");
+ private StrongPasswordValidator passValidator;
+ private final PasswordTextField password = new PasswordTextField("password", new Model<String>());
private final MessageDialog warning;
private final DropDownChoice<Long> domainId = new DropDownChoice<>("domainId");
@@ -94,8 +99,69 @@ public class UserForm extends AdminBaseForm<User> {
setOutputMarkupId(true);
this.listContainer = listContainer;
this.warning = warning;
- // Add form fields
- addFormFields();
+ add(generalForm = new GeneralUserForm("general", getModel(), true));
+ }
+
+ @Override
+ protected void onInitialize() {
+ super.onInitialize();
+ ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
+ add(password.setResetPassword(false).setLabel(Model.of(getString("133")))
+ .add(passValidator = new StrongPasswordValidator(getMinPasswdLength(cfgDao), getModelObject())));
+ login.setLabel(Model.of(Application.getString(132)));
+ add(login.add(minimumLength(getMinLoginLength(cfgDao))));
+
+ add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget target) {
+ updateDomain(target);
+ }
+ }));
+ update(null);
+ add(domain.add(domainId).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
+ add(new Label("ownerId"));
+ add(forDatePattern("inserted", WEB_DATE_PATTERN));
+ add(forDatePattern("updated", WEB_DATE_PATTERN));
+
+ add(new CheckBox("forceTimeZoneCheck"));
+
+ add(new Select2MultiChoice<>("rights", null, new RestrictiveChoiceProvider<Right>() {
+ private static final long serialVersionUID = 1L;
+
+ @Override
+ public String getDisplayValue(Right choice) {
+ return choice.name();
+ }
+
+ @Override
+ public String toId(Right choice) {
+ return choice.name();
+ }
+
+ @Override
+ public void query(String term, int page, Response<Right> response) {
+ boolean isGroupAdmin = hasGroupAdminLevel(getRights());
+ for (Right r : Right.values()) {
+ if (Right.GroupAdmin == r) {
+ continue;
+ }
+ if (isGroupAdmin && (Right.Admin == r || Right.Soap == r)) {
+ continue;
+ }
+ if (Strings.isEmpty(term) || r.name().contains(term)) {
+ response.add(r);
+ }
+ }
+ }
+
+ @Override
+ public Right fromId(String id) {
+ return Right.valueOf(id);
+ }
+ }));
+ add(new ComunityUserForm("comunity", getModel()));
// attach an ajax validation behavior to all form component's keydown
// event and throttle it down to once per second
@@ -105,7 +171,9 @@ public class UserForm extends AdminBaseForm<User> {
@Override
protected void onModelChanged() {
super.onModelChanged();
+ password.setModelObject(null);
generalForm.updateModelObject(getModelObject(), true);
+ passValidator.setUser(getModelObject());
}
@Override
@@ -117,9 +185,10 @@ public class UserForm extends AdminBaseForm<User> {
if (isNew && sendEmailAtRegister) {
u.setActivatehash(UUID.randomUUID().toString());
}
- u = getBean(UserDao.class).update(u, generalForm.getPasswordField().getConvertedInput(), getUserId());
+ u = getBean(UserDao.class).update(u, password.getConvertedInput(), getUserId());
if (isNew && sendEmailAtRegister) {
- String sendMail = getBean(EmailManager.class).sendMail(login.getValue(), generalForm.getEmail(), u.getActivatehash(), false, null);
+ String email = u.getAddress().getEmail();
+ String sendMail = getBean(EmailManager.class).sendMail(login.getValue(), email, u.getActivatehash(), false, null);
if (!sendMail.equals("success")) {
throw new Exception("Mail for new user is not sent");
}
@@ -165,69 +234,6 @@ public class UserForm extends AdminBaseForm<User> {
update(target);
}
- /**
- * Add the fields to the form
- */
- private void addFormFields() {
- ConfigurationDao cfgDao = getBean(ConfigurationDao.class);
- login.setLabel(Model.of(Application.getString(132)));
- add(login.add(minimumLength(getMinLoginLength(cfgDao))));
-
- add(generalForm = new GeneralUserForm("general", getModel(), true));
-
- add(new DropDownChoice<>("type", Arrays.asList(Type.values())).add(new OnChangeAjaxBehavior() {
- private static final long serialVersionUID = 1L;
-
- @Override
- protected void onUpdate(AjaxRequestTarget target) {
- updateDomain(target);
- }
- }));
- update(null);
- add(domain.add(domainId).setOutputMarkupId(true).setOutputMarkupPlaceholderTag(true));
- add(new Label("ownerId"));
- add(forDatePattern("inserted", WEB_DATE_PATTERN));
- add(forDatePattern("updated", WEB_DATE_PATTERN));
-
- add(new CheckBox("forceTimeZoneCheck"));
-
- add(new Select2MultiChoice<>("rights", null, new RestrictiveChoiceProvider<Right>() {
- private static final long serialVersionUID = 1L;
-
- @Override
- public String getDisplayValue(Right choice) {
- return choice.name();
- }
-
- @Override
- public String toId(Right choice) {
- return choice.name();
- }
-
- @Override
- public void query(String term, int page, Response<Right> response) {
- boolean isGroupAdmin = hasGroupAdminLevel(getRights());
- for (Right r : Right.values()) {
- if (Right.GroupAdmin == r) {
- continue;
- }
- if (isGroupAdmin && (Right.Admin == r || Right.Soap == r)) {
- continue;
- }
- if (Strings.isEmpty(term) || r.name().contains(term)) {
- response.add(r);
- }
- }
- }
-
- @Override
- public Right fromId(String id) {
- return Right.valueOf(id);
- }
- }));
- add(new ComunityUserForm("comunity", getModel()));
- }
-
public void updateDomain(AjaxRequestTarget target) {
User u = getModelObject();
final Map<Long, String> values = new Hashtable<>();
@@ -278,6 +284,7 @@ public class UserForm extends AdminBaseForm<User> {
if(!getBean(UserDao.class).checkLogin(login.getConvertedInput(), u.getType(), u.getDomainId(), u.getId())) {
error(getString("105"));
}
+ super.onValidate();
}
@Override
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
index 35ea920..70581f2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
index 038e91a..80fe6e3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ar.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
index 66b69ae..4b7c511 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_bg.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
index 4d9e63f..a3900b6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ca.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
index eb0529b..8dfc38c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_cs.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
index 636181a..3da230d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_da.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
index ba223f7..0ce36f3 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_de.properties.xml
@@ -1953,4 +1953,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
index b0df46c..8dfa470 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_el.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
index 82a237c..8fd3abe 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_es.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
index 6df8e52..fdf3733 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fa.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
index 9d835e3..d4a3c93 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fi.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
index 1091c76..7ea1d2d 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_fr.properties.xml
@@ -1921,4 +1921,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
index 04a4257..40e1c84 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_gl.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
index cd2a345..c92a393 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_hu.properties.xml
@@ -1916,4 +1916,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
index 8f471cd..8d00a3c 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_id.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
index f8a4fd8..0d0cea6 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_it.properties.xml
@@ -1934,4 +1934,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
index 3494f41..a1d2886 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ja.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
index fa2d9d1..94daecc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ko.properties.xml
@@ -1934,4 +1934,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
index 35f32e5..3561a6b 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_nl.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
index c5633c9..098ae22 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pl.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
index d34799e..69f1273 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
index eae6abb..168e5a7 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_pt_BR.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
index 8a98bef..8ac1c82 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_ru.properties.xml
@@ -1933,4 +1933,5 @@
<entry key="bad.password.stop"><![CDATA['Слабый' пароль: пароль не должен содержать частей пользовательского email или логина]]></entry>
<entry key="sound.enable">Включить звук</entry>
<entry key="sound.mute">Выключить звук</entry>
+ <entry key="current.password">Текущий пароль</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
index ec2b4e1..fef1c07 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
index a5cc98b..ccbf491 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
index 9f3b921..c271b99 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
index 359654f..452fa2a 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
index ca80145..fc3f942 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
@@ -1933,4 +1933,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
index b5d9757..9c2e8bc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
@@ -1918,4 +1918,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
index 6d5f692..6bed7dc 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
@@ -1932,4 +1932,5 @@
<entry key="bad.password.stop"><![CDATA['Weak' password: it shouldn't contain part of the user's email address or username]]></entry>
<entry key="sound.enable">Enable sound</entry>
<entry key="sound.mute">Mute sound</entry>
+ <entry key="current.password">Current password</entry>
</properties>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
index 92f5967..2ab0dca 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ComunityUserForm.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
@@ -37,12 +37,12 @@
</div>
</div>
<div class="formelement">
- <label><wicket:message key="1162" /></label>
+ <label wicket:for="userOffers"><wicket:message key="1162" /></label>
<textarea wicket:id="userOffers" />
</div>
<div class="formelement">
- <label><wicket:message key="1163" /></label>
+ <label wicket:for="userSearchs"><wicket:message key="1163" /></label>
<textarea wicket:id="userSearchs" />
</div>
</wicket:panel>
-</html>
\ No newline at end of file
+</html>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
index 722a21b..a1f3be2 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ConfirmableAjaxBorder.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:border>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/7816c156/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
index c25dd0e..3d49913 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/ErrorMessagePanel.html
@@ -7,16 +7,16 @@
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.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>