From 03f7beb728c87e492c7f7c3bc64eb36e0a7abf43 Mon Sep 17 00:00:00 2001
From: Mo Bitar <me@bitar.io>
Date: Tue, 31 Oct 2017 18:59:24 -0500
Subject: [PATCH] Extension style updates

---
 .../javascripts/app/services/extensionManager.js       | 10 +++++++---
 app/assets/stylesheets/app/_extensions.scss            |  5 ++++-
 .../directives/global-extensions-menu.html.haml        | 10 +++++-----
 3 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/app/assets/javascripts/app/services/extensionManager.js b/app/assets/javascripts/app/services/extensionManager.js
index 4c9613815..7d4d6c635 100644
--- a/app/assets/javascripts/app/services/extensionManager.js
+++ b/app/assets/javascripts/app/services/extensionManager.js
@@ -115,9 +115,13 @@ class ExtensionManager {
       extension.supported_types = response.supported_types;
     }
 
-    extension.actions = response.actions.map(function(action){
-      return new Action(action);
-    })
+    if(response.actions) {
+      extension.actions = response.actions.map(function(action){
+        return new Action(action);
+      })
+    } else {
+      extension.actions = [];
+    }
   }
 
   refreshExtensionsFromServer() {
diff --git a/app/assets/stylesheets/app/_extensions.scss b/app/assets/stylesheets/app/_extensions.scss
index 65984cf1b..71edefcdb 100644
--- a/app/assets/stylesheets/app/_extensions.scss
+++ b/app/assets/stylesheets/app/_extensions.scss
@@ -67,12 +67,15 @@
     border-radius: 2px;
   }
 
+  .header {
+    padding-bottom: 12px;
+  }
+
   ul {
     border-top: 1px solid $light-bg-color;
     border-bottom: 1px solid $light-bg-color;
     margin: 0;
     padding: 0;
-    margin-top: 12px;
 
     li {
       cursor: pointer;
diff --git a/app/assets/templates/frontend/directives/global-extensions-menu.html.haml b/app/assets/templates/frontend/directives/global-extensions-menu.html.haml
index ed62a2628..3a55fab07 100644
--- a/app/assets/templates/frontend/directives/global-extensions-menu.html.haml
+++ b/app/assets/templates/frontend/directives/global-extensions-menu.html.haml
@@ -16,7 +16,7 @@
               %h3 Learn More
 
     %div{"ng-if" => "themeManager.themes.length > 0"}
-      .container.no-bottom.section-margin
+      .header.container.section-margin
         %h2 Themes
       %ul
         %li{"ng-repeat" => "theme in themeManager.themes | orderBy: 'name'", "ng-click" => "clickedExtension(theme)"}
@@ -35,7 +35,7 @@
                   {{theme.url}}
 
     %div{"ng-if" => "editorManager.externalEditors.length > 0"}
-      .container.no-bottom.section-margin
+      .header.container.section-margin
         %h2 Editors
         %p{"style" => "margin-top: 3px;"} Choose "Editor" in the note menu to use an editor for a specific note.
       %ul
@@ -55,7 +55,7 @@
               .wrap.mt-5.selectable{"ng-if" => "editor.showUrl"} {{editor.url}}
 
     %div{"ng-if" => "extensionManager.extensions.length"}
-      .container.no-bottom.section-margin
+      .header.container.section-margin
         %h2 Actions
         %p{"style" => "margin-top: 3px;"} Choose "Actions" in the note editor to use installed actions.
 
@@ -110,7 +110,7 @@
               %a.block.mt-5{"ng-click" => "deleteActionExtension(extension); $event.stopPropagation();"} Delete
 
     %div{"ng-if" => "componentManager.components.length > 0"}
-      .container.no-bottom.section-margin
+      .header.container.section-margin
         %h2 Components
       %ul
         %li{"ng-repeat" => "component in componentManager.components | orderBy: 'name'", "ng-click" => "clickedExtension(component)"}
@@ -130,7 +130,7 @@
                   {{component.url}}
 
     %div{"ng-if" => "serverExtensions.length > 0"}
-      .container.no-bottom.section-margin
+      .header.container.section-margin
         %h2 Server Extensions
       %ul
         %li{"ng-repeat" => "ext in serverExtensions", "ng-click" => "ext.showDetails = !ext.showDetails"}