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 2014/05/18 11:57:49 UTC
svn commit: r1595583 [1/2] - in /openmeetings:
branches/3.0.x/src/install/java/org/apache/openmeetings/installation/
branches/3.0.x/src/main/webapp/css/
branches/3.0.x/src/main/webapp/css/images/forms/
branches/3.0.x/src/web/java/org/apache/openmeeting...
Author: solomax
Date: Sun May 18 09:57:48 2014
New Revision: 1595583
URL: http://svn.apache.org/r1595583
Log:
-m
Removed:
openmeetings/branches/3.0.x/src/main/webapp/css/images/forms/resultset_first.png
openmeetings/branches/3.0.x/src/main/webapp/css/images/forms/resultset_last.png
openmeetings/branches/3.0.x/src/main/webapp/css/images/forms/resultset_next.png
openmeetings/branches/3.0.x/src/main/webapp/css/images/forms/resultset_previous.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/forms/resultset_first.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/forms/resultset_last.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/forms/resultset_next.png
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/images/forms/resultset_previous.png
Modified:
openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/branches/3.0.x/src/main/webapp/css/admin.css
openmeetings/branches/3.0.x/src/main/webapp/css/forms.css
openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UserForm.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/HeaderPanel.java
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/admin.css
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/forms.css
openmeetings/trunk/singlewebapp/openmeetings-web/src/main/webapp/css/theme.css
Modified: openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/InstallationConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/InstallationConfig.java (original)
+++ openmeetings/branches/3.0.x/src/install/java/org/apache/openmeetings/installation/InstallationConfig.java Sun May 18 09:57:48 2014
@@ -22,12 +22,13 @@ import static org.apache.openmeetings.ut
import java.io.Serializable;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.crypt.MD5Implementation;
public class InstallationConfig implements Serializable {
private static final long serialVersionUID = 1L;
- public String appName = "Openmeetings";
+ public String appName = ConfigurationDao.DEFAULT_APP_NAME;
public String username;
public String password;
public String email;
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/admin.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/admin.css?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/admin.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/admin.css Sun May 18 09:57:48 2014
@@ -34,14 +34,16 @@ table.adminListTable {
min-width: 518px;
}
-table.adminListTable th {
- background: #AFCBFB;
- color: #ffffff;
+table.adminListTable tr:nth-child(odd), table.adminListTableSmall tr:nth-child(odd) {
+ opacity: .8;
}
-table.adminListTableSmall th {
- background: #AFCBFB;
- color: #ffffff;
+table.adminListTable tr:hover, table.adminListTableSmall tr:hover {
+ /*SHOULD BE MANUALLY IN SYNC WITH THEME .ui-state-hover */
+ border: 1px solid #74b2e2;
+ background: #e4f1fb url(theme_om/images/ui-bg_glass_100_e4f1fb_1x400.png) 50% 50% repeat-x;
+ font-weight: normal;
+ color: #0070a3;
}
table.adminListTable th.two_column_layout_column1 {
@@ -244,25 +246,6 @@ table.adminListTable td div.four_column_
width: 132px;
}
-table.adminListTable tr.even {
- background-color: #EDF2FF;
-}
-
-table.adminListTableSmall tr.even {
- background-color: #EDF2FF;
-}
-
-table.adminListTable tr.odd {
- background-color: #F2FAFF;
-}
-
-table.adminListTableSmall tr.odd {
- background-color: #F2FAFF;
-}
-
-table.adminListTable tr:hover {
- background-color: #CCDCE8;
-}
.adminPanelColumnForm {
display: inline-block;
vertical-align: top;
@@ -306,18 +289,13 @@ table.adminListTable tr:hover {
}
.adminForm fieldset {
- background-color: #F2FAFF;
- border: solid 1px #aacfe4;
margin-top: 4px;
padding: 4px;
}
.adminForm legend {
- background-color: #F2FAFF;
padding: 0.2em 0.5em;
margin: 0px 10px;
- border: solid 1px #aacfe4;
- color: #000000;
font-style: italic;
text-align: right;
}
@@ -365,14 +343,9 @@ table.adminListTable tr:hover {
max-width: 1240px;
}
.adminFormsFeedbackPanel {
- background-color: #F2FAFF;
- color: #ff3300;
position:absolute;
left:550px;
width: 480px;
bottom: 16px;
z-index:999;
}
-.adminPanel .adminListTable .selected {
- background-color: #2779aa;
-}
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/forms.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/forms.css?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/forms.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/forms.css Sun May 18 09:57:48 2014
@@ -19,7 +19,6 @@
div.formSaveBar {
width: 100%;
height: 22px;
- background-color: #AFCBFB;
}
div.formSaveButton input {
Modified: openmeetings/branches/3.0.x/src/main/webapp/css/theme.css
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/main/webapp/css/theme.css?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/main/webapp/css/theme.css (original)
+++ openmeetings/branches/3.0.x/src/main/webapp/css/theme.css Sun May 18 09:57:48 2014
@@ -202,6 +202,25 @@ div.tableWrapperSmall {
float: none;
}
+.goto, .goto :link, .goto :hover {
+ font-size: 14px;
+ line-height: 14px;
+ text-decoration: none;
+ text-align: center;
+ vertical-align: middle;
+ min-width: 16px;
+}
+
+.goto.icon {
+ display: inline-block;
+ width: 16px;
+ height: 16px;
+ border: none;
+ margin: 0px;
+ padding: 0px;
+ zoom: 1.2;
+}
+
.ui-dialog {
-moz-box-shadow: 3px 3px 4px #000;
-webkit-box-shadow: 3px 3px 4px #000;
@@ -219,102 +238,6 @@ div.tableWrapperSmall {
text-indent: 0px !important;
}
-.pagedEntityListPanel :LINK {
- text-decoration: none;
-}
-
-.pagedEntityListPanel :HOVER {
- text-decoration: none;
-}
-
-.pagedEntityListPanel span.prev {
- background: url(images/forms/resultset_previous.png) no-repeat;
- display: inline-block;
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel span.next {
- background: url(images/forms/resultset_next.png) no-repeat;
- display: inline-block;
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel span.first {
- background: url(images/forms/resultset_first.png) no-repeat;
- display: inline-block;
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel span.last {
- background: url(images/forms/resultset_last.png) no-repeat;
- display: inline-block;
- opacity:0.4;
- filter:alpha(opacity=40); /* For IE8 and earlier */
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel a.prev {
- background: url(images/forms/resultset_previous.png) no-repeat;
- display: inline-block;
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel a.next {
- background: url(images/forms/resultset_next.png) no-repeat;
- display: inline-block;
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel a.first {
- background: url(images/forms/resultset_first.png) no-repeat;
- display: inline-block;
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
-.pagedEntityListPanel a.last {
- background: url(images/forms/resultset_last.png) no-repeat;
- display: inline-block;
- width: 14px;
- height: 14px;
- border: none;
- margin: 0px;
- padding: 0px;
-}
-
.start_step1, .start_step2, .start_step3, .start_step4 {
padding-left: 30px;
margin: 5px 0px 5px 0px;
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html Sun May 18 09:57:48 2014
@@ -25,8 +25,8 @@
</div>
<!-- wicket:id="form" -->
<form wicket:id="backupUpload" class="adminForm adminBackupForm">
- <fieldset>
- <legend><wicket:ommessage key="1066" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1066" /></legend>
<div class="formelement">
<div class="info-text"><wicket:ommessage key="1065" /></div>
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html Sun May 18 09:57:48 2014
@@ -35,9 +35,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="264" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByKey"></span><wicket:ommessage key="265" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByValue"></span><wicket:ommessage key="598" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="264" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByKey"></span><wicket:ommessage key="265" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:ommessage key="598" /></th>
</tr>
</thead>
</table>
@@ -57,8 +57,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="266" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="266" /></legend>
<div class="formelement">
<label><wicket:ommessage key="267" /></label><input type="text" wicket:id="conf_key"/>
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Sun May 18 09:57:48 2014
@@ -46,6 +46,7 @@ public class ConfigsPanel extends AdminP
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omConfigPanelInit();");
}
@@ -73,9 +74,8 @@ public class ConfigsPanel extends AdminP
target.appendJavaScript("omConfigPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
- + (c.getConfiguration_id().equals(form.getModelObject().getConfiguration_id()) ? " selected" : "")));
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ + (c.getConfiguration_id().equals(form.getModelObject().getConfiguration_id()) ? " ui-state-default" : "")));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html Sun May 18 09:57:48 2014
@@ -26,12 +26,12 @@
<table class="adminListTable">
<thead>
<tr>
- <th><wicket:ommessage key="599" /></th>
- <th><wicket:ommessage key="600" /></th>
- <th><wicket:ommessage key="601" /></th>
- <th><wicket:ommessage key="602" /></th>
- <th><wicket:ommessage key="603" /></th>
- <th><wicket:ommessage key="1501" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="599" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="600" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="601" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="602" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="603" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="1501" /></th>
</tr>
</thead>
<tbody wicket:id="container" >
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Sun May 18 09:57:48 2014
@@ -120,7 +120,7 @@ public class ConnectionsPanel extends Ad
target.add(details.setVisible(true));
}
});
- item.add(AttributeModifier.append("class", "clickable " + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"));
}
};
add(container.add(dataView).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true));
@@ -137,5 +137,6 @@ public class ConnectionsPanel extends Ad
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html Sun May 18 09:57:48 2014
@@ -24,8 +24,8 @@
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable" style="min-width: 400px; max-width: 400px" >
<tr>
- <th style="width: 360px"><wicket:ommessage key="177" /></th>
- <th style="width: 34px"><wicket:ommessage key="275" /></th>
+ <th class="ui-widget-header" style="width: 360px"><wicket:ommessage key="177" /></th>
+ <th class="ui-widget-header" style="width: 34px"><wicket:ommessage key="275" /></th>
</tr>
</table>
<div class="tableWrapper" style="width: 420px; height: 420px;">
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Sun May 18 09:57:48 2014
@@ -34,8 +34,8 @@
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable">
<tr>
- <th class="two_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="164" /></th>
- <th class="two_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="165" /></th>
+ <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="164" /></th>
+ <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="165" /></th>
</tr>
</table>
<div class="tableWrapper" id="adminTable">
@@ -53,8 +53,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="170" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="170" /></legend>
<div class="formelement">
<label><wicket:ommessage key="171" /></label><input type="text" wicket:id="name" />
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Sun May 18 09:57:48 2014
@@ -52,6 +52,7 @@ public class GroupsPanel extends AdminPa
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("groupsInit();");
}
@@ -116,8 +117,7 @@ public class GroupsPanel extends AdminPa
target.appendJavaScript("groupsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"
+ (o.getOrganisation_id().equals(form.getModelObject().getOrganisation_id()) ? " selected" : "")));
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.html Sun May 18 09:57:48 2014
@@ -66,9 +66,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="350" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="351" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByValue"></span><wicket:ommessage key="352" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="350" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="351" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:ommessage key="352" /></th>
</tr>
</thead>
</table>
@@ -88,8 +88,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="353" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="353" /></legend>
<div class="formelement">
<label><wicket:ommessage key="356" /></label><span wicket:id="fieldvalues.fieldvalues_id"></span>
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Sun May 18 09:57:48 2014
@@ -86,6 +86,7 @@ public class LangPanel extends AdminPane
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("labelsInit();");
}
@@ -142,8 +143,7 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"
+ (fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues_id()) ? " selected" : "")));
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html Sun May 18 09:57:48 2014
@@ -35,9 +35,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByFile"></span><wicket:ommessage key="1106" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByFile"></span><wicket:ommessage key="1106" /></th>
</tr>
</thead>
</table>
@@ -57,8 +57,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="1107" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1107" /></legend>
<div class="formelement">
<label><wicket:ommessage key="1108" /></label><input type="text" wicket:id="name"/>
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Sun May 18 09:57:48 2014
@@ -46,6 +46,7 @@ public class LdapsPanel extends AdminPan
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omLdapPanelInit();");
}
@@ -72,8 +73,7 @@ public class LdapsPanel extends AdminPan
target.appendJavaScript("omLdapPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + ((item.getIndex() % 2 == 1) ? "even" : "odd")
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ (lc.getLdapConfigId() == form.getModelObject().getLdapConfigId() ? " selected" : "")));
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html Sun May 18 09:57:48 2014
@@ -35,8 +35,8 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="two_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
- <th class="two_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
+ <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
+ <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
</tr>
</thead>
</table>
@@ -55,8 +55,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="1581" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1581" /></legend>
<div class="formelement">
<label><wicket:ommessage key="1574" /></label><input type="checkbox" class="formcheckbox" wicket:id="isEnabled"/>
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Sun May 18 09:57:48 2014
@@ -63,8 +63,7 @@ public class OAuthPanel extends AdminPan
target.appendJavaScript("oauthPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ (server.getId().equals(form.getModelObject().getId()) ? " selected" : "")));
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.html Sun May 18 09:57:48 2014
@@ -35,9 +35,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="189" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByPublic"></span><wicket:ommessage key="190" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="189" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByPublic"></span><wicket:ommessage key="190" /></th>
</tr>
</thead>
</table>
@@ -59,8 +59,8 @@
<div class="scrollcontent" id="adminForm">
<!-- General -->
- <fieldset>
- <legend><wicket:ommessage key="187" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="187" /></legend>
<div class="formelement">
<label><wicket:ommessage key="193" /></label><input type="text" wicket:id="name" />
</div>
@@ -79,8 +79,8 @@
</fieldset>
<!-- Organisations -->
- <fieldset>
- <legend><wicket:ommessage key="191" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="191" /></legend>
<div class="formelement">
<label><wicket:ommessage key="195" /></label><input type="checkbox" class="formcheckbox" wicket:id="ispublic" />
</div>
@@ -94,8 +94,8 @@
</fieldset>
<!-- Limitations -->
- <fieldset>
- <legend><wicket:ommessage key="830" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="830" /></legend>
<div class="formelement">
<label><wicket:ommessage key="636" /></label><input type="checkbox" class="formcheckbox" wicket:id="isDemoRoom" />
</div>
@@ -105,8 +105,8 @@
</fieldset>
<!-- Rights -->
- <fieldset>
- <legend><wicket:ommessage key="881" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="881" /></legend>
<div class="formelement">
<label><wicket:ommessage key="879" /></label><input type="checkbox" class="formcheckbox" wicket:id="allowUserQuestions" />
</div>
@@ -137,8 +137,8 @@
</fieldset>
<!-- Room Layout options -->
- <fieldset>
- <legend><wicket:ommessage key="1443" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1443" /></legend>
<div class="formelement">
<label><wicket:ommessage key="1357" /></label><input type="checkbox" class="formcheckbox" wicket:id="hideTopBar" />
</div>
@@ -178,14 +178,14 @@
</fieldset>
<!-- Users in this Room -->
- <fieldset>
- <legend><wicket:ommessage key="587" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="587" /></legend>
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><wicket:ommessage key="588" /></th>
- <th class="three_column_layout_column2"><wicket:ommessage key="589" /></th>
- <th class="three_column_layout_column3"><wicket:ommessage key="590" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><wicket:ommessage key="588" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><wicket:ommessage key="589" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><wicket:ommessage key="590" /></th>
</tr>
</thead>
</table>
@@ -203,7 +203,7 @@
</fieldset>
<!-- Default moderators -->
- <fieldset>
+ <fieldset class="ui-widget-content">
<div class="formelement">
<div class="info-text"><wicket:ommessage key="823" /></div>
<br/>
@@ -216,11 +216,11 @@
<table class="adminListTableSmall">
<thead>
<tr>
- <th class="three_column_layout_column1"><wicket:ommessage key="817" /></th>
- <th class="three_column_layout_column2"><wicket:ommessage key="818" /></th>
- <th class="three_column_layout_column3"><wicket:ommessage key="819" /></th>
- <th class="three_column_layout_column4"><wicket:ommessage key="820" /></th>
- <th class="three_column_layout_column5"><wicket:ommessage key="827" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><wicket:ommessage key="817" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><wicket:ommessage key="818" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><wicket:ommessage key="819" /></th>
+ <th class="three_column_layout_column4 ui-widget-header"><wicket:ommessage key="820" /></th>
+ <th class="three_column_layout_column5 ui-widget-header"><wicket:ommessage key="827" /></th>
</tr>
</thead>
</table>
@@ -239,8 +239,8 @@
</div>
</fieldset>
<!--SIP Settings -->
- <fieldset>
- <legend><wicket:ommessage key="1001" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1001" /></legend>
<div class="formelement">
<div class="info-text"><wicket:ommessage key="1002" /></div>
<br/>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/rooms/RoomsPanel.java Sun May 18 09:57:48 2014
@@ -45,6 +45,7 @@ public class RoomsPanel extends AdminPan
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omRoomPanelInit();");
}
@@ -71,8 +72,7 @@ public class RoomsPanel extends AdminPan
target.appendJavaScript("omRoomPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ (room.getRooms_id().equals(form.getModelObject().getRooms_id()) ? " selected" : "")));
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.html Sun May 18 09:57:48 2014
@@ -35,9 +35,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1500" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByAddress"></span><wicket:ommessage key="1501" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="188" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="1500" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByAddress"></span><wicket:ommessage key="1501" /></th>
</tr>
</thead>
</table>
@@ -57,8 +57,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="1502" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1502" /></legend>
<div class="formelement">
<label><wicket:ommessage key="1500" /></label><input type="text" wicket:id="name"/>
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/servers/ServersPanel.java Sun May 18 09:57:48 2014
@@ -46,6 +46,7 @@ public class ServersPanel extends AdminP
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omServerPanelInit();");
}
@@ -72,8 +73,7 @@ public class ServersPanel extends AdminP
target.appendJavaScript("omServerPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ (server.getId().equals(form.getModelObject().getId()) ? " selected" : "")));
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UserForm.html Sun May 18 09:57:48 2014
@@ -22,8 +22,8 @@
<wicket:panel>
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header">
<wicket:ommessage key="143" />
</legend>
<div class="formelement">
@@ -56,8 +56,8 @@
<label><wicket:ommessage key="169" /></label><select wicket:id="level_id" />
</div>
</fieldset>
- <fieldset>
- <legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header">
<wicket:ommessage key="1159" />
</legend>
<form wicket:id="comunity"></form>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.html Sun May 18 09:57:48 2014
@@ -35,14 +35,10 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="four_column_layout_column1"><span
- wicket:id="orderById"></span> <wicket:ommessage key="146" /></th>
- <th class="four_column_layout_column2"><span
- wicket:id="orderByLogin"></span> <wicket:ommessage key="147" /></th>
- <th class="four_column_layout_column3"><span
- wicket:id="orderByFirstName"></span> <wicket:ommessage key="148" /></th>
- <th class="four_column_layout_column4"><span
- wicket:id="orderByLastName"></span> <wicket:ommessage key="149" /></th>
+ <th class="four_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span> <wicket:ommessage key="146" /></th>
+ <th class="four_column_layout_column2 ui-widget-header"><span wicket:id="orderByLogin"></span> <wicket:ommessage key="147" /></th>
+ <th class="four_column_layout_column3 ui-widget-header"><span wicket:id="orderByFirstName"></span> <wicket:ommessage key="148" /></th>
+ <th class="four_column_layout_column4 ui-widget-header"><span wicket:id="orderByLastName"></span> <wicket:ommessage key="149" /></th>
</tr>
</thead>
</table>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/admin/users/UsersPanel.java Sun May 18 09:57:48 2014
@@ -54,6 +54,7 @@ public class UsersPanel extends AdminPan
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omUserPanelInit();");
}
@@ -85,8 +86,7 @@ public class UsersPanel extends AdminPan
target.appendJavaScript("omUserPanelInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"
+ (u.getUser_id().equals(form.getModelObject().getUser_id()) ? " selected" : "")));
}
};
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/FormSaveRefreshPanel.html Sun May 18 09:57:48 2014
@@ -20,7 +20,7 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <div class="formSaveBar">
+ <div class="formSaveBar ui-widget-header">
<div class="formSaveButton">
<input type="submit" value="" wicket:id="ajax-save-button" wicket:ommessage="title:144" />
</div>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/HeaderPanel.java Sun May 18 09:57:48 2014
@@ -19,12 +19,13 @@
package org.apache.openmeetings.web.common;
import org.apache.wicket.markup.html.basic.Label;
+import org.apache.wicket.util.string.Strings;
public class HeaderPanel extends BasePanel {
private static final long serialVersionUID = 9020842845946685193L;
public HeaderPanel(String id, String appName) {
super(id);
- add(new Label("appName", appName));
+ add(new Label("appName", Strings.isEmpty(appName) ? " " : appName).setEscapeModelStrings(false));
}
}
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmPagingNavigator.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmPagingNavigator.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmPagingNavigator.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/common/OmPagingNavigator.html Sun May 18 09:57:48 2014
@@ -17,12 +17,12 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <a wicket:id="first" class="first"></a>
- <a wicket:id="prev" class="prev"></a>
+ <a wicket:id="first" class="goto icon ui-icon ui-icon-seek-first"></a>
+ <a wicket:id="prev" class="goto icon ui-icon ui-icon-seek-prev"></a>
<span wicket:id="navigation" class="goto">
<a wicket:id="pageLink" href="#"><span wicket:id="pageNumber">5</span></a>
</span>
- <a wicket:id="next" class="next"></a>
- <a wicket:id="last" class="last"></a>
+ <a wicket:id="next" class="goto icon ui-icon ui-icon-seek-next"></a>
+ <a wicket:id="last" class="goto icon ui-icon ui-icon-seek-end"></a>
</wicket:panel>
</html>
\ No newline at end of file
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep1.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep1.html Sun May 18 09:57:48 2014
@@ -20,8 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <fieldset id="userData">
- <legend><wicket:message key="install.wizard.params.step1.userdata"/></legend>
+ <fieldset class="ui-widget-content" id="userData">
+ <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step1.userdata"/></legend>
<ul>
<li><label wicket:for="cfg.username"><wicket:message key="install.wizard.params.step1.username"/></label>
<input wicket:id="cfg.username" wicket:message="title:install.wizard.params.step1.username.title" type="text" />
@@ -38,8 +38,8 @@
</ul>
</fieldset>
- <fieldset id="userOrga">
- <legend><wicket:message key="install.wizard.params.step1.groupdata"/></legend>
+ <fieldset class="ui-widget-content" id="userOrga">
+ <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step1.groupdata"/></legend>
<ul>
<li><label wicket:for="cfg.group"><wicket:message key="install.wizard.params.step1.group"/></label>
<input wicket:id="cfg.group" wicket:message="title:install.wizard.params.step1.group.title" type="text" /></li>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep2.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep2.html Sun May 18 09:57:48 2014
@@ -20,8 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <fieldset id="userConf">
- <legend><wicket:message key="install.wizard.params.step2.configuration"/></legend>
+ <fieldset class="ui-widget-content" id="userConf">
+ <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step2.configuration"/></legend>
<ul>
<li><label wicket:for="allowFrontendRegister"><wicket:message key="install.wizard.params.step2.allowFrontendRegister"/></label>
<select wicket:id="allowFrontendRegister"></select>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep3.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep3.html Sun May 18 09:57:48 2014
@@ -20,8 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <fieldset id="userConf1">
- <legend><wicket:message key="install.wizard.params.step3.converters"/></legend>
+ <fieldset class="ui-widget-content" id="userConf1">
+ <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step3.converters"/></legend>
<ul>
<li><label wicket:for="cfg.swfZoom"><wicket:message key="install.wizard.params.step3.swfZoom"/></label>
<input wicket:id="cfg.swfZoom" wicket:message="title:install.wizard.params.step3.swfZoom.title"
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard%24ParamsStep4.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/pages/install/InstallWizard$ParamsStep4.html Sun May 18 09:57:48 2014
@@ -20,8 +20,8 @@
-->
<html xmlns:wicket="http://wicket.apache.org">
<wicket:panel>
- <fieldset id="userConf2">
- <legend><wicket:message key="install.wizard.params.step4.crypt"/></legend>
+ <fieldset class="ui-widget-content" id="userConf2">
+ <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step4.crypt"/></legend>
<ul>
<li><label wicket:for="cfg.cryptClassName"><wicket:message key="install.wizard.params.step4.cryptClassName"/></label>
<input wicket:id="cfg.cryptClassName" type="text"
@@ -35,8 +35,8 @@
</ul>
</fieldset>
- <fieldset id="red5sip">
- <legend><wicket:message key="install.wizard.params.step4.red5SIP"/></legend>
+ <fieldset class="ui-widget-content" id="red5sip">
+ <legend class="ui-widget-header"><wicket:message key="install.wizard.params.step4.red5SIP"/></legend>
<ul>
<li><label wicket:for="red5SipEnable"><wicket:message key="install.wizard.params.step4.red5SipEnable"/></label>
<select wicket:id="red5SipEnable"></select>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/ProfileForm.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/ProfileForm.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/ProfileForm.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/profile/ProfileForm.html Sun May 18 09:57:48 2014
@@ -24,8 +24,8 @@
<table style="width: 100%; height: 100%">
<tr>
<td rowspan="2">
- <fieldset>
- <legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header">
<wicket:ommessage key="143" />
</legend>
<form wicket:id="general"></form>
@@ -37,8 +37,8 @@
</tr>
<tr>
<td>
- <fieldset>
- <legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header">
<wicket:ommessage key="1159" />
</legend>
<form wicket:id="comunity"></form>
Modified: openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html (original)
+++ openmeetings/branches/3.0.x/src/web/java/org/apache/openmeetings/web/user/rooms/RoomsPanel.html Sun May 18 09:57:48 2014
@@ -39,7 +39,7 @@
</td>
<td style="vertical-align: top">
<!-- Users in this Room -->
- <fieldset wicket:id="details">
+ <fieldset class="ui-widget-content" wicket:id="details">
<div class="formelement" style="font-style: italic;">
<label><wicket:ommessage key="404" /></label>
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-install/src/main/java/org/apache/openmeetings/installation/InstallationConfig.java Sun May 18 09:57:48 2014
@@ -22,12 +22,13 @@ import static org.apache.openmeetings.ut
import java.io.Serializable;
+import org.apache.openmeetings.db.dao.basic.ConfigurationDao;
import org.apache.openmeetings.util.crypt.MD5Implementation;
public class InstallationConfig implements Serializable {
private static final long serialVersionUID = 1L;
- public String appName = "Openmeetings";
+ public String appName = ConfigurationDao.DEFAULT_APP_NAME;
public String username;
public String password;
public String email;
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html Sun May 18 09:57:48 2014
@@ -25,8 +25,8 @@
</div>
<!-- wicket:id="form" -->
<form wicket:id="backupUpload" class="adminForm adminBackupForm">
- <fieldset>
- <legend><wicket:ommessage key="1066" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1066" /></legend>
<div class="formelement">
<div class="info-text"><wicket:ommessage key="1065" /></div>
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.html Sun May 18 09:57:48 2014
@@ -35,9 +35,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="264" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByKey"></span><wicket:ommessage key="265" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByValue"></span><wicket:ommessage key="598" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="264" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByKey"></span><wicket:ommessage key="265" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:ommessage key="598" /></th>
</tr>
</thead>
</table>
@@ -57,8 +57,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="266" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="266" /></legend>
<div class="formelement">
<label><wicket:ommessage key="267" /></label><input type="text" wicket:id="conf_key"/>
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/configurations/ConfigsPanel.java Sun May 18 09:57:48 2014
@@ -46,6 +46,7 @@ public class ConfigsPanel extends AdminP
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omConfigPanelInit();");
}
@@ -73,9 +74,8 @@ public class ConfigsPanel extends AdminP
target.appendJavaScript("omConfigPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
- + (c.getConfiguration_id().equals(form.getModelObject().getConfiguration_id()) ? " selected" : "")));
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ + (c.getConfiguration_id().equals(form.getModelObject().getConfiguration_id()) ? " ui-state-default" : "")));
}
};
add(listContainer.add(dataView).setOutputMarkupId(true));
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html Sun May 18 09:57:48 2014
@@ -26,12 +26,12 @@
<table class="adminListTable">
<thead>
<tr>
- <th><wicket:ommessage key="599" /></th>
- <th><wicket:ommessage key="600" /></th>
- <th><wicket:ommessage key="601" /></th>
- <th><wicket:ommessage key="602" /></th>
- <th><wicket:ommessage key="603" /></th>
- <th><wicket:ommessage key="1501" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="599" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="600" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="601" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="602" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="603" /></th>
+ <th class="ui-widget-header"><wicket:ommessage key="1501" /></th>
</tr>
</thead>
<tbody wicket:id="container" >
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.java Sun May 18 09:57:48 2014
@@ -120,7 +120,7 @@ public class ConnectionsPanel extends Ad
target.add(details.setVisible(true));
}
});
- item.add(AttributeModifier.append("class", "clickable " + ((item.getIndex() % 2 == 1) ? "even" : "odd")));
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"));
}
};
add(container.add(dataView).setOutputMarkupId(true), details.setVisible(false).setOutputMarkupPlaceholderTag(true));
@@ -137,5 +137,6 @@ public class ConnectionsPanel extends Ad
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
}
}
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupUsersPanel.html Sun May 18 09:57:48 2014
@@ -24,8 +24,8 @@
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable" style="min-width: 400px; max-width: 400px" >
<tr>
- <th style="width: 360px"><wicket:ommessage key="177" /></th>
- <th style="width: 34px"><wicket:ommessage key="275" /></th>
+ <th class="ui-widget-header" style="width: 360px"><wicket:ommessage key="177" /></th>
+ <th class="ui-widget-header" style="width: 34px"><wicket:ommessage key="275" /></th>
</tr>
</table>
<div class="tableWrapper" style="width: 420px; height: 420px;">
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.html Sun May 18 09:57:48 2014
@@ -34,8 +34,8 @@
<span wicket:id="navigator">[dataview navigator]</span>
<table class="adminListTable">
<tr>
- <th class="two_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="164" /></th>
- <th class="two_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="165" /></th>
+ <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="164" /></th>
+ <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="165" /></th>
</tr>
</table>
<div class="tableWrapper" id="adminTable">
@@ -53,8 +53,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="170" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="170" /></legend>
<div class="formelement">
<label><wicket:ommessage key="171" /></label><input type="text" wicket:id="name" />
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/groups/GroupsPanel.java Sun May 18 09:57:48 2014
@@ -52,6 +52,7 @@ public class GroupsPanel extends AdminPa
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("groupsInit();");
}
@@ -116,8 +117,7 @@ public class GroupsPanel extends AdminPa
target.appendJavaScript("groupsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"
+ (o.getOrganisation_id().equals(form.getModelObject().getOrganisation_id()) ? " selected" : "")));
}
};
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.html Sun May 18 09:57:48 2014
@@ -66,9 +66,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="350" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="351" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByValue"></span><wicket:ommessage key="352" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="350" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="351" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByValue"></span><wicket:ommessage key="352" /></th>
</tr>
</thead>
</table>
@@ -88,8 +88,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="353" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="353" /></legend>
<div class="formelement">
<label><wicket:ommessage key="356" /></label><span wicket:id="fieldvalues.fieldvalues_id"></span>
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/labels/LangPanel.java Sun May 18 09:57:48 2014
@@ -86,6 +86,7 @@ public class LangPanel extends AdminPane
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("labelsInit();");
}
@@ -142,8 +143,7 @@ public class LangPanel extends AdminPane
target.appendJavaScript("labelsInit();");
}
});
- item.add(AttributeModifier.append("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.append("class", "clickable ui-widget-content"
+ (fv.getFieldvalues_id().equals(form.getModelObject().getFieldvalues().getFieldvalues_id()) ? " selected" : "")));
}
};
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.html Sun May 18 09:57:48 2014
@@ -35,9 +35,9 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="three_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
- <th class="three_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
- <th class="three_column_layout_column3"><span wicket:id="orderByFile"></span><wicket:ommessage key="1106" /></th>
+ <th class="three_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
+ <th class="three_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
+ <th class="three_column_layout_column3 ui-widget-header"><span wicket:id="orderByFile"></span><wicket:ommessage key="1106" /></th>
</tr>
</thead>
</table>
@@ -57,8 +57,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="1107" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1107" /></legend>
<div class="formelement">
<label><wicket:ommessage key="1108" /></label><input type="text" wicket:id="name"/>
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/ldaps/LdapsPanel.java Sun May 18 09:57:48 2014
@@ -46,6 +46,7 @@ public class LdapsPanel extends AdminPan
@Override
public void onMenuPanelLoad(AjaxRequestTarget target) {
+ super.onMenuPanelLoad(target);
target.appendJavaScript("omLdapPanelInit();");
}
@@ -72,8 +73,7 @@ public class LdapsPanel extends AdminPan
target.appendJavaScript("omLdapPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + ((item.getIndex() % 2 == 1) ? "even" : "odd")
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ (lc.getLdapConfigId() == form.getModelObject().getLdapConfigId() ? " selected" : "")));
}
};
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.html Sun May 18 09:57:48 2014
@@ -35,8 +35,8 @@
<table class="adminListTable">
<thead>
<tr>
- <th class="two_column_layout_column1"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
- <th class="two_column_layout_column2"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
+ <th class="two_column_layout_column1 ui-widget-header"><span wicket:id="orderById"></span><wicket:ommessage key="1104" /></th>
+ <th class="two_column_layout_column2 ui-widget-header"><span wicket:id="orderByName"></span><wicket:ommessage key="1105" /></th>
</tr>
</thead>
</table>
@@ -55,8 +55,8 @@
<form wicket:id="form" class="adminForm">
<div wicket:id="buttons"></div>
<div class="scrollcontent" id="adminForm">
- <fieldset>
- <legend><wicket:ommessage key="1581" /></legend>
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:ommessage key="1581" /></legend>
<div class="formelement">
<label><wicket:ommessage key="1574" /></label><input type="checkbox" class="formcheckbox" wicket:id="isEnabled"/>
</div>
Modified: openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java
URL: http://svn.apache.org/viewvc/openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java?rev=1595583&r1=1595582&r2=1595583&view=diff
==============================================================================
--- openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java (original)
+++ openmeetings/trunk/singlewebapp/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/oauth/OAuthPanel.java Sun May 18 09:57:48 2014
@@ -63,8 +63,7 @@ public class OAuthPanel extends AdminPan
target.appendJavaScript("oauthPanelInit();");
}
});
- item.add(AttributeModifier.replace("class", "clickable "
- + (item.getIndex() % 2 == 1 ? "even" : "odd")
+ item.add(AttributeModifier.replace("class", "clickable ui-widget-content"
+ (server.getId().equals(form.getModelObject().getId()) ? " selected" : "")));
}