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>
