Merge pull request #76 from lorderikir/master

[U] v0.5.3 update

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/MARIE-js/MARIE.js.svg?branch=master)](https://travis-ci.org/MARIE-js/MARIE.js) [![devDependency Status](https://david-dm.org/marie-js/MARIE.js/dev-status.svg)](https://david-dm.org/marie-js/MARIE.js#info=devDependencies)
 ==============
-Current version: `0.5.2`
+Current version: `0.5.3`
 
 MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy'
 from [The Essentials of Computer Organization and Architecture](https://books.google.com.au/books/about/The_Essentials_of_Computer_Organization.html?id=3kQoAwAAQBAJ&redir_esc=y) (Linda Null, Julia Lobur) in JavaScript.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "MARIE.js",
-  "version": "0.5.2",
+  "version": "0.5.3",
   "description": "MARIE.js is an implementation of a simulator for a 'Machine Architecture that is Really Intuitive and Easy' from The Essentials of Computer Organization and Architecture (Linda Null, Julia Lobur) in JavaScript.",
   "main": "index.js",
   "scripts": {

src/js/tour.js

@@ -2,75 +2,104 @@ $(document).ready( function(){
     var tour = new Tour({
         steps: [
         {
+            smartPlacement: true,
+            element: "#brand",
+            title: "Welcome to MARIE.js",
+            content: "This tour introduces the features of MARIE.js"
+        },
+        {
+            smartPlacement: true,
+            backdrop: true,
             element: "#program-container",
             title: "Coding Area",
-            content: "Type in your code here"
+            content: "This is where you type your code here"
         },
         {
+            smartPlacement: true,
+            backdrop: true,
             element: "#register-container",
             title: "Registers",
             content: "This shows you the register values"
         },
         {
+            smartPlacement: true,
+            backdrop: true,
             element: "#tab-container",
             title: "Values and Outputs",
             content: "This shows you the output in Register Log, Output Values and how the data is being transferred in RTL"
         },
         {
+            smartPlacement: true,
+            backdrop: true,
             element: "#status-info",
             title: "Status",
             content: "Shows you current status: also shows error messages"
         },
         {
+            smartPlacement: true,
+            backdrop: true,
             element: "#bottom-menu",
             title: "Control Bar",
             content: "This is the bar used for stepping through the code, and building it"
         },
         {
+            smartPlacement: true,
             element: "#assemble",
             title: "Assembling the Code",
             content: "Build the code here"
         },
         {
+            smartPlacement: true,
             element: "#step",
             title: "Step",
             content: "Step Through the Code using this button"
         },
         {
+            smartPlacement: true,
             element: "#microstep",
             title: "Microstep",
             content: "Step thorugh the code by each individual command here"
         },
         {
+            smartPlacement: true,
             element: "#step-back",
             title: "Stepping Backwards through the Code",
             content: "This is an awesome debugging feature where you can step back through each individual line to see where you've gone wrong"
         },
         {
+            smartPlacement: true,
             element: "#run",
             title: "Run",
             content: "Run the code, what else?"
         },
         {
+            smartPlacement: true,
             element: "#restart",
             title: "Restart",
-            content: "Have you tried turning it on and off again? This does exactly that."
+            content: "Have you tried turning it on and off again? This does exactly that. But this also preserves memory contents"
         },
         {
+            smartPlacement: true,
             element: "#delay-slider",
             title: "Delay Slider",
             content: "This slider sets the timing of the execution of each step"
         },
         {
+            smartPlacement: true,
             element: "#output-select",
-            title: "Select the output type here",
-            content: "This by default is set to HEX"
+            title: "Select Output Type",
+            content: "Change the output type here with the options (HEX - Base 8, DEC - Base 10, ASCII - Base 16) . This by default is set to HEX. "
         }
         ]});
     // Initialize the tour
     tour.init();
 
     // Start the tour
     tour.start(); 
+    $( "#starttour" ).click(function() {
+        window.localStorage.removeItem('tour_current_step');
+        window.localStorage.removeItem('tour_end'); //removes tour variable
+        location.reload(); //reload page
+    });
 });
 

src/templates/partials/nav.ejs

@@ -1,7 +1,7 @@
 <header>
     <nav id="custom-bootstrap-menu" class="navbar navbar-default navbar-fixed-top">
         <div class="container-fluid">
-            <div class="navbar-brand">
+            <div class="navbar-brand" id="brand">
                 MARIE.js <span class="version">v<%= version %></span>
             </div>
             <ul class="nav navbar-nav">
@@ -37,13 +37,13 @@
                     <a class="dropdown-toggle" data-toggle="dropdown">Help
                     <span class="caret"></span></a>
                     <ul class="dropdown-menu">
-                        <li><a href="https://github.com/MARIE-js/MARIE.js/wiki"><span class="glyphicon glyphicons-log-book"></span> Wiki </a></li>
+                        <li><a href="https://github.com/MARIE-js/MARIE.js/wiki"><span class="glyphicon glyphicons-list-alt"></span> Wiki </a></li>
                         <li><a href="docs.html"><span class="glyphicon glyphicon-book"></span> MARIE Documentation </a></li>
                         <li><a href="about.html"><span class="glyphicon glyphicon-info-sign"></span> About </a></li>
-                        <li><a href="https://mariejssite.wordpress.com/" target="_blank">Blog</a></li>
+                        <li><a href="https://mariejssite.wordpress.com/" target="_blank"> Blog</a></li>
                         <li class="divider"></li>
                         <li><a href="https://gitreports.com/issue/MARIE-js/MARIE.js/" target="_blank"><span class="glyphicon glyphicon-alert"></span> Report an Issue</a></li>
-                        <li><a id="starttour">Run Tour</a></li>
+                        <li><a id="starttour"> Rerun Tour</a></li>
                     </ul>
                 </li>
             </ul>