Changeset b3195a in indico

Timestamp:

06/10/10 18:11:33 (3 years ago)

Author:

Jeremy Herr <jeremy.herr@…>

Branches:

master, burotel, hello-world-walkthrough, ipv6, new-webex, v0.97-series, v0.98-series, v0.98.2, v0.98.3, v0.98b1, v0.98b2, v0.99, 051b2622c51afb171a1dedb46a0df4fbb0cbd02e, d9941f8582b36b24821a11ea5ba16fda6a457fb1

Children:

3e6afb

Parents:

366d22

git-author:

Jeremy Herr <jeremy.herr@…> (03/25/10 16:44:29)

git-committer:

Jeremy Herr <jeremy.herr@…> (06/10/10 18:11:33)

Message:

[IMP] Fixed Javascript for enabling submit buttons

Now, the submit buttons at the bottom of the screen are enabled or disabled correctly, taking into account plain videos

Also changed the labels to "standard (4/3)" and "wide (16/9)"

Location:

indico/MaKaC/plugins/Collaboration/RecordingManager/tpls

Files:

• Extra.js (modified) (7 diffs)
• NewBookingForm.tpl (modified) (1 diff)

indico/MaKaC/plugins/Collaboration/RecordingManager/tpls/Extra.js

@@ -119 +119 @@
 ButtonCreateCDSRecord.observeClick(function(){
     if (ButtonCreateCDSRecord.isEnabled()) {
-        if (typeof RMselectedTalkId != 'undefined' &&
-                RMselectedTalkId != '' &&
-                RMselectedLOID != 'undefined' &&
-                RMselectedLOID != '') {
+        if (typeof RMselectedTalkId != 'undefined' && RMselectedTalkId != '' &&
+                (RMviewMode == 'plain_video' ||
+                        typeof RMselectedLOID != 'undefined' && RMselectedLOID != '')) {
 
             RMCreateCDSRecord();
@@ -144 +143 @@
 ButtonCreateIndicoLink.observeClick(function(){
     if (!ButtonCreateIndicoLink.isEnabled()) {
-        if (typeof RMselectedTalkId != 'undefined' &&
-                RMselectedTalkId != '' &&
-                RMselectedLOID != 'undefined' &&
-                RMselectedLOID != '') {
+        if (typeof RMselectedTalkId != 'undefined' && RMselectedTalkId != '' &&
+                (RMviewMode == 'plain_video' ||
+                        typeof RMselectedLOID != 'undefined' && RMselectedLOID != '')) {
 
             RMCreateIndicoLink();
@@ -250 +248 @@
         IndicoUI.Effect.disappear($E('RMrightPaneWebLecture'));
         IndicoUI.Effect.appear($E('RMrightPanePlainVideo'), "block");
+
+        if (typeof RMselectedTalkId != 'undefined' && RMselectedTalkId != '') {
+            ButtonCreateCDSRecord.enable();
+            ButtonCreateIndicoLink.enable();
+        }
     }
     else if (mode == 'web_lecture') {
@@ -256 +259 @@
         IndicoUI.Effect.disappear($E('RMrightPanePlainVideo'));
         IndicoUI.Effect.appear($E('RMrightPaneWebLecture'), "block");
+
+        if (typeof RMselectedTalkId == 'undefined' || RMselectedTalkId == '' ||
+            typeof RMselectedLOID == 'undefined' || RMselectedLOID == '') {
+                ButtonCreateCDSRecord.disable();
+                ButtonCreateIndicoLink.disable();
+        }
     }
 }
@@ -301 +310 @@
     RMMatchSummaryMessage(RMselectedTalkId, RMselectedLOID);
 
-    if (typeof RMselectedTalkId != 'undefined' &&
-            RMselectedTalkId != '' &&
-            typeof RMselectedLOID != 'undefined' &&
-            RMselectedLOID != '') {
+    if (typeof RMselectedTalkId != 'undefined' && RMselectedTalkId != '' &&
+            (RMviewMode == 'plain_video' ||
+                    typeof RMselectedLOID != 'undefined' && RMselectedLOID != '')) {
         ButtonCreateCDSRecord.enable();
         ButtonCreateIndicoLink.enable();
@@ -334 +342 @@
     RMMatchSummaryMessage(RMselectedTalkId, RMselectedLOID);
 
-    if (typeof RMselectedTalkId != 'undefined' &&
-            RMselectedTalkId != '' &&
-            typeof RMselectedLOID != 'undefined' &&
-            RMselectedLOID != '') {
+    if (typeof RMselectedTalkId != 'undefined' && RMselectedTalkId != '' &&
+            (RMviewMode == 'plain_video' ||
+                    typeof RMselectedLOID != 'undefined' && RMselectedLOID != '')) {
         ButtonCreateCDSRecord.enable();
         ButtonCreateIndicoLink.enable();
@@ -358 +365 @@
 function RMchooseVideoFormat(format_string) {
     RMvideoFormat = format_string;
+
+    if (typeof RMselectedTalkId != 'undefined' && RMselectedTalkId != '' &&
+            (RMviewMode == 'plain_video' ||
+                    typeof RMselectedLOID != 'undefined' && RMselectedLOID != '')) {
+        ButtonCreateCDSRecord.enable();
+        ButtonCreateIndicoLink.enable();
+    }
+
 }
 

indico/MaKaC/plugins/Collaboration/RecordingManager/tpls/NewBookingForm.tpl

@@ -95 +95 @@
             <div class="RMMatchPane" style="height: 200px;">
                 Select video aspect ratio:
-                <input type="radio" name="talks" value="4/3" id="RMvideoFormat4to3" onclick="RMchooseVideoFormat('4/3')" checked>
-                <label for="RMvideoFormat4to3">4/3</label>
+                <input type="radio" name="talks" value="standard" id="RMvideoFormat4to3" onclick="RMchooseVideoFormat('standard')" checked>
+                <label for="RMvideoFormat4to3">standard (4/3)</label>
                 &nbsp;&nbsp;&nbsp;
-                <input type="radio" name="talks" value="16/9" id="RMvideoFormat16to9" onclick="RMchooseVideoFormat('16/9')">
-                <label for="RMvideoFormat16to9">16/9</label>
+                <input type="radio" name="talks" value="wide" id="RMvideoFormat16to9" onclick="RMchooseVideoFormat('wide')">
+                <label for="RMvideoFormat16to9">wide (16/9)</label>
             </div>
         </div>