diff --git a/inc/catc.php b/inc/catc.php index bf5c944..d07597e 100644 --- a/inc/catc.php +++ b/inc/catc.php @@ -91,7 +91,8 @@ class CATC extends Main 'index', array( 'filepath_css' => self::addTimestampToFilePath('style/catc.css'), - 'filepath_js_catc' => self::addTimestampToFilePath('scripts/catc.js') + 'filepath_js_catc' => self::addTimestampToFilePath('scripts/catc.js'), + 'filepath_js_common'=> self::addTimestampToFilePath('scripts/common.js'), ) ); } diff --git a/masks/course.html b/masks/course.html index f84feee..ef45d41 100644 --- a/masks/course.html +++ b/masks/course.html @@ -72,8 +72,10 @@ oCATC.pageInit = function(asHash, bFirstPage) { }, done: function(e, asData) { $.each(asData.result.files, function(iKey, oFile) { - var sMsg = ('error' in oFile)?oFile.error:(oFile.name+" uploaded successfully"); - oCATC.feedback('notice', sMsg); + var bSuccess = !('error' in oFile); + var sType = bSuccess?'success':'error'; + var sMsg = bSuccess?('File "'+oFile.name+'" uploaded successfully'):oFile.error; + oCATC.feedback(sType, sMsg); }); $('#upload_progress').hide('fast'); loadDocs(); @@ -100,7 +102,7 @@ function loadDocs() { Tools.ajax( 'delete_doc', (asData) => { - oCATC.feedback('notice', 'File "'+asData.filename+'" deleted'); + oCATC.feedback('success', 'File "'+asData.filename+'" deleted'); loadDocs(); }, {id: $(this).data('id')} diff --git a/masks/index.html b/masks/index.html index 68d0520..906f2d5 100644 --- a/masks/index.html +++ b/masks/index.html @@ -8,7 +8,7 @@ - + CATC Notes diff --git a/scripts/common.js b/scripts/common.js index 10d34b2..b19048a 100644 --- a/scripts/common.js +++ b/scripts/common.js @@ -67,14 +67,25 @@ var Tools = { { $Box = $Box || $('#feedback'); sMsg = sMsg || ''; - if(sClass=='error' && typeof sMsg == 'string' && sMsg=='') sMsg = 'Oops ! An unknown error occured'; - $('
', {'class':'alert shadow rounded alert-'+(sClass=='error'?'danger':sClass), role:'alert'}) - .append(sMsg) + + switch(sClass) { + case 'notice': sClass = 'primary'; break; + case 'error': sClass = 'danger'; break; + } + + if(sClass=='danger' && sMsg=='') sMsg = 'Oops ! An unknown error occured'; + + $('
', {'class':'alert shadow alert-dismissible fade show alert-'+sClass, role:'alert'}) + .append($('', {'class':'fal fa-inline fa-'+sClass})) + .append(addPunctuation(sMsg)) + .append($('