You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openmeetings.apache.org by so...@apache.org on 2016/04/02 10:24:44 UTC
svn commit: r1737471 [2/2] - in /openmeetings/application:
branches/3.1.x/openmeetings-core/src/main/java/org/apache/openmeetings/core/mail/
branches/3.1.x/openmeetings-db/src/main/java/org/apache/openmeetings/db/dao/basic/
branches/3.1.x/openmeetings-...
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sk.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_sv.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_th.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_tr.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_uk.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_CN.properties.xml Sat Apr 2 08:24:43 2016
@@ -1859,4 +1859,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/app/Application_zh_TW.properties.xml Sat Apr 2 08:24:43 2016
@@ -1889,4 +1889,5 @@
<entry key="admin.email.body">Body</entry>
<entry key="admin.email.errorCount">Error Count</entry>
<entry key="admin.email.lastError">Last Error</entry>
+ <entry key="admin.email.reset.status">Reset Status</entry>
</properties>
Modified: openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/PagedEntityListPanel.java Sat Apr 2 08:24:43 2016
@@ -25,11 +25,12 @@ import org.apache.openmeetings.db.entity
import org.apache.openmeetings.web.admin.SearchableDataView;
import org.apache.openmeetings.web.data.SearchableDataProvider;
import org.apache.wicket.ajax.AjaxRequestTarget;
-import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.model.PropertyModel;
+import com.googlecode.wicket.jquery.ui.form.button.AjaxButton;
+
public abstract class PagedEntityListPanel extends BasePanel {
private static final long serialVersionUID = 1L;
private List<Integer> numbers = Arrays.asList(10, 25, 50, 75, 100, 200);
@@ -50,7 +51,7 @@ public abstract class PagedEntityListPan
Form<Void> searchForm = new Form<Void>("searchForm");
add(searchForm.setOutputMarkupId(true));
searchForm.add(new TextField<String>("searchText", new PropertyModel<String>(dp, "search")).setOutputMarkupId(true));
- searchForm.add(new AjaxButton("search", searchForm) {
+ AjaxButton b = new AjaxButton("search", searchForm) {
private static final long serialVersionUID = 1L;
@Override
@@ -58,7 +59,9 @@ public abstract class PagedEntityListPan
target.add(navPanel);
PagedEntityListPanel.this.onEvent(target);
}
- });
+ };
+ searchForm.add(b);
+ searchForm.setDefaultButton(b);
add(navPanel);
}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/admin.css Sat Apr 2 08:24:43 2016
@@ -345,4 +345,4 @@ table.adminListTable td div.four_column_
background-image: url(images/new.png);
background-repeat: no-repeat;
background-position: 5px;
-}
\ No newline at end of file
+}
Modified: openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css?rev=1737471&r1=1737470&r2=1737471&view=diff
==============================================================================
--- openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css (original)
+++ openmeetings/application/trunk/openmeetings-web/src/main/webapp/css/theme.css Sat Apr 2 08:24:43 2016
@@ -147,6 +147,10 @@ html, body {
padding: 1px 6px;
font-size: 12px;
}
+.searchForm input[type="button"] {
+ padding: .2em .5em;
+ font-size: smaller;
+}
.pagedEntityListPanel input, .adminForm .pagedEntityListPanel input {
font-size: 14px;
padding: 0px 0px;