Author: solomax
Date: Thu Sep 13 10:59:38 2012
New Revision: 1384272
URL: http://svn.apache.org/viewvc?rev=1384272&view=rev
Log:
Language selector is added to the Language editor panel
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Modified:
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
(original)
+++
incubator/openmeetings/trunk/singlewebapp/WebContent/openmeetings/css/theme.css
Thu Sep 13 10:59:38 2012
@@ -41,4 +41,4 @@
.adminPanel {
width: 100%;
-}
\ No newline at end of file
+}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/persistence/beans/lang/Fieldlanguagesvalues.java
Thu Sep 13 10:59:38 2012
@@ -43,7 +43,7 @@ import org.apache.openmeetings.persisten
@NamedQuery(name = "allFieldLanguageValues", query = "SELECT flv FROM
Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
- + " AND flv.language_id = :language_id")
+ + " AND flv.language_id = :language_id ORDER BY
flv.fieldvalues_id ASC")
, @NamedQuery(name="allFieldValuesIds", query = "SELECT
flv.fieldvalues_id FROM Fieldlanguagesvalues flv "
+ "WHERE flv.deleted = false "
+ " AND flv.fieldvalues.deleted = false "
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.html
Thu Sep 13 10:59:38 2012
@@ -25,7 +25,7 @@
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
- <table wicket:id="confListContainer">
+ <table wicket:id="listContainer">
<tr>
<th><wicket:ommessage
key="264" /></th>
<th><wicket:ommessage
key="265" /></th>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/configurations/ConfigsPanel.java
Thu Sep 13 10:59:38 2012
@@ -57,14 +57,14 @@ public class ConfigsPanel extends AdminP
});
}
};
- final WebMarkupContainer confListContainer = new
WebMarkupContainer("confListContainer");
- add(confListContainer.add(dataView).setOutputMarkupId(true));
+ final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
+ add(listContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID =
5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- target.add(confListContainer);
+ target.add(listContainer);
}
});
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.html
Thu Sep 13 10:59:38 2012
@@ -24,8 +24,9 @@
<table class="adminPanel">
<tr>
<td valign="top">
+ <form wicket:id="langForm"><select
wicket:id="language"></select></form>
<span wicket:id="navigator">[dataview
navigator]</span>
- <table wicket:id="langListContainer">
+ <table wicket:id="listContainer">
<tr>
<th><wicket:ommessage
key="350" /></th>
<th><wicket:ommessage
key="351" /></th>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/labels/LangPanel.java
Thu Sep 13 10:59:38 2012
@@ -20,31 +20,43 @@ package org.apache.openmeetings.web.comp
import java.util.Iterator;
+import org.apache.openmeetings.data.basic.FieldLanguageDaoImpl;
import org.apache.openmeetings.data.basic.FieldLanguagesValuesDAO;
+import org.apache.openmeetings.persistence.beans.lang.FieldLanguage;
import org.apache.openmeetings.persistence.beans.lang.Fieldlanguagesvalues;
import org.apache.openmeetings.web.app.Application;
import org.apache.openmeetings.web.components.admin.AdminPanel;
import org.apache.openmeetings.web.components.admin.PagedEntityListPanel;
import org.apache.openmeetings.web.data.OmDataProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
+import org.apache.wicket.ajax.form.AjaxFormComponentUpdatingBehavior;
import org.apache.wicket.markup.html.WebMarkupContainer;
import org.apache.wicket.markup.html.basic.Label;
+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.repeater.Item;
import org.apache.wicket.markup.repeater.data.DataView;
+import org.apache.wicket.model.CompoundPropertyModel;
+import org.apache.wicket.model.Model;
+import org.apache.wicket.model.PropertyModel;
public class LangPanel extends AdminPanel {
private static final long serialVersionUID = 5904180813198016592L;
- long language = 1;
+ private FieldLanguage language;
public LangPanel(String id) {
super(id);
+ FieldLanguageDaoImpl langDao =
Application.getBean(FieldLanguageDaoImpl.class);
+ language = langDao.getFieldLanguageById(1L);
+
- DataView<Fieldlanguagesvalues> dataView = new
DataView<Fieldlanguagesvalues>("langList"
+ final DataView<Fieldlanguagesvalues> dataView = new
DataView<Fieldlanguagesvalues>("langList"
, new
OmDataProvider<Fieldlanguagesvalues>(FieldLanguagesValuesDAO.class){
private static final long serialVersionUID =
-6822789354860988626L;
public Iterator<? extends Fieldlanguagesvalues>
iterator(long first, long count) {
- return
Application.getBean(FieldLanguagesValuesDAO.class).get(language, (int)first,
(int)count).iterator();
+ return
Application.getBean(FieldLanguagesValuesDAO.class).get(language.getLanguage_id(),
(int)first, (int)count).iterator();
}
}) {
private static final long serialVersionUID =
8715559628755439596L;
@@ -52,7 +64,7 @@ public class LangPanel extends AdminPane
@Override
protected void populateItem(Item<Fieldlanguagesvalues>
item) {
final Fieldlanguagesvalues flv =
item.getModelObject();
- item.add(new Label("lblId", "" +
flv.getFieldlanguagesvalues_id()));
+ item.add(new Label("lblId", "" +
flv.getFieldvalues_id()));
item.add(new Label("name",
flv.getFieldvalues().getName()));
item.add(new Label("value", flv.getValue()));
/*
@@ -68,16 +80,34 @@ public class LangPanel extends AdminPane
}
};
- final WebMarkupContainer langListContainer = new
WebMarkupContainer("langListContainer");
- add(langListContainer.add(dataView).setOutputMarkupId(true));
+ final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
+ add(listContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID =
5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- target.add(langListContainer);
+ dataView.modelChanging();
+ target.add(listContainer);
}
});
+ final Form<Void> f = new Form<Void>("langForm");
+ final DropDownChoice<FieldLanguage> languages = new
DropDownChoice<FieldLanguage>("language"
+ , new PropertyModel<FieldLanguage>(this, "language")
+ , langDao.getLanguages()
+ , new ChoiceRenderer<FieldLanguage>("name",
"language_id"));
+
+ languages.add(new AjaxFormComponentUpdatingBehavior("onchange")
{
+ private static final long serialVersionUID =
-2055912815073387536L;
+
+ @Override
+ protected void onUpdate(AjaxRequestTarget
target) {
+ target.add(listContainer);
+ }
+ });
+ f.add(languages.setNullValid(true).setOutputMarkupId(true));
+ add(f.setOutputMarkupId(true));
+
}
}
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.html
Thu Sep 13 10:59:38 2012
@@ -25,7 +25,7 @@
<tr>
<td>
<span wicket:id="navigator">[dataview
navigator]</span>
- <table wicket:id="ldapListContainer">
+ <table wicket:id="listContainer">
<tr>
<th><wicket:ommessage
key="1104" /></th>
<th><wicket:ommessage
key="1105" /></th>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/ldaps/LdapsPanel.java
Thu Sep 13 10:59:38 2012
@@ -57,14 +57,14 @@ public class LdapsPanel extends AdminPan
});
}
};
- final WebMarkupContainer ldapListContainer = new
WebMarkupContainer("ldapListContainer");
- add(ldapListContainer.add(dataView).setOutputMarkupId(true));
+ final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
+ add(listContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID =
5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- target.add(ldapListContainer);
+ target.add(listContainer);
}
});
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.html
Thu Sep 13 10:59:38 2012
@@ -25,7 +25,7 @@
<tr>
<td valign="top">
<span wicket:id="navigator">[dataview
navigator]</span>
- <table wicket:id="userListContainer">
+ <table wicket:id="listContainer">
<tr>
<th><wicket:ommessage
key="146" /></th>
<th><wicket:ommessage
key="147" /></th>
Modified:
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
URL:
http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java?rev=1384272&r1=1384271&r2=1384272&view=diff
==============================================================================
---
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
(original)
+++
incubator/openmeetings/trunk/singlewebapp/src/org/apache/openmeetings/web/components/admin/user/UsersPanel.java
Thu Sep 13 10:59:38 2012
@@ -58,14 +58,14 @@ public class UsersPanel extends AdminPan
});
}
};
- final WebMarkupContainer userListContainer = new
WebMarkupContainer("userListContainer");
- add(userListContainer.add(dataView).setOutputMarkupId(true));
+ final WebMarkupContainer listContainer = new
WebMarkupContainer("listContainer");
+ add(listContainer.add(dataView).setOutputMarkupId(true));
add(new PagedEntityListPanel("navigator", dataView) {
private static final long serialVersionUID =
5097048616003411362L;
@Override
protected void onEvent(AjaxRequestTarget target) {
- target.add(userListContainer);
+ target.add(listContainer);
}
});
