Semi-Clean ethoFS integration, Fix image file which contained HTML, clean up.

assets/dashboard/css/style.css

@@ -1,4 +1,6 @@
 @import "https://fonts.googleapis.com/css?family=Montserrat:300,400,700";
+
+
 .rwd-table {
   margin: 1em 0;
   min-width: 300px;
@@ -323,8 +325,8 @@
   .navbar .navbar-collapse.in {
     overflow: visible; }
 
-.ls-closed .sidebar {
+/*.ls-closed .sidebar {
-  margin-left: -300px; }
+  margin-left: -300px; }*/
 
 .ls-closed section.content {
   margin-left: 15px; }
@@ -2609,7 +2611,7 @@
 @media (max-width: 767px) {
   .navbar > .container .navbar-brand,
   .navbar > .container-fluid .navbar-brand {
-    margin-left: 35px;
+    /*margin-left: 35px;*/
     width: 73%; }
   .navbar .navbar-header {
     display: inline-block;
@@ -2687,7 +2689,7 @@ a {
   animation: none !important; }
 
 section.content {
-  margin: 100px 15px 0 315px;
+  margin: 35px 15px 0 10px;
   -moz-transition: 0.5s;
   -o-transition: 0.5s;
   -webkit-transition: 0.5s;
@@ -7006,8 +7008,8 @@ fieldset[disabled] .form-control {
   .navbar .navbar-collapse.in {
     overflow: visible; }
 
-.ls-closed .sidebar {
+/*.ls-closed .sidebar {
-  margin-left: -300px; }
+  margin-left: -300px; }*/
 
 .ls-closed section.content {
   margin-left: 15px; }
@@ -7794,11 +7796,11 @@ fieldset[disabled] .form-control {
   display: none;
   z-index: 10; }
 
-.overlay-open .sidebar {
+/*.overlay-open .sidebar {
   margin-left: 0;
-  z-index: 99999999; }
+  z-index: 99999999; }*/
 
-.sidebar {
+/*.sidebar {
   -moz-transition: all 0.5s;
   -o-transition: all 0.5s;
   -webkit-transition: all 0.5s;
@@ -7806,7 +7808,6 @@ fieldset[disabled] .form-control {
   font-family: "Roboto", sans-serif;
   background: #000;
   color: white;
-  width: 300px;
   overflow: hidden;
   display: inline-block;
   height: calc(100vh - 70px);
@@ -8022,7 +8023,7 @@ fieldset[disabled] .form-control {
       .right-sidebar .nav-tabs li:first-child {
         width: 45%; }
       .right-sidebar .nav-tabs li:last-child {
-        width: 55%; }
+        width: 55%; }*/
 
 /* Bootstrap Notify ============================ */
 .bootstrap-notify-container {
@@ -8458,7 +8459,7 @@ fieldset[disabled] .form-control {
   border-radius: 0 !important; }
 
 /* For Internet Explorer 10 ===================== */
-html.ie10 .sidebar .menu .list li {
+/*html.ie10 .sidebar .menu .list li {
   line-height: 30px; }
 
 html.ie10 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:before {
@@ -8466,7 +8467,7 @@ html.ie10 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:be
   line-height: 20px !important; }
 
 html.ie10 .sidebar .user-info .info-container {
-  top: 15px; }
+  top: 15px; }*/
 
 html.ie10 .search-bar input[type="text"] {
   padding: 26px 60px 26px 56px; }
@@ -8478,12 +8479,12 @@ html.ie10 .bs-searchbox .form-control {
   width: 90%; }
 
 /* For Internet Explorer 11 ===================== */
-html.ie11 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:before {
+/*html.ie11 .sidebar .menu .list .ml-menu li.active a:not(.menu-toggle).toggled:before {
   top: 6px !important;
   line-height: 20px !important; }
 
 html.ie11 .sidebar .user-info .info-container {
-  top: 15px; }
+  top: 15px; }*/
 
 html.ie11 .search-bar input[type="text"] {
   padding: 26px 60px 26px 56px; }

assets/dashboard/plugins/bootstrap/css/bootstrap.css

@@ -5917,7 +5917,8 @@ button.close {
   -webkit-box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
           box-shadow: 0 3px 9px rgba(0, 0, 0, .5);
 }
-.modal-backdrop {
+
+/*.modal-backdrop {
   position: fixed;
   top: 0;
   right: 0;
@@ -5933,7 +5934,8 @@ button.close {
 .modal-backdrop.in {
   filter: alpha(opacity=50);
   opacity: .5;
-}
+}*/
+
 .modal-header {
   padding: 15px;
   border-bottom: 1px solid #e5e5e5;

assets/dashboard/plugins/bootstrap/js/bootstrap.js

@@ -8,7 +8,8 @@ if (typeof jQuery === 'undefined') {
   throw new Error('Bootstrap\'s JavaScript requires jQuery')
 }
 
-+function ($) {
++
+function($) {
   'use strict';
   var version = $.fn.jquery.split(' ')[0].split('.')
   if ((version[0] < 2 && version[1] < 9) || (version[0] == 1 && version[1] == 9 && version[2] < 1) || (version[0] > 2)) {
@@ -25,7 +26,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // CSS TRANSITION SUPPORT (Shoutout: http://www.modernizr.com/)
@@ -43,7 +45,9 @@ if (typeof jQuery === 'undefined') {
 
     for (var name in transEndEventNames) {
       if (el.style[name] !== undefined) {
-        return { end: transEndEventNames[name] }
+        return {
+          end: transEndEventNames[name]
+        }
       }
     }
 
@@ -54,8 +58,12 @@ if (typeof jQuery === 'undefined') {
   $.fn.emulateTransitionEnd = function(duration) {
     var called = false
     var $el = this
-    $(this).one('bsTransitionEnd', function () { called = true })
+    $(this).one('bsTransitionEnd', function() {
-    var callback = function () { if (!called) $($el).trigger($.support.transition.end) }
+      called = true
+    })
+    var callback = function() {
+      if (!called) $($el).trigger($.support.transition.end)
+    }
     setTimeout(callback, duration)
     return this
   }
@@ -85,7 +93,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // ALERT CLASS DEFINITION
@@ -180,7 +189,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // BUTTON PUBLIC CLASS DEFINITION
@@ -301,7 +311,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // CAROUSEL CLASS DEFINITION
@@ -338,9 +349,14 @@ if (typeof jQuery === 'undefined') {
   Carousel.prototype.keydown = function(e) {
     if (/input|textarea/i.test(e.target.tagName)) return
     switch (e.which) {
-      case 37: this.prev(); break
+      case 37:
-      case 39: this.next(); break
+        this.prev();
-      default: return
+        break
+      case 39:
+        this.next();
+        break
+      default:
+        return
     }
 
     e.preventDefault()
@@ -351,9 +367,9 @@ if (typeof jQuery === 'undefined') {
 
     this.interval && clearInterval(this.interval)
 
-    this.options.interval
+    this.options.interval &&
-      && !this.paused
+      !this.paused &&
-      && (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
+      (this.interval = setInterval($.proxy(this.next, this), this.options.interval))
 
     return this
   }
@@ -365,8 +381,8 @@ if (typeof jQuery === 'undefined') {
 
   Carousel.prototype.getItemForDirection = function(direction, active) {
     var activeIndex = this.getItemIndex(active)
-    var willWrap = (direction == 'prev' && activeIndex === 0)
+    var willWrap = (direction == 'prev' && activeIndex === 0) ||
-                || (direction == 'next' && activeIndex == (this.$items.length - 1))
+      (direction == 'next' && activeIndex == (this.$items.length - 1))
     if (willWrap && !this.options.wrap) return active
     var delta = direction == 'prev' ? -1 : 1
     var itemIndex = (activeIndex + delta) % this.$items.length
@@ -379,7 +395,9 @@ if (typeof jQuery === 'undefined') {
 
     if (pos > (this.$items.length - 1) || pos < 0) return
 
-    if (this.sliding)       return this.$element.one('slid.bs.carousel', function () { that.to(pos) }) // yes, "slid"
+    if (this.sliding) return this.$element.one('slid.bs.carousel', function() {
+      that.to(pos)
+    }) // yes, "slid"
     if (activeIndex == pos) return this.pause().cycle()
 
     return this.slide(pos > activeIndex ? 'next' : 'prev', this.$items.eq(pos))
@@ -435,7 +453,10 @@ if (typeof jQuery === 'undefined') {
       $nextIndicator && $nextIndicator.addClass('active')
     }
 
-    var slidEvent = $.Event('slid.bs.carousel', { relatedTarget: relatedTarget, direction: direction }) // yes, "slid"
+    var slidEvent = $.Event('slid.bs.carousel', {
+      relatedTarget: relatedTarget,
+      direction: direction
+    }) // yes, "slid"
     if ($.support.transition && this.$element.hasClass('slide')) {
       $next.addClass(type)
       $next[0].offsetWidth // force reflow
@@ -539,7 +560,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // COLLAPSE PUBLIC CLASS DEFINITION
@@ -657,8 +679,7 @@ if (typeof jQuery === 'undefined') {
 
     if (!$.support.transition) return complete.call(this)
 
-    this.$element
+    this.$element[dimension](0)
-      [dimension](0)
       .one('bsTransitionEnd', $.proxy(complete, this))
       .emulateTransitionEnd(Collapse.TRANSITION_DURATION)
   }
@@ -688,8 +709,8 @@ if (typeof jQuery === 'undefined') {
 
   function getTargetFromTrigger($trigger) {
     var href
-    var target = $trigger.attr('data-target')
+    var target = $trigger.attr('data-target') ||
-      || (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
+      (href = $trigger.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') // strip for ie7
 
     return $(target)
   }
@@ -751,7 +772,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // DROPDOWN CLASS DEFINITION
@@ -784,7 +806,9 @@ if (typeof jQuery === 'undefined') {
     $(toggle).each(function() {
       var $this = $(this)
       var $parent = getParent($this)
-      var relatedTarget = { relatedTarget: this }
+      var relatedTarget = {
+        relatedTarget: this
+      }
 
       if (!$parent.hasClass('open')) return
 
@@ -818,7 +842,9 @@ if (typeof jQuery === 'undefined') {
           .on('click', clearMenus)
       }
 
-      var relatedTarget = { relatedTarget: this }
+      var relatedTarget = {
+        relatedTarget: this
+      }
       $parent.trigger(e = $.Event('show.bs.dropdown', relatedTarget))
 
       if (e.isDefaultPrevented()) return
@@ -901,7 +927,9 @@ if (typeof jQuery === 'undefined') {
 
   $(document)
     .on('click.bs.dropdown.data-api', clearMenus)
-    .on('click.bs.dropdown.data-api', '.dropdown form', function (e) { e.stopPropagation() })
+    .on('click.bs.dropdown.data-api', '.dropdown form', function(e) {
+      e.stopPropagation()
+    })
     .on('click.bs.dropdown.data-api', toggle, Dropdown.prototype.toggle)
     .on('keydown.bs.dropdown.data-api', toggle, Dropdown.prototype.keydown)
     .on('keydown.bs.dropdown.data-api', '.dropdown-menu', Dropdown.prototype.keydown)
@@ -917,7 +945,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // MODAL CLASS DEFINITION
@@ -960,7 +989,9 @@ if (typeof jQuery === 'undefined') {
 
   Modal.prototype.show = function(_relatedTarget) {
     var that = this
-    var e    = $.Event('show.bs.modal', { relatedTarget: _relatedTarget })
+    var e = $.Event('show.bs.modal', {
+      relatedTarget: _relatedTarget
+    })
 
     this.$element.trigger(e)
 
@@ -1004,7 +1035,9 @@ if (typeof jQuery === 'undefined') {
 
       that.enforceFocus()
 
-      var e = $.Event('shown.bs.modal', { relatedTarget: _relatedTarget })
+      var e = $.Event('shown.bs.modal', {
+        relatedTarget: _relatedTarget
+      })
 
       transition ?
         that.$dialog // wait for modal to slide in
@@ -1107,9 +1140,9 @@ if (typeof jQuery === 'undefined') {
           return
         }
         if (e.target !== e.currentTarget) return
-        this.options.backdrop == 'static'
+        this.options.backdrop == 'static' ?
-          ? this.$element[0].focus()
+          this.$element[0].focus() :
-          : this.hide()
+          this.hide()
       }, this))
 
       if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
@@ -1231,7 +1264,9 @@ if (typeof jQuery === 'undefined') {
     var $this = $(this)
     var href = $this.attr('href')
     var $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) // strip for ie7
-    var option  = $target.data('bs.modal') ? 'toggle' : $.extend({ remote: !/#/.test(href) && href }, $target.data(), $this.data())
+    var option = $target.data('bs.modal') ? 'toggle' : $.extend({
+      remote: !/#/.test(href) && href
+    }, $target.data(), $this.data())
 
     if ($this.is('a')) e.preventDefault()
 
@@ -1256,7 +1291,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // TOOLTIP PUBLIC CLASS DEFINITION
@@ -1300,7 +1336,11 @@ if (typeof jQuery === 'undefined') {
     this.$element = $(element)
     this.options = this.getOptions(options)
     this.$viewport = this.options.viewport && $($.isFunction(this.options.viewport) ? this.options.viewport.call(this, this.$element) : (this.options.viewport.selector || this.options.viewport))
-    this.inState   = { click: false, hover: false, focus: false }
+    this.inState = {
+      click: false,
+      hover: false,
+      focus: false
+    }
 
     if (this.$element[0] instanceof document.constructor && !this.options.selector) {
       throw new Error('`selector` option must be specified when initializing ' + this.type + ' on the window.document object!')
@@ -1323,7 +1363,10 @@ if (typeof jQuery === 'undefined') {
     }
 
     this.options.selector ?
-      (this._options = $.extend({}, this.options, { trigger: 'manual', selector: '' })) :
+      (this._options = $.extend({}, this.options, {
+        trigger: 'manual',
+        selector: ''
+      })) :
       this.fixTitle()
   }
 
@@ -1448,7 +1491,11 @@ if (typeof jQuery === 'undefined') {
 
       $tip
         .detach()
-        .css({ top: 0, left: 0, display: 'block' })
+        .css({
+          top: 0,
+          left: 0,
+          display: 'block'
+        })
         .addClass(placement)
         .data('bs.' + this.type, this)
 
@@ -1608,25 +1655,52 @@ if (typeof jQuery === 'undefined') {
     var elRect = el.getBoundingClientRect()
     if (elRect.width == null) {
       // width and height are missing in IE8, so compute them manually; see https://github.com/twbs/bootstrap/issues/14093
-      elRect = $.extend({}, elRect, { width: elRect.right - elRect.left, height: elRect.bottom - elRect.top })
+      elRect = $.extend({}, elRect, {
+        width: elRect.right - elRect.left,
+        height: elRect.bottom - elRect.top
+      })
     }
-    var elOffset  = isBody ? { top: 0, left: 0 } : $element.offset()
+    var elOffset = isBody ? {
-    var scroll    = { scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop() }
+      top: 0,
-    var outerDims = isBody ? { width: $(window).width(), height: $(window).height() } : null
+      left: 0
+    } : $element.offset()
+    var scroll = {
+      scroll: isBody ? document.documentElement.scrollTop || document.body.scrollTop : $element.scrollTop()
+    }
+    var outerDims = isBody ? {
+      width: $(window).width(),
+      height: $(window).height()
+    } : null
 
     return $.extend({}, elRect, scroll, outerDims, elOffset)
   }
 
   Tooltip.prototype.getCalculatedOffset = function(placement, pos, actualWidth, actualHeight) {
-    return placement == 'bottom' ? { top: pos.top + pos.height,   left: pos.left + pos.width / 2 - actualWidth / 2 } :
+    return placement == 'bottom' ? {
-           placement == 'top'    ? { top: pos.top - actualHeight, left: pos.left + pos.width / 2 - actualWidth / 2 } :
+        top: pos.top + pos.height,
-           placement == 'left'   ? { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left - actualWidth } :
+        left: pos.left + pos.width / 2 - actualWidth / 2
-        /* placement == 'right' */ { top: pos.top + pos.height / 2 - actualHeight / 2, left: pos.left + pos.width }
+      } :
+      placement == 'top' ? {
+        top: pos.top - actualHeight,
+        left: pos.left + pos.width / 2 - actualWidth / 2
+      } :
+      placement == 'left' ? {
+        top: pos.top + pos.height / 2 - actualHeight / 2,
+        left: pos.left - actualWidth
+      } :
+      /* placement == 'right' */
+      {
+        top: pos.top + pos.height / 2 - actualHeight / 2,
+        left: pos.left + pos.width
+      }
 
   }
 
   Tooltip.prototype.getViewportAdjustedDelta = function(placement, pos, actualWidth, actualHeight) {
-    var delta = { top: 0, left: 0 }
+    var delta = {
+      top: 0,
+      left: 0
+    }
     if (!this.$viewport) return delta
 
     var viewportPadding = this.options.viewport && this.options.viewport.padding || 0
@@ -1658,8 +1732,8 @@ if (typeof jQuery === 'undefined') {
     var $e = this.$element
     var o = this.options
 
-    title = $e.attr('data-original-title')
+    title = $e.attr('data-original-title') ||
-      || (typeof o.title == 'function' ? o.title.call($e[0]) :  o.title)
+      (typeof o.title == 'function' ? o.title.call($e[0]) : o.title)
 
     return title
   }
@@ -1770,7 +1844,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // POPOVER PUBLIC CLASS DEFINITION
@@ -1828,8 +1903,8 @@ if (typeof jQuery === 'undefined') {
     var $e = this.$element
     var o = this.options
 
-    return $e.attr('data-content')
+    return $e.attr('data-content') ||
-      || (typeof o.content == 'function' ?
+      (typeof o.content == 'function' ?
         o.content.call($e[0]) :
         o.content)
   }
@@ -1879,7 +1954,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // SCROLLSPY CLASS DEFINITION
@@ -1931,12 +2007,15 @@ if (typeof jQuery === 'undefined') {
         var href = $el.data('target') || $el.attr('href')
         var $href = /^#./.test(href) && $(href)
 
-        return ($href
+        return ($href &&
-          && $href.length
+          $href.length &&
-          && $href.is(':visible')
+          $href.is(':visible') && [
-          && [[$href[offsetMethod]().top + offsetBase, href]]) || null
+            [$href[offsetMethod]().top + offsetBase, href]
+          ]) || null
+      })
+      .sort(function(a, b) {
+        return a[0] - b[0]
       })
-      .sort(function (a, b) { return a[0] - b[0] })
       .each(function() {
         that.offsets.push(this[0])
         that.targets.push(this[1])
@@ -1966,10 +2045,10 @@ if (typeof jQuery === 'undefined') {
     }
 
     for (i = offsets.length; i--;) {
-      activeTarget != targets[i]
+      activeTarget != targets[i] &&
-        && scrollTop >= offsets[i]
+        scrollTop >= offsets[i] &&
-        && (offsets[i + 1] === undefined || scrollTop < offsets[i + 1])
+        (offsets[i + 1] === undefined || scrollTop < offsets[i + 1]) &&
-        && this.activate(targets[i])
+        this.activate(targets[i])
     }
   }
 
@@ -2052,7 +2131,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // TAB CLASS DEFINITION
@@ -2110,9 +2190,9 @@ if (typeof jQuery === 'undefined') {
 
   Tab.prototype.activate = function(element, container, callback) {
     var $active = container.find('> .active')
-    var transition = callback
+    var transition = callback &&
-      && $.support.transition
+      $.support.transition &&
-      && ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
+      ($active.length && $active.hasClass('fade') || !!container.find('> .fade').length)
 
     function next() {
       $active
@@ -2208,7 +2288,8 @@ if (typeof jQuery === 'undefined') {
  * ======================================================================== */
 
 
-+function ($) {
++
+function($) {
   'use strict';
 
   // AFFIX CLASS DEFINITION

index.html

@@ -56,8 +56,22 @@
 </head>
 
 <body>
+  <!--<script>
+    document.addEventListener("keydown", function(e) {
+      if (e.which === 123) {
+        require('remote').getCurrentWindow().toggleDevTools();
+      } else if (e.which === 116) {
+        location.reload();
+      }
+    });
+  </script>-->
+
   <script>
-      var loading_screen = pleaseWait({logo: "assets/images/logo.png", backgroundColor: '#000000', loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Starting the node and loading app, please wait...</div>"});
+    var loading_screen = pleaseWait({
+      logo: "assets/images/logo.png",
+      backgroundColor: '#000000',
+      loadingHtml: "<div class='spinner'><div class='bounce bounce1'></div><div class='bounce bounce2'></div><div class='bounce bounce3'></div></div><div class='loadingText'>Starting the node and loading app, please wait...</div>"
+    });
 
     $(document).on("onGethReady", function() {
       loading_screen.finish();

main.js

@@ -24,6 +24,7 @@ locker.lock().then(function () {
 
     // and load the index.html of the app.
     mainWindow.loadFile("index.html");
+    mainWindow.webContents.openDevTools()
     EthoGeth.startGeth();
 
     // Open the DevTools.