Adjusted to use same styles, removed extra parts of code

NatLibFi · Oct 15, 2024 · d5889d2 · d5889d2
1 parent 81f48f3
commit d5889d2
Show file tree

Hide file tree

Showing 8 changed files with 58 additions and 102 deletions.
diff --git a/themes/finna2/js/finna-mylist.js b/themes/finna2/js/finna-mylist.js
@@ -298,45 +298,6 @@ finna.myList = (function finnaMyList() {
       $(".list-visibility input[type='radio']").off('change').on("change", function onChangeVisibility() {
         updateList({}, refreshLists, 'visibility');
       });
-
-      // delete list
-      var active = $('.mylist-bar').find('a.active');
-      active.find('.remove').off('click').on('click', function onClickRemove(e) {
-        var target = $(this);
-        var form = $('.delete-list');
-        var prompt = form.find('.dropdown-menu');
-
-        function repositionPrompt(ev, data) {
-          var pos = target.offset();
-          var left = data.w / 2 - prompt.width() / 2;
-
-          prompt.css({
-            'left': left,
-            'top': pos.top + 30
-          });
-        }
-
-        function initRepositionListener() {
-          $(window).on('throttled-resize.finna', repositionPrompt);
-        }
-
-        prompt.find('.confirm').off('click').on('click', function onClickConfirm(ev) {
-          form.submit();
-          ev.preventDefault();
-        });
-        prompt.find('.cancel').off('click').on('click', function onClickCancel(ev) {
-          $(window).off('throttled-resize.finna', repositionPrompt);
-          prompt.hide();
-          $('.remove-favorite-list').trigger("focus");
-          ev.preventDefault();
-        });
-
-        repositionPrompt({}, {w: $(window).width(), h: $(window).height()});
-        initRepositionListener();
-        prompt.show();
-        prompt.find('.confirm a').focus();
-        e.preventDefault();
-      });
     }
 
     $('.add-new-list .icon').on('click', function createNewList() {

diff --git a/themes/finna2/less/finna/mylist.less b/themes/finna2/less/finna/mylist.less
@@ -82,21 +82,6 @@
     > a:not(.add-new-list) {
       color: @text-color;
     }
-    .remove-favorite-list {
-      border: 0;
-      background-color: transparent;
-      padding: 1px;
-      &:focus {
-        border: 1px solid @action-link-color;
-        border-style: dotted;
-      }
-
-      .icon {
-        margin-right: 3px;
-        color: @action-link-color;
-        font-size: 1em;
-      }
-    }
     .favorite-list-holder {
       height: 25px;
 
@@ -556,3 +541,24 @@ span.caret {
     margin-top: 10px;
   }
 }
+
+.delete-list-btn-wrapper {
+  &.left .dropdown-menu {
+    left: initial;
+    right: 0;
+  }
+  .dropdown-header {
+    color: inherit;
+    font-size: 14px;
+  }
+}
+
+.dropdown-menu .delete-list-btn-wrapper {
+  padding: 0 0 4px 4px;
+  .dropdown-menu {
+    border: 1px solid @gray-lighter;
+    border-radius: 4px;
+    top: 100%;
+    position: absolute;
+  }
+}
diff --git a/themes/finna2/less/finna/reservationlist.less b/themes/finna2/less/finna/reservationlist.less
@@ -35,20 +35,6 @@
     }
   }
 }
