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 2017/08/08 10:20:02 UTC
openmeetings git commit: [OPENMEETINGS-1623] recording fits the area
without scrollers
Repository: openmeetings
Updated Branches:
refs/heads/master 083fa4fd9 -> ea524d3af
[OPENMEETINGS-1623] recording fits the area without scrollers
Project: http://git-wip-us.apache.org/repos/asf/openmeetings/repo
Commit: http://git-wip-us.apache.org/repos/asf/openmeetings/commit/ea524d3a
Tree: http://git-wip-us.apache.org/repos/asf/openmeetings/tree/ea524d3a
Diff: http://git-wip-us.apache.org/repos/asf/openmeetings/diff/ea524d3a
Branch: refs/heads/master
Commit: ea524d3af90f7634a72669d1f5dcbf01f0326556
Parents: 083fa4f
Author: Maxim Solodovnik <so...@gmail.com>
Authored: Tue Aug 8 17:19:54 2017 +0700
Committer: Maxim Solodovnik <so...@gmail.com>
Committed: Tue Aug 8 17:19:54 2017 +0700
----------------------------------------------------------------------
.../org/apache/openmeetings/web/pages/HashPage.html | 7 +++----
.../web/user/record/RecordingInvitationForm.java | 12 +++++++-----
.../openmeetings/web/user/record/VideoInfo.java | 2 +-
.../openmeetings/web/user/record/VideoPlayer.html | 5 ++---
openmeetings-web/src/main/webapp/css/general.css | 16 ++++++++--------
5 files changed, 21 insertions(+), 21 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ea524d3a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
index 015ecee..142a879 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/pages/HashPage.html
@@ -7,23 +7,22 @@
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:extend>
<div wicket:id="panel-recording">
<div class="page recording">
- <div wicket:id="info"></div>
<div wicket:id="player"></div>
+ <div wicket:id="info"></div>
</div>
</div>
<div wicket:id="i-pass"></div>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ea524d3a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.java
index 1634799..915bb62 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/RecordingInvitationForm.java
@@ -18,13 +18,15 @@
*/
package org.apache.openmeetings.web.user.record;
-import org.apache.openmeetings.db.entity.record.Recording;
+import static org.apache.openmeetings.web.app.Application.getBean;
+
+import org.apache.openmeetings.db.dao.record.RecordingDao;
import org.apache.openmeetings.web.common.InvitationForm;
import org.apache.wicket.ajax.AjaxRequestTarget;
public class RecordingInvitationForm extends InvitationForm {
private static final long serialVersionUID = 1L;
- private Recording recording;
+ private Long recordingId;
public RecordingInvitationForm(String id) {
super(id);
@@ -34,10 +36,10 @@ public class RecordingInvitationForm extends InvitationForm {
@Override
public void updateModel(AjaxRequestTarget target) {
super.updateModel(target);
- getModelObject().setRecording(recording);
+ getModelObject().setRecording(getBean(RecordingDao.class).get(recordingId));
}
- public void setRecording(Recording recording) {
- this.recording = recording;
+ public void setRecordingId(Long recordingId) {
+ this.recordingId = recordingId;
}
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ea524d3a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
index 792269a..76fd174 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoInfo.java
@@ -108,7 +108,7 @@ public class VideoInfo extends Panel {
@Override
protected void onSubmit(AjaxRequestTarget target) {
- rif.setRecording(rm.getObject());
+ rif.setRecordingId(rm.getObject().getId());
invite.updateModel(target);
invite.open(target);
}
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ea524d3a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
index 617da53..885bfc4 100644
--- a/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
+++ b/openmeetings-web/src/main/java/org/apache/openmeetings/web/user/record/VideoPlayer.html
@@ -7,16 +7,15 @@
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>
http://git-wip-us.apache.org/repos/asf/openmeetings/blob/ea524d3a/openmeetings-web/src/main/webapp/css/general.css
----------------------------------------------------------------------
diff --git a/openmeetings-web/src/main/webapp/css/general.css b/openmeetings-web/src/main/webapp/css/general.css
index ac9a3fc..16f01ea 100644
--- a/openmeetings-web/src/main/webapp/css/general.css
+++ b/openmeetings-web/src/main/webapp/css/general.css
@@ -237,14 +237,6 @@ html, body {
#feeds.ui-accordion .ui-accordion-header {
margin-bottom: 2px;
}
-.recording .video .player {
- width: 100%;
- display: inline-block;
- box-shadow: 0 0 10px 1px rgba(74, 137, 151, 0.5);
-}
-.recording .video .player video {
- width: 100%;
-}
.align-left {
float: left;
}
@@ -457,6 +449,14 @@ select.messages.selector {
.om-select2.full-width .select2.select2-container {
width: 100% !important;
}
+.recording .video {
+ width: 100%;
+ display: inline-block;
+ box-shadow: 0 0 10px 1px rgba(74, 137, 151, 0.5);
+}
+.recording .video video {
+ width: 100%;
+}
.page.recording {
padding-top: 40px;
}