Author: solomax
Date: Sat Mar 11 04:41:08 2017
New Revision: 1786488
URL: http://svn.apache.org/viewvc?rev=1786488&view=rev
Log:
[OPENMEETINGS-1599] minor js fix
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html?rev=1786488&r1=1786487&r2=1786488&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
Sat Mar 11 04:41:08 2017
@@ -21,15 +21,14 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:head>
<script type="text/javascript">
- var ADMIN_TABLE_SHIIFT = 144;
function adminPanelInit() {
if (typeof extAdminPanelInit === 'function') {
extAdminPanelInit();
}
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight - 114);
- $('#adminTable').height(documentHeight -
ADMIN_TABLE_SHIIFT);
- };
+ var h = $(window).height() - 5;
+ $('#adminForm').height(h -
$('#adminForm').position().top);
+ $('#adminTable').height(h -
$('#adminTable').position().top);
+ }
</script>
</wicket:head>
<wicket:panel>
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1786488&r1=1786487&r2=1786488&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
Sat Mar 11 04:41:08 2017
@@ -7,51 +7,57 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org";>
- <wicket:panel>
- <div wicket:id="feedback"></div>
- <form wicket:id="backupUpload" class="adminForm
adminBackupForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1066" /></legend>
- <div class="formelement">
- <div class="info-text"><wicket:message
key="1065" /></div>
- </div>
- <div class="formelement">
- <label><wicket:message key="1537"
/></label> <input type="checkbox" wicket:id="includeFilesInBackup" />
- </div>
- <div class="formelement">
- <span wicket:id="progress"></span>
- <div wicket:id="dprogress"></div>
- </div>
- <div class="formelement">
- <!-- Perform Download -->
- <div wicket:id="download"
class="btn"><wicket:message key="1066"/></div>
- <!-- Perform Upload -->
- <div class="fileinput fileinput-new"
data-provides="fileinput" style="margin: 0; display: inline-block;">
- <span class="btn btn-file
ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
-
class="ui-button-text"><wicket:message key="1536"/></span><input
class="uploadFileField" wicket:id="fileInput" type="file"/></span>
- </div>
- </div>
- <div class="formelement">
- <!-- Max upload size -->
- <wicket:message key="1491" /> <span
wicket:id="MaxUploadSize" /><span>MB</span>
- </div>
- <div class="formelement">
- <!-- Backup CLI import information -->
- <div class="info-text"
wicket:id="cmdLineDesc"></div>
- </div>
- </fieldset>
- </form>
- </wicket:panel>
+<wicket:head>
+ <script type="text/javascript">
+ function adminPanelInit() {}
+ </script>
+</wicket:head>
+<wicket:panel>
+ <div wicket:id="feedback"></div>
+ <form wicket:id="backupUpload" class="adminForm adminBackupForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message
key="1066" /></legend>
+ <div class="formelement">
+ <div class="info-text"><wicket:message
key="1065" /></div>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1537" /></label>
<input type="checkbox" wicket:id="includeFilesInBackup" />
+ </div>
+ <div class="formelement">
+ <span wicket:id="progress"></span>
+ <div wicket:id="dprogress"></div>
+ </div>
+ <div class="formelement">
+ <!-- Perform Download -->
+ <div wicket:id="download"
class="btn"><wicket:message key="1066"/></div>
+ <!-- Perform Upload -->
+ <div class="fileinput fileinput-new"
data-provides="fileinput" style="margin: 0; display: inline-block;">
+ <span class="btn btn-file ui-button
ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
+
class="ui-button-text"><wicket:message key="1536"/></span><input
class="uploadFileField" wicket:id="fileInput" type="file"/></span>
+ </div>
+ </div>
+ <div class="formelement">
+ <!-- Max upload size -->
+ <wicket:message key="1491" /> <span
wicket:id="MaxUploadSize" /><span>MB</span>
+ </div>
+ <div class="formelement">
+ <!-- Backup CLI import information -->
+ <div class="info-text"
wicket:id="cmdLineDesc"></div>
+ </div>
+ </fieldset>
+ </form>
+</wicket:panel>
</html>
+
Modified:
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1786488&r1=1786487&r2=1786488&view=diff
==============================================================================
---
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
(original)
+++
openmeetings/application/branches/3.2.x/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
Sat Mar 11 04:41:08 2017
@@ -49,8 +49,8 @@
</table>
</div>
</div>
- <div class="adminPanelColumnForm">
- <table wicket:id="details" style="width: 450px;">
+ <div class="adminPanelColumnForm" id="adminForm">
+ <table wicket:id="details" style="width: 450px; overflow-y:
auto;">
<tr wicket:id="line"><td wicket:id="name"></td><td
wicket:id="value"></td></tr>
</table>
</div>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html?rev=1786488&r1=1786487&r2=1786488&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/AdminPanel.html
Sat Mar 11 04:41:08 2017
@@ -21,15 +21,14 @@
<html xmlns:wicket="http://wicket.apache.org";>
<wicket:head>
<script type="text/javascript">
- var ADMIN_TABLE_SHIIFT = 144;
function adminPanelInit() {
if (typeof extAdminPanelInit === 'function') {
extAdminPanelInit();
}
- var documentHeight = $(document).height();
- $('#adminForm').height(documentHeight - 114);
- $('#adminTable').height(documentHeight -
ADMIN_TABLE_SHIIFT);
- };
+ var h = $(window).height() - 5;
+ $('#adminForm').height(h -
$('#adminForm').position().top);
+ $('#adminTable').height(h -
$('#adminTable').position().top);
+ }
</script>
</wicket:head>
<wicket:panel>
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html?rev=1786488&r1=1786487&r2=1786488&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/backup/BackupPanel.html
Sat Mar 11 04:41:08 2017
@@ -7,51 +7,57 @@
to you under the Apache License, Version 2.0 (the
"License"); you may not use this file except in compliance
with the License. You may obtain a copy of the License at
-
+
http://www.apache.org/licenses/LICENSE-2.0
-
+
Unless required by applicable law or agreed to in writing,
software distributed under the License is distributed on an
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
KIND, either express or implied. See the License for the
specific language governing permissions and limitations
under the License.
-
+
-->
<html xmlns:wicket="http://wicket.apache.org";>
- <wicket:panel>
- <div wicket:id="feedback"></div>
- <form wicket:id="backupUpload" class="adminForm
adminBackupForm">
- <fieldset class="ui-widget-content">
- <legend
class="ui-widget-header"><wicket:message key="1066" /></legend>
- <div class="formelement">
- <div class="info-text"><wicket:message
key="1065" /></div>
- </div>
- <div class="formelement">
- <label><wicket:message key="1537"
/></label> <input type="checkbox" wicket:id="includeFilesInBackup" />
- </div>
- <div class="formelement">
- <span wicket:id="progress"></span>
- <div wicket:id="dprogress"></div>
- </div>
- <div class="formelement">
- <!-- Perform Download -->
- <div wicket:id="download"
class="btn"><wicket:message key="1066"/></div>
- <!-- Perform Upload -->
- <div class="fileinput fileinput-new"
data-provides="fileinput" style="margin: 0; display: inline-block;">
- <span class="btn btn-file
ui-button ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
-
class="ui-button-text"><wicket:message key="1536"/></span><input
class="uploadFileField" wicket:id="fileInput" type="file"/></span>
- </div>
- </div>
- <div class="formelement">
- <!-- Max upload size -->
- <wicket:message key="1491" /> <span
wicket:id="MaxUploadSize" /><span>MB</span>
- </div>
- <div class="formelement">
- <!-- Backup CLI import information -->
- <div class="info-text"
wicket:id="cmdLineDesc"></div>
- </div>
- </fieldset>
- </form>
- </wicket:panel>
+<wicket:head>
+ <script type="text/javascript">
+ function adminPanelInit() {}
+ </script>
+</wicket:head>
+<wicket:panel>
+ <div wicket:id="feedback"></div>
+ <form wicket:id="backupUpload" class="adminForm adminBackupForm">
+ <fieldset class="ui-widget-content">
+ <legend class="ui-widget-header"><wicket:message
key="1066" /></legend>
+ <div class="formelement">
+ <div class="info-text"><wicket:message
key="1065" /></div>
+ </div>
+ <div class="formelement">
+ <label><wicket:message key="1537" /></label>
<input type="checkbox" wicket:id="includeFilesInBackup" />
+ </div>
+ <div class="formelement">
+ <span wicket:id="progress"></span>
+ <div wicket:id="dprogress"></div>
+ </div>
+ <div class="formelement">
+ <!-- Perform Download -->
+ <div wicket:id="download"
class="btn"><wicket:message key="1066"/></div>
+ <!-- Perform Upload -->
+ <div class="fileinput fileinput-new"
data-provides="fileinput" style="margin: 0; display: inline-block;">
+ <span class="btn btn-file ui-button
ui-widget ui-state-default ui-corner-all ui-button-text-only"><span
+
class="ui-button-text"><wicket:message key="1536"/></span><input
class="uploadFileField" wicket:id="fileInput" type="file"/></span>
+ </div>
+ </div>
+ <div class="formelement">
+ <!-- Max upload size -->
+ <wicket:message key="1491" /> <span
wicket:id="MaxUploadSize" /><span>MB</span>
+ </div>
+ <div class="formelement">
+ <!-- Backup CLI import information -->
+ <div class="info-text"
wicket:id="cmdLineDesc"></div>
+ </div>
+ </fieldset>
+ </form>
+</wicket:panel>
</html>
+
Modified:
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
URL:
http://svn.apache.org/viewvc/openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html?rev=1786488&r1=1786487&r2=1786488&view=diff
==============================================================================
---
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
(original)
+++
openmeetings/application/trunk/openmeetings-web/src/main/java/org/apache/openmeetings/web/admin/connection/ConnectionsPanel.html
Sat Mar 11 04:41:08 2017
@@ -49,8 +49,8 @@
</table>
</div>
</div>
- <div class="adminPanelColumnForm">
- <table wicket:id="details" style="width: 450px;">
+ <div class="adminPanelColumnForm" id="adminForm">
+ <table wicket:id="details" style="width: 450px; overflow-y:
auto;">
<tr wicket:id="line"><td wicket:id="name"></td><td
wicket:id="value"></td></tr>
</table>
</div>
