Author: solomax Date: Thu Apr 25 07:09:31 2013 New Revision: 1475648 URL: http://svn.apache.org/r1475648 Log: [OPENMEETINGS-615] Stub panel for profile edit is added
Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.html openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.java Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java?rev=1475648&r1=1475647&r2=1475648&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/data/user/dao/SalutationDao.java Thu Apr 25 07:09:31 2013 @@ -54,6 +54,8 @@ public class SalutationDao { * Adds a new Salutation to the table Titles * * @param titelname + * @param fieldvalues_id + * @return */ public Long addUserSalutation(String titelname, long fieldvalues_id) { try { @@ -74,6 +76,7 @@ public class SalutationDao { /** * get a Salutation by given id * + * @param id * @param language_id * @return */ Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.html URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.html?rev=1475648&view=auto ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.html (added) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.html Thu Apr 25 07:09:31 2013 @@ -0,0 +1,24 @@ +<?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> +</wicket:panel> +</html> \ No newline at end of file Added: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.java?rev=1475648&view=auto ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.java (added) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/ProfilePanel.java Thu Apr 25 07:09:31 2013 @@ -0,0 +1,29 @@ +/* + * 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.components.user.profile; + +import org.apache.openmeetings.web.components.UserPanel; + +public class ProfilePanel extends UserPanel { + private static final long serialVersionUID = -5837090230776586182L; + + public ProfilePanel(String id) { + super(id); + } +} Modified: openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java?rev=1475648&r1=1475647&r2=1475648&view=diff ============================================================================== --- openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java (original) +++ openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/user/profile/SettingsPanel.java Thu Apr 25 07:09:31 2013 @@ -31,6 +31,7 @@ import com.googlecode.wicket.jquery.core public class SettingsPanel extends UserPanel { private static final long serialVersionUID = -830146821166434373L; public static final String DASHBOARD_TAB_ID = "tab1"; + public static final String PROFILE_TAB_ID = "tab2"; private void addTab(RepeatingView tabs, String name, String id) { WebMarkupContainer tab = new WebMarkupContainer(tabs.newChildId()); @@ -49,12 +50,14 @@ public class SettingsPanel extends UserP public SettingsPanel(String id) { super(id); RepeatingView tabs = new RepeatingView("tabs"); + addTab(tabs, "[Profile]", PROFILE_TAB_ID); //FIXME localize addTab(tabs, "[Widgets]", DASHBOARD_TAB_ID); //FIXME localize RepeatingView panels = new RepeatingView("panels"); + addPanel(panels, PROFILE_TAB_ID, new ProfilePanel("tab")); addPanel(panels, DASHBOARD_TAB_ID, new WidgetsPanel("tab")); - add(new JQueryBehavior("#tabs", "tabs")); + add(new JQueryBehavior("#tabs", "tabs"/*, new Options("active", 1)*/)); add(tabs, panels); } }