Improved progress bar

Ealenn · Dec 5, 2016 · 433500e · 433500e
1 parent 4710d65
commit 433500e
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 13 deletions.
diff --git a/view/index.html b/view/index.html
@@ -34,17 +34,11 @@ <h3 class="panel-title">Website</h3>
           <div class="progress progress-striped active">
             <div class="progress-bar progress-bar-success" style="width: 0%" id="ProgressBar"></div>
           </div>
-          <center id="progressTitle"></center>
 
-        </div>
-      </div>
+          <p id="progressTitle"></p>
 
-      <!-- PICTURE
-      <div class="row">
-        <div class="col-md-6"><img class="img-responsive img-thumbnail center-block" src="res/img/placeholder.png" id="picture_desktop"></div>
-        <div class="col-md-6"><img class="img-responsive img-thumbnail center-block" src="res/img/placeholder.png" id="picture_iphone"></div>
+        </div>
       </div>
-       END PICTURE -->
 
       <!-- INFO -->
       <div id="info"></div>
@@ -295,6 +289,8 @@ <h3 class="panel-title">W3C CSS <span class="label label-default">{{nb_errors}}<
     ArrayTemplates.forEach(function(element) {
       $("#" + element).html(' ');
     });
+    $('#ProgressBar').attr('style','width: 0%');
+    $('#progressTitle').html('');
   }
   /* End Clean Template */
 
@@ -359,7 +355,7 @@ <h3 class="panel-title">W3C CSS <span class="label label-default">{{nb_errors}}<
           });
 
           /* Wappalyzer */
-          //PBar.startStep('wappalyzer');
+          PBar.startStep('wappalyzer');
           Website.wappalyzer((response)=>{
             var wapp = [];
 
@@ -368,7 +364,7 @@ <h3 class="panel-title">W3C CSS <span class="label label-default">{{nb_errors}}<
             });
 
             generateTemplate('wappalyzer', {wapp:wapp});
-            //PBar.finishStep('wappalyzer');
+            PBar.finishStep('wappalyzer');
           }, Website.getUrl());
 
           PBar.finishStep('AnalyseHeader');

diff --git a/view/res/img/check.png b/view/res/img/check.png
diff --git a/view/res/js/ProgressBar.class.js b/view/res/js/ProgressBar.class.js
@@ -6,27 +6,35 @@ class ProgressBar {
   }
 
   changeState(){
+    var html = '';
     var total = 0;
     var nbFinish = 0;
 
+    html += '<ul>';
     $.each(this.Step, function(index, value) {
+      var img = 'loading.gif';
       total++;
-      if(value == 0)
+      if(value == 0){
         nbFinish++;
+        img = 'check.png';
+      }
+
+      /* HTML */
+      html += '<li>' + index + ' <img src="res/img/'+img+'" height="24" width="24">' + '</li>';
     });
+    html += '</ul>';
 
     var prc = 100 - Math.floor((nbFinish / total) * 100);
     $('#' + this.id).attr('style','width: ' + (100 - prc) + '%');
+    $('#' + this.text).html(html);
   }
 
   startStep(stepName){
-    $('#' + this.text).html('Start ' + stepName);
     this.Step[stepName] = 1;
     this.changeState();
   }
 
   finishStep(stepName){
-    $('#' + this.text).html('Finish ' + stepName);
     this.Step[stepName] = 0;
     this.changeState();
   }