From 24a0856d22b71d94f1cc43e4c2f6ae77bc64ac98 Mon Sep 17 00:00:00 2001
From: azivner <adam.zivner@gmail.com>
Date: Wed, 14 Nov 2018 11:24:40 +0100
Subject: [PATCH] open external link button moved inside input

---
 src/public/javascripts/services/attributes.js | 22 ++++++++-----------
 src/public/stylesheets/style.css              |  9 +++++++-
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/public/javascripts/services/attributes.js b/src/public/javascripts/services/attributes.js
index 3f9c6628b..366c638d4 100644
--- a/src/public/javascripts/services/attributes.js
+++ b/src/public/javascripts/services/attributes.js
@@ -171,22 +171,18 @@ async function createPromotedAttributeRow(definitionAttr, valueAttr) {
         }
         else if (definition.labelType === 'date') {
             $input.prop("type", "date");
-
-            const $todayButton = $("<button>").addClass("btn btn-sm").text("Today").click(() => {
-                $input.val(utils.formatDateISO(new Date()));
-                $input.trigger("change");
-            });
-
-            $actionCell.append($todayButton);
         }
         else if (definition.labelType === 'url') {
             $input.prop("placeholder", "http://website...");
 
-            const $openButton = $("<button>").addClass("btn btn-sm").text("Open").click(() => {
-                window.open($input.val(), '_blank');
-            });
+            const $openButton = $("<span>")
+                .addClass("input-group-text open-external-link-button jam jam-arrow-up-right")
+                .prop("title", "Open external link")
+                .click(() => window.open($input.val(), '_blank'));
 
-            $actionCell.append($openButton);
+            $input.after($("<div>")
+                .addClass("input-group-append")
+                .append($openButton));
         }
         else {
             messagingService.logError("Unknown labelType=" + definitionAttr.labelType);
@@ -229,7 +225,7 @@ async function createPromotedAttributeRow(definitionAttr, valueAttr) {
             });
 
         const removeButton = $("<span>")
-            .addClass("jam jam-trash pointer")
+            .addClass("jam jam-trash-alt pointer")
             .prop("title", "Remove this attribute")
             .click(async () => {
                 if (valueAttr.attributeId) {
@@ -239,7 +235,7 @@ async function createPromotedAttributeRow(definitionAttr, valueAttr) {
                 $tr.remove();
             });
 
-        $multiplicityCell.append(addButton).append(" &nbsp; ").append(removeButton);
+        $multiplicityCell.append(addButton).append(" &nbsp;").append(removeButton);
     }
 
     return $tr;
diff --git a/src/public/stylesheets/style.css b/src/public/stylesheets/style.css
index 8938c8853..652914dbf 100644
--- a/src/public/stylesheets/style.css
+++ b/src/public/stylesheets/style.css
@@ -467,6 +467,13 @@ html.theme-dark body {
     padding-right: 5px;
 }
 
+.open-external-link-button {
+    cursor: pointer;
+    font-size: 1.3em;
+    padding-left: 5px;
+    padding-right: 5px;
+}
+
 .go-to-selected-note-button {
     cursor: pointer;
     font-size: 1.3em;
@@ -585,7 +592,7 @@ table.promoted-attributes-in-tooltip td, table.promoted-attributes-in-tooltip th
 }
 
 .multiplicity {
-    font-size: larger;
+    font-size: 1.3em;
 }
 
 /* this is because bootstrap (?) sets code color to red for some reason */