-.reservation-list-delete-wrapper {
-  .dropdown-menu {
-    top: 100%;
-    left: -50%;
-  }
-  &.left .dropdown-menu {
-    left: initial;
-    right: 0;
-  }
-  .dropdown-header {
-    color: inherit;
-    font-size: 14px;
-  }
-}
 
 #ReservationListRequest.dynamic-form {
   textarea {

diff --git a/themes/finna2/scss/finna/mylist.scss b/themes/finna2/scss/finna/mylist.scss
@@ -82,21 +82,6 @@
     > a:not(.add-new-list) {
       color: $text-color;
     }
-    .remove-favorite-list {
-      border: 0;
-      background-color: transparent;
-      padding: 1px;
-      &:focus {
-        border: 1px solid $action-link-color;
-        border-style: dotted;
-      }
-
-      .icon {
-        margin-right: 3px;
-        color: $action-link-color;
-        font-size: 1em;
-      }
-    }
     .favorite-list-holder {
       height: 25px;
 
@@ -556,3 +541,24 @@ span.caret {
     margin-top: 10px;
   }
 }
+
+.delete-list-btn-wrapper {
+  &.left .dropdown-menu {
+    left: initial;
+    right: 0;
+  }
+  .dropdown-header {
+    color: inherit;
+    font-size: 14px;
+  }
+}
+
+.dropdown-menu .delete-list-btn-wrapper {
+  padding: 0 0 4px 4px;
+  .dropdown-menu {
+    border: 1px solid $gray-lighter;
+    border-radius: 4px;
+    top: 100%;
+    position: absolute;
+  }
+}
diff --git a/themes/finna2/scss/finna/reservationlist.scss b/themes/finna2/scss/finna/reservationlist.scss
@@ -35,20 +35,6 @@
     }
   }
 }
-.reservation-list-delete-wrapper {
-  .dropdown-menu {
-    top: 100%;
-    left: -50%;
-  }
-  &.left .dropdown-menu {
-    left: initial;
-    right: 0;
-  }
-  .dropdown-header {
-    color: inherit;
-    font-size: 14px;
-  }
-}
 
 #ReservationListRequest.dynamic-form {
   textarea {

diff --git a/themes/finna2/templates/myresearch/mylist-navi.phtml b/themes/finna2/templates/myresearch/mylist-navi.phtml
@@ -36,14 +36,25 @@
             <?=$this->icon('public') ?>
           <?php endif; ?>
           <div class="pull-right">(<?=$current['count']?>)</div>
-          <?php if ($active): ?>
-            <button class="pull-right remove-favorite-list remove"><?=$this->icon('list-remove') ?></button>
-          <?php endif; ?>
         </div>
       </a>
       <?php if ($active): ?>
         <?php $url = $this->url('list-page', ['lid' => $list->getId()], ['force_canonical' => true]) ?>
         <?= $this->partial('myresearch/list-visibility.phtml', ['listUrl' => $url, 'public' => $list->isPublic()]); ?>
+        <span class="delete-list-btn-wrapper">
+          <?=
+            $this->component(
+                'confirm-button',
+                [
+                  'buttonLink' => $this->url('myresearch-deletelist', [], ['query' => ['listID' => $list->getId()]]),
+                  'buttonLabel' => 'delete_list',
+                  'buttonClass' => 'btn btn-link',
+                  'confirmLink' => $this->url('myresearch-deletelist', [], ['query' => ['listID' => $list->getId(), 'confirm' => 1]]),
+                  'header' => 'confirm_delete_list_text',
+              ]
+            )
+          ?>
+        </span>
       <?php endif; ?>
     </li>
   <?php endforeach; ?>

diff --git a/themes/finna2/templates/reservationlist/displaylist.phtml b/themes/finna2/templates/reservationlist/displaylist.phtml
@@ -62,7 +62,7 @@
         <!-- Add order buttons if the list has not been ordered yet. -->
         <a href="<?=$this->escapeHtmlAttr($this->url('reservationlist-placeorder', ['id' => $this->list->getId()]))?>" class="btn btn-primary" data-lightbox><?=$this->transEsc('ReservationList::Order List')?></a>
       <?php endif; ?>
-      <span class="reservation-list-delete-wrapper">
+      <span class="delete-list-btn-wrapper">
         <?=
           $this->component(
               'confirm-button',

diff --git a/themes/finna2/templates/reservationlist/displaylists.phtml b/themes/finna2/templates/reservationlist/displaylists.phtml
@@ -26,7 +26,7 @@
             <a href="<?= $this->url('reservationlist-displaylist', ['id' => $list->getId()])?>"><?= $this->escapeHtml($list->getTitle()) ?></a>
           </div>
           <div class="pull-right">
-            <span class="reservation-list-delete-wrapper left">
+            <span class="delete-list-btn-wrapper left">
               <?=
               $this->component(
                   'confirm-button',