From d4dbbf4817ef85f6bd814b019959a004c0b6e31b Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Fri, 20 Jul 2018 15:14:30 -0400
Subject: [PATCH] Fix lightbox problems with myresearch list editting. Improve
translation.
---
themes/bootstrap3/templates/confirm/confirm.phtml | 7 ++-----
themes/bootstrap3/templates/myresearch/edit.phtml | 2 +-
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/themes/bootstrap3/templates/confirm/confirm.phtml b/themes/bootstrap3/templates/confirm/confirm.phtml
index 497c90fe81a..9967bfbd165 100644
--- a/themes/bootstrap3/templates/confirm/confirm.phtml
+++ b/themes/bootstrap3/templates/confirm/confirm.phtml
@@ -5,7 +5,7 @@
<?=$this->flashmessages();?>
<div id="popupDetails" class="confirmDialog">
- <form class="pull-left flip" action="<?=$this->escapeHtmlAttr($this->confirm)?>" method="post">
+ <form action="<?=$this->escapeHtmlAttr($this->confirm)?>" method="post">
<?php if (isset($this->extras)): ?>
<?php foreach ($this->extras as $extra => $value): ?>
<?php if (is_array($value)): ?>
@@ -18,10 +18,7 @@
<?php endforeach; ?>
<?php endif;?>
<input class="btn btn-primary" type="submit" name="confirm" value="<?=$this->transEsc('confirm_dialog_yes') ?>" />
+ <input class="btn btn-default" type="button" name="cancel" value="<?=$this->transEsc('confirm_dialog_no') ?>" onClick="VuFind.lightbox.close()" />
</form>
- <form action="<?=$this->escapeHtmlAttr($this->cancel) ?>" method="post">
- <input class="btn btn-default" type="submit" name="cancel" value="<?=$this->transEsc('confirm_dialog_no') ?>" />
- </form>
- <div class="clearer"></div>
</div>
</div>
diff --git a/themes/bootstrap3/templates/myresearch/edit.phtml b/themes/bootstrap3/templates/myresearch/edit.phtml
index a1ff334e21c..dd5fb3e8e4a 100644
--- a/themes/bootstrap3/templates/myresearch/edit.phtml
+++ b/themes/bootstrap3/templates/myresearch/edit.phtml
@@ -35,7 +35,7 @@
<textarea class="form-control" id="edit_notes<?=$current['listId'] ?>" name="notes<?=$current['listId'] ?>" rows="3"><?=$this->escapeHtml($current['notes'])?></textarea>
</div>
<a href="<?=$this->url('userList', ['id' => $current['listId']]) ?>?delete=<?=urlencode($this->driver->getUniqueId())?>&source=<?=urlencode($this->driver->getSourceIdentifier())?>" id="<?=$this->escapeHtmlAttr($this->driver->getUniqueId())?>delete<?=$current['listId'] ?>" data-lightbox>
- <i class="fa fa-trash"></i> <?=$this->transEsc('delete') /* TODO: replace with better string */ ?>
+ <i class="fa fa-trash"></i> <?=$this->transEsc('Delete') ?>
</a>
</fieldset>
<?php endforeach; ?>
--
GitLab