Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
New Media Lesson page type
  • Loading branch information
FayCross committed Mar 6, 2015
1 parent b762565 commit e3ca3a6
Show file tree
Hide file tree
Showing 26 changed files with 3,255 additions and 125 deletions.
Binary file added editor/img/page_types/mediaLesson.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified modules/xerte/engine/wizard.swf
Binary file not shown.
Binary file added modules/xerte/icons/icApplicationMedia.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/xerte/icons/icApplicationTile.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/xerte/icons/icFilm.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/xerte/icons/icFolderImg.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/xerte/icons/icPageWorld.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/xerte/icons/icPause.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Expand Up @@ -149,9 +149,16 @@
mediaElement.play();
}

if (opts.pageName) {
eval(opts.pageName).mediaFunct(mediaElement); // send mediaElement back to page so you can set up events for media
if (opts.type == "video") {
mediaElement.addEventListener("loadedmetadata", function() {
try {
eval(x_pageInfo[x_currentPage].type).mediaMetadata($(this), [$(this).prop('videoWidth'), $(this).prop('videoHeight')]); // send dimensions details back to page
} catch(e) {};
});
}
try {
eval(x_pageInfo[x_currentPage].type).mediaFunct(mediaElement); // send mediaElement back to page so you can set up events for media
} catch(e) {};
},

error: function(mediaElement) {
Expand Down Expand Up @@ -245,10 +252,8 @@
post("addEventListener", "finish");
}

if (opts.pageName) {
// set up listener so page can keep track of what's going on
post("addEventListener", "playProgress");
}
// set up listener so page can keep track of what's going on
post("addEventListener", "playProgress");
}

function onPlayProgress(data) {
Expand All @@ -259,10 +264,9 @@
}
}

// does page want to keep track of media events?
if (opts.pageName) {
eval(opts.pageName).mediaFunct(data.player_id, "vimeo", "playProgress", data.data.seconds);
}
try {
eval(x_pageInfo[x_currentPage].type).mediaFunct(data.player_id, "vimeo", "playProgress", data.data.seconds);
} catch(e) {};
}

function onFinish() {
Expand Down
@@ -0,0 +1,78 @@
/**
* Licensed to The Apereo Foundation under one or more contributor license
* agreements. See the NOTICE file distributed with this work for
* additional information regarding copyright ownership.
* The Apereo Foundation licenses this file 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.
*/

/* _____MCQ POPCORN PLUGIN STYLES_____ */

.mcqHolder.overlay {
color: white;
position: absolute;
top: 0px;
left: 0px;
width: 100%;
}

.mcqHolder.overlay .holder {
margin: 10px;
}

.mcqHolder .optionHolder {
margin-top: 15px;
}

.mcqHolder .optionHolder.centre {
text-align: center;
}

.mcqHolder .optionHolder button {
float: none;
}

.mcqHolder .optionGroup {
padding-top: 5px;
padding-bottom: 5px;
}

.mcqHolder .optionTxt {
cursor: pointer;
position: relative;
margin-left: 30px;
display: block;
}

.mcqHolder .mcqFeedback {
clear: both;
}

.mcqHolder div.feedback {
margin-bottom: 0.5em;
}

.mcqHolder .bottom {
clear: both;
}

.mcqHolder input {
float: left;
display: block;
}

.mcqHolder button {
margin: 10px;
float: right;
}

0 comments on commit e3ca3a6

Please sign in to comment.