Fix links

main/inc/lib/javascript/fixlinks.js

@@ -36,11 +36,18 @@ $(document).ready(function() {
         var randLetter = String.fromCharCode(65 + Math.floor(Math.random() * 26));
         var uniqid = randLetter + Date.now();
         var openerId = uniqid +'_opener';
-        var link = '<a id="'+openerId+'" class="generated" href="#">If iframe does not work, try clicking here.<img src="'+iconPath+'link-external.png "/></a>';
+        var link = '<a id="'+openerId+'" class="generated" href="#">Open website.<img src="'+iconPath+'link-external.png "/></a>';
         var embed = $(this);
         var height = embed.attr('height');
         var width = embed.attr('width');
         var src = embed.attr('src');
+
+        var n = src.indexOf("youtube.com");
+        console.log(n);
+        if (n > 0) {
+            return true;
+        }
+
         var completeUrl =  url + 'width='+embed.attr('width')+
             '&height='+height+
             '&type=iframe'+
@@ -51,7 +58,7 @@ $(document).ready(function() {
 
         if (result.length == 0) {
             if (embed.next().attr('class') != 'generated') {
-                $(this).parent().append(link + '<br />');
+                $(this).prepend(link + '<br />');
                 $('#' + openerId).click(function () {
                     width = 1024;
                     height = 640;
@@ -64,7 +71,7 @@ $(document).ready(function() {
 
     var anchors = $(document).find('a').not('.generated');
     anchors.each(function (value, obj) {
-        if ($(this).next().attr('class') != 'generated') {
+        if ($(this).next().attr('class') != 'generated' ) {
             var src = $(this).attr('href');
             src = src.replace('https', 'http');
             var myAnchor = $('<a><img src="'+iconPath+'link-external.png "/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');

main/newscorm/scorm_api.php

@@ -2178,7 +2178,7 @@ function attach_glossary_into_scorm(type) {
                     var randLetter = String.fromCharCode(65 + Math.floor(Math.random() * 26));
                     var uniqid = randLetter + Date.now();
                     var openerId = uniqid +'_opener';
-                    var link = '<a id="'+openerId+'" class="generated" href="#">If iframe does not work, try clicking here. <img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>';
+                    var link = '<a id="'+openerId+'" class="generated" href="#">Open website <img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>';
                     var embed = $(this);
                     var height = embed.attr('height');
                     var width = embed.attr('width');
@@ -2191,9 +2191,14 @@ function attach_glossary_into_scorm(type) {
                         '&width='+width;
                     var result = $("iframe").contents().find('#'+openerId);
 
+                    var n = src.indexOf("youtube.com");
+                    if (n > 0) {
+                        return true;
+                    }
+
                     if (result.length == 0) {
-                        if (embed.next().attr('class') != 'generated') {
-                            $(this).parent().append(link + '<br />');
+                        if (embed.prev().attr('class') != 'generated') {
+                            $(this).parent().prepend(link + '<br />');
                             $("iframe").contents().find('#' + openerId).click(function() {
                                 width = 1024;
                                 height = 640;
@@ -2206,11 +2211,13 @@ function attach_glossary_into_scorm(type) {
 
                 var anchors = $("iframe").contents().find('a').not('.generated');
                     anchors.each(function (value, obj) {
-                        var src = $(this).attr('href');
-                        src = src.replace('https', 'http');
-                        var myAnchor = $('<a><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
-                        $(this).after(myAnchor);
-                        $(this).after('-');
+                        if ($(this).next().attr('class') != 'generated' ) {
+                            var src = $(this).attr('href');
+                            src = src.replace('https', 'http');
+                            var myAnchor = $('<a><img src="<?php echo api_get_path(WEB_CODE_PATH).'img/link-external.png'; ?>"/></a>').attr("href", src).attr('target', '_blank').attr('class', 'generated');
+                            $(this).after(myAnchor);
+                            $(this).after('-');
+                        }
                 });
             });
         }