Rework on feedback popups

inc/catc.php

@@ -160,9 +160,10 @@ class CATC extends Main
 	public function deleteDoc($iDocId) {
 		$oDoc = new Doc($this->oDb);
 		$oDoc->setDocId($iDocId);
+		$asDoc = $oDoc->getDoc();
 		$bResult = $oDoc->delete();
 		
-		return self::getJsonResult($bResult, '');
+		return self::getJsonResult($bResult, '', $asDoc);
 	}
 	
 	/* Defs */

masks/course.html

@@ -99,7 +99,10 @@ function loadDocs() {
 				$Item.find('.delete').data('id', asDoc.id_doc).click(function(){
 					Tools.ajax(
 						'delete_doc',
-						(asData) => {loadDocs();},
+						(asData) => {
+							oCATC.feedback('notice', 'File "'+asData.filename+'" deleted');
+							loadDocs();
+						},
 						{id: $(this).data('id')}
 					);
 					

masks/workshop.html

@@ -1,7 +1,7 @@
 <div id="workshop" class="container">
 	<div class="row">
-		<div class="col-1"><button type="button" class="back btn btn-primary"><i class="fal fa-previous"></i></button></div>
+		<div class="col-auto"><button type="button" class="back btn btn-primary"><i class="fal fa-previous"></i></button></div>
-		<div class="col-8"><div id="course-list" class="list-group"></div></div>
+		<div class="col"><div id="course-list" class="list-group"></div></div>
 	</div>
 </div>
 <script type="text/javascript">
@@ -15,7 +15,7 @@ oCATC.pageInit = function(asHash, bFirstPage) {
 	$.each(self.consts.workshops[self.tmp('id_workshop')].courses, function(iCourseId, asCourse){
 		$CourseList.append($('<a>', {'href':'#course-'+iCourseId, 'class':'list-group-item d-flex justify-content-between align-items-center list-group-item-primary list-group-item-action'})
 			.append(asCourse.description)
-			.append($('<span>', {'class':'badge badge-primary badge-pill'}).text(asCourse.timeslot))
+			.append($('<span>', {'class':'badge badge-primary'}).text(asCourse.timeslot))
 		);
 	});
 	

readme.md

@@ -7,5 +7,5 @@ Prise de notes pour les cours du Collège des Arts Thérapeutiques Chinois
 * [x] Take notes on courses
 * [ ] Quick view of muscles / nerves schemas
 * [x] Dictionary
-* [ ] Progress bar
+* [x] Progress bar
-* [ ] Redo feedback
+* [ ] Save note on F5/quit

scripts/common.js

@@ -147,10 +147,19 @@ function feedback(sClass, sMsg, $Box)
 {
 	$Box = $Box || $('#feedback');
 	sMsg = sMsg || '';
+	
+	switch(sClass) {
+		case 'notice': sClass = 'primary'; break;
+		case 'error': sClass = 'danger'; break;
+	}
+	
 	if(sClass=='error' && sMsg=='') sMsg = 'Oops ! An unknown error occured';
-	$('<div>', {'class':'alert shadow rounded alert-'+(sClass=='error'?'danger':sClass), role:'alert'})
+	$('<div>', {'class':'alert shadow alert-dismissible fade show alert-'+sClass, role:'alert'})
-		//.append($('<i>', {'class':'fa fa-standalone fa-'+sClass}))
+		.append($('<i>', {'class':'fal fa-inline fa-'+sClass}))
 		.append(addPunctuation(sMsg))
+		.append($('<button>', {type:'button', 'class':'close', 'data-dismiss':'alert', 'aria-label':'Close'})
+			.append($('<span>', {'aria-hidden':'true'}).appendIcon('close'))
+		)
 		.appendTo($Box)
 		.slideDown('fast')
 		.delay(5000)

style/_font-awesome.scss

@@ -12,12 +12,21 @@ $fa-css-prefix: fa;
 @import 'fa/rotated-flipped';
 @import 'fa/stacked';
 
+.fa-inline {
+	margin-right: 0.5em;
+}
+
 //Common
 .#{$fa-css-prefix}-previous:before { content: fa-content($fa-var-chevron-left); }
 .#{$fa-css-prefix}-next:before { content: fa-content($fa-var-chevron-right); }
-.#{$fa-css-prefix}-delete:before { content: fa-content($fa-var-trash-alt); }
+.#{$fa-css-prefix}-close:before { content: fa-content($fa-var-times); }
-.#{$fa-css-prefix}-edit:before { content: fa-content($fa-var-pencil); }
 .#{$fa-css-prefix}-add:before { content: fa-content($fa-var-plus); }
+.#{$fa-css-prefix}-edit:before { content: fa-content($fa-var-pencil); }
+.#{$fa-css-prefix}-delete:before { content: fa-content($fa-var-trash-alt); }
+
+.#{$fa-css-prefix}-danger:before { content: fa-content($fa-var-exclamation-square); }
+.#{$fa-css-prefix}-warning:before { content: fa-content($fa-var-exclamation-triangle); }
+.#{$fa-css-prefix}-primary:before { content: fa-content($fa-var-info-circle); }
 
 //Logon
 .#{$fa-css-prefix}-user:before { content: fa-content($fa-var-user); }

style/_template.scss

@@ -87,13 +87,10 @@ a.button:active {
 
 #feedback {
 	position: absolute;
-	width: 100%;
+	bottom: 1em;
+	right: 1em;
+	width: 33%;
 	z-index: 1000;
-	
-	.alert {
-		top: 1em;
-		background: $gray-200;
-	}
 }
 
 /* Header */