diff --git a/assets/css/login.css b/assets/css/login.css index c9f1a9d..52f9f3c 100644 --- a/assets/css/login.css +++ b/assets/css/login.css @@ -44,8 +44,8 @@ button { border: none; } -.netcloud-logo { - background-image: url("../../assets/images/Netcloud-Logo_Weiss.png"); +.mit-logo { + background-image: url("../../assets/images/michu-it_logo_weiss.png"); width: 104px; height: 60px; background-size: contain; @@ -56,7 +56,7 @@ button { .container { position: relative; height: 100%; - background-image: url("../../assets/images/background.jpg"); + background-image: url("../../assets/images/MITbg.jpg"); background-size: cover; overflow: auto; font-family: "Open Sans", Helvetica, Arial, sans-serif; diff --git a/assets/css/styles.css b/assets/css/styles.css index 18b17d1..5383d36 100644 --- a/assets/css/styles.css +++ b/assets/css/styles.css @@ -13,8 +13,8 @@ html { /* Full height */ height: 100%; /* The image used */ - background-image: url("../../assets/images/background.jpg"); - background-color: #373743; + background-image: url("../../assets/images/MITbg.jpg"); + background-color: #1e1e1e; /* Center and scale the image nicely */ background-position: center center; background-size: cover; @@ -24,7 +24,7 @@ html { /*Fix for moving page because of scrole baar*/ } -.netcloud-logo { +.mit-logo { background-image: url("../../assets/images/michu-it_logo_weiss.png"); width: 132px; height: 60px; @@ -49,7 +49,7 @@ html { min-height: 500px; position: relative; margin: 30px auto 50px; - background-color: rgb(0 0 0 / 40%); + background-color: rgb(0 0 0 / 66%); } @media all and (max-width: 965px) { @@ -271,7 +271,7 @@ html { .filemanager .data li { border-radius: 3px; - background-color: #373743; + background-color: #3e3e3e; width: 307px; height: 118px; list-style-type: none; @@ -553,9 +553,6 @@ html { border-bottom-color: #30837c; } -/*---------------------------- - The Demo Footer ------------------------------*/ footer { width: 770px; @@ -699,7 +696,7 @@ footer #tzine-actions iframe { } .button { - background-color: #373743; + background-color: #002751; border: none; color: white; padding: 15px 32px; diff --git a/assets/images/MITbg.jpg b/assets/images/MITbg.jpg new file mode 100644 index 0000000..229a7f9 Binary files /dev/null and b/assets/images/MITbg.jpg differ diff --git a/assets/js/script.js b/assets/js/script.js index 322916f..f21ca30 100644 --- a/assets/js/script.js +++ b/assets/js/script.js @@ -323,6 +323,9 @@ $(function () { if (scannedFiles.length) { + // empty playlist + var playlist = []; + scannedFiles.forEach(function (f) { var fileSize = bytesToSize(f.size), @@ -335,7 +338,6 @@ $(function () { if (fileType == "db") { return; } - if (fileType == "jpg") { icon = '
'; var file = $('
  • ' + icon + '' + name + ' ' + fileSize + '
  • '); @@ -354,11 +356,6 @@ $(function () { if (fileType == "mp4") { - // adding watched courses to cookie information - dev - //var arr = ['001 - Course Introduction.mp4', 'bar', 'Home/IT Basics and Sysadmin Topics/DNS and BIND Deep Dive/004 - DNS Concepts - Terms and Definitions.mp4']; - //var json_str = JSON.stringify(arr); - //setCookie('watchedVideoArray', json_str); - var style = ""; // https://stackoverflow.com/questions/2980143/i-want-to-store-javascript-array-as-a-cookie/2980163 // get saved cookie information @@ -369,16 +366,53 @@ $(function () { style = 'style="display: inline;"'; } } - - var file = $('
  • ' + icon + '' + name + ' ' + fileSize + '
  • '); - - } else { + // Add whole array-elemtent to playlist. + playlist.push({ + src: f.path, + opts: { + caption: name + } + }); + var file = $('
  • ' + icon + '' + name + ' ' + fileSize + '
  • '); + } + else { var file = $('
  • ' + icon + '' + name + ' ' + fileSize + '
  • '); } - file.appendTo(fileList); }); - + + //console.log(playlist); // Print Playlist to dev-console + + //Fancybox initialisieren + $('[data-fancybox="playlist"]').fancybox({ + loop: false, + buttons : [ + 'fullScreen', + 'thumbs', + 'close' + ], + thumbs : { + autoStart : true + }, + afterLoad : function(instance, current) { + console.log("next video! :)"); + console.log("--------------"); + console.log(instance); + console.log("--------------"); + console.log(current); + console.log("--------------"); + // append new value to the array + arr_watchstatus.push(current.opts.$orig[0].dataset.src); // adds new video path to array! + var json_str = JSON.stringify(arr_watchstatus); // JSON encodes the array + setCookie('watchedVideoArray', json_str); // Set new JSON Value to cookie + + current.opts.$orig[0].childNodes[5].style.display = "inline"; // Set green thick! + }, + //Playlist als Option übergeben + video: { + playList: playlist + } + }); } // Generate the breadcrumbs diff --git a/index.php b/index.php index bea3a31..434450f 100644 --- a/index.php +++ b/index.php @@ -51,7 +51,7 @@ define('PROJECT_ROOT', getcwd()); Go Back Home - +
    Loading...
    @@ -64,7 +64,7 @@ define('PROJECT_ROOT', getcwd()); - + diff --git a/login.php b/login.php index c18caeb..8552467 100644 --- a/login.php +++ b/login.php @@ -89,7 +89,7 @@ if ($user_ip != "83.150.6.68") {