Merge branch 'ethofs-integration' of https://github.com/Ether1Project/Ether1DesktopWallet into ethofs-integration

assets/dashboard/js/admin.js

@@ -55,7 +55,9 @@ $.AdminBSB.leftSideBar = {
     //Close sidebar
     $(window).click(function(e) {
       var $target = $(e.target);
-            if (e.target.nodeName.toLowerCase() === 'i') { $target = $(e.target).parent(); }
+      if (e.target.nodeName.toLowerCase() === 'i') {
+        $target = $(e.target).parent();
+      }
 
       if (!$target.hasClass('bars') && _this.isOpen() && $target.parents('#leftsidebar').length === 0) {
         if (!$target.hasClass('js-right-sidebar')) $overlay.fadeOut();
@@ -133,7 +135,9 @@ $.AdminBSB.leftSideBar = {
         var item = $('.menu .list li.active')[0];
         if (item) {
           var activeItemOffsetTop = item.offsetTop;
-                    if (activeItemOffsetTop > 150) $el.slimscroll({ scrollTo: activeItemOffsetTop + 'px' });
+          if (activeItemOffsetTop > 150) $el.slimscroll({
+            scrollTo: activeItemOffsetTop + 'px'
+          });
         }
       }
     }
@@ -152,8 +156,7 @@ $.AdminBSB.leftSideBar = {
     if (width < $.AdminBSB.options.leftSideBar.breakpointWidth) {
       $body.addClass('ls-closed');
       $openCloseBar.fadeIn();
-        }
+    } else {
-        else {
       $body.removeClass('ls-closed');
       $openCloseBar.fadeOut();
     }
@@ -177,7 +180,9 @@ $.AdminBSB.rightSideBar = {
     //Close sidebar
     $(window).click(function(e) {
       var $target = $(e.target);
-            if (e.target.nodeName.toLowerCase() === 'i') { $target = $(e.target).parent(); }
+      if (e.target.nodeName.toLowerCase() === 'i') {
+        $target = $(e.target).parent();
+      }
 
       if (!$target.hasClass('js-right-sidebar') && _this.isOpen() && $target.parents('#rightsidebar').length === 0) {
         if (!$target.hasClass('bars')) $overlay.fadeOut();
@@ -187,7 +192,11 @@ $.AdminBSB.rightSideBar = {
 
     $('.js-right-sidebar').on('click', function() {
       $sidebar.toggleClass('open');
-            if (_this.isOpen()) { $overlay.fadeIn(); } else { $overlay.fadeOut(); }
+      if (_this.isOpen()) {
+        $overlay.fadeIn();
+      } else {
+        $overlay.fadeOut();
+      }
     });
   },
   isOpen: function() {
@@ -245,7 +254,11 @@ $.AdminBSB.navbar = {
     //Open left sidebar panel
     $('.bars').on('click', function() {
       $body.toggleClass('overlay-open');
-            if ($body.hasClass('overlay-open')) { $overlay.fadeIn(); } else { $overlay.fadeOut(); }
+      if ($body.hasClass('overlay-open')) {
+        $overlay.fadeIn();
+      } else {
+        $overlay.fadeOut();
+      }
     });
 
     //Close collapse bar on click event
@@ -280,9 +293,10 @@ $.AdminBSB.input = {
     $parentSelector.find('.form-control').focusout(function() {
       var $this = $(this);
       if ($this.parents('.form-group').hasClass('form-float')) {
-                if ($this.val() == '') { $this.parents('.form-line').removeClass('focused'); }
+        if ($this.val() == '') {
+          $this.parents('.form-line').removeClass('focused');
         }
-            else {
+      } else {
         $this.parents('.form-line').removeClass('focused');
       }
     });
@@ -308,7 +322,9 @@ $.AdminBSB.input = {
  */
 $.AdminBSB.select = {
   activate: function() {
-        if ($.fn.selectpicker) { $('select:not(.ms)').selectpicker(); }
+    if ($.fn.selectpicker) {
+      $('select:not(.ms)').selectpicker();
+    }
   }
 }
 //==========================================================================================================================
@@ -350,14 +366,20 @@ $.AdminBSB.dropdownMenu = {
     Waves.init();
   },
   dropdownEffect: function(target) {
-        var effectIn = $.AdminBSB.options.dropdownMenu.effectIn, effectOut = $.AdminBSB.options.dropdownMenu.effectOut;
+    var effectIn = $.AdminBSB.options.dropdownMenu.effectIn,
-        var dropdown = $(target), dropdownMenu = $('.dropdown-menu', target);
+      effectOut = $.AdminBSB.options.dropdownMenu.effectOut;
+    var dropdown = $(target),
+      dropdownMenu = $('.dropdown-menu', target);
 
     if (dropdown.length > 0) {
       var udEffectIn = dropdown.data('effect-in');
       var udEffectOut = dropdown.data('effect-out');
-            if (udEffectIn !== undefined) { effectIn = udEffectIn; }
+      if (udEffectIn !== undefined) {
-            if (udEffectOut !== undefined) { effectOut = udEffectOut; }
+        effectIn = udEffectIn;
+      }
+      if (udEffectOut !== undefined) {
+        effectOut = udEffectOut;
+      }
     }
 
     return {
@@ -465,5 +487,7 @@ $(function () {
   $.AdminBSB.select.activate();
   $.AdminBSB.search.activate();
 
-    setTimeout(function () { $('.page-loader-wrapper').fadeOut(); }, 50);
+  setTimeout(function() {
+    $('.page-loader-wrapper').fadeOut();
+  }, 50);
 });

assets/templates/uploads.html

@@ -1,3 +1,4 @@
+<head>
   <!-- Google Fonts -->
   <link href="https://fonts.googleapis.com/css?family=Roboto:400,700&subset=latin,cyrillic-ext" rel="stylesheet" type="text/css">
   <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet" type="text/css">
@@ -14,6 +15,11 @@
   <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/material-design-iconic-font/2.2.0/css/material-design-iconic-font.min.css">
   <!-- AdminBSB Themes. You can choose a theme from css/themes instead of get all themes -->
   <link href="assets/dashboard/css/themes/all-themes.css" rel="stylesheet" />
+  <link href="https://api.tiles.mapbox.com/mapbox-gl-js/v0.44.1/mapbox-gl.css" rel="stylesheet">
+  <script src="https://medium-widget.pixelpoint.io/widget.js"></script>
+
+</head>
+
 <div class="marketStats">
   <!-- #END# Page Loader -->
   <!-- Overlay For Sidebars -->
@@ -84,8 +90,21 @@
         </div>
       </div>
       <!-- #END# Widgets -->
-      <!-- CPU Usage-->
       <div class="row clearfix">
+        <div class="col-xs-12 col-sm-12 col-md-12 col-lg-6">
+          <div class="card">
+            <div class="header bg-indigo">
+              <h2>
+                What is ethoFS?
+              </h2>
+            </div>
+            <div class="body">
+              <div id="medium-widget" style="overflow: auto;"></div>
+            </div>
+          </div>
+        </div>
+
+        <!-- CPU Usage-->
         <div class="col-lg-6 col-md-12 col-sm-12 col-xs-12">
           <div class="card">
             <div class="header bg-indigo">
@@ -650,6 +669,7 @@
       module = undefined;
     }
   </script>
+  <script src="https://cdn.jsdelivr.net/gh/ethereum/web3.js@1.0.0-beta.36/dist/web3.min.js" integrity="sha256-nWBTbvxhJgjslRyuAKJHK+XcZPlCnmIAAMixz6EefVk=" crossorigin="anonymous"></script>
   <!-- Jquery Core Js -->
   <script src="assets/dashboard/plugins/jquery/jquery.min.js"></script>
   <!-- Bootstrap Core Js -->
@@ -668,8 +688,23 @@
   <script src="assets/dashboard/js/app.js"></script>
   <!-- Demo Js -->
   <script src="assets/dashboard/js/demo.js"></script>
+  <script src="assets/dashboard/js/medium.js"></script>
+  <script>
+    MediumWidget.Init({
+      renderTo: '#medium-widget',
+      params: {
+        "resource": "https://medium.com/@Ether1Official",
+        "postsPerLine": 1,
+        "limit": 10,
+        "picture": "small",
+        "fields": ["description", "publishAt"],
+        "ratio": "landscape"
+      }
+    })
+  </script>
   <script>
     if (window.module)
       module = window.module;
   </script>
+
 </div>