diff --git a/public/js/grocy.js b/public/js/grocy.js index 637e5503..f9319198 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -601,3 +601,27 @@ $(window).on("message", function(e) bootbox.hideAll(); } }); + +$(document).on("click", ".show-as-dialog-link", function(e) +{ + e.preventDefault(); + + var link = $(e.currentTarget).attr("href"); + + bootbox.dialog({ + message: '', + size: 'large', + backdrop: true, + closeButton: false, + buttons: { + ok: { + label: __t('OK'), + className: 'btn-success responsive-button', + callback: function() + { + bootbox.hideAll(); + } + } + } + }); +}); diff --git a/public/viewjs/components/batterycard.js b/public/viewjs/components/batterycard.js index 3829bcba..ab180ff0 100644 --- a/public/viewjs/components/batterycard.js +++ b/public/viewjs/components/batterycard.js @@ -12,7 +12,7 @@ Grocy.Components.BatteryCard.Refresh = function(batteryId) $('#batterycard-battery-charge-cycles-count').text((batteryDetails.charge_cycles_count || '0')); $('#batterycard-battery-edit-button').attr("href", U("/battery/" + batteryDetails.battery.id.toString())); - $('#batterycard-battery-journal-button').attr("href", U("/batteriesjournal?battery=" + batteryDetails.battery.id.toString())); + $('#batterycard-battery-journal-button').attr("href", U("/batteriesjournal?embedded&battery=" + batteryDetails.battery.id.toString())); $('#batterycard-battery-edit-button').removeClass("disabled"); $('#batterycard-battery-journal-button').removeClass("disabled"); diff --git a/public/viewjs/components/chorecard.js b/public/viewjs/components/chorecard.js index 1e22c816..f0bb4b5b 100644 --- a/public/viewjs/components/chorecard.js +++ b/public/viewjs/components/chorecard.js @@ -12,7 +12,7 @@ Grocy.Components.ChoreCard.Refresh = function(choreId) $('#chorecard-chore-last-done-by').text((choreDetails.last_done_by.display_name || __t('Unknown'))); $('#chorecard-chore-edit-button').attr("href", U("/chore/" + choreDetails.chore.id.toString())); - $('#chorecard-chore-journal-button').attr("href", U("/choresjournal?chore=" + choreDetails.chore.id.toString())); + $('#chorecard-chore-journal-button').attr("href", U("/choresjournal?embedded&chore=" + choreDetails.chore.id.toString())); $('#chorecard-chore-edit-button').removeClass("disabled"); $('#chorecard-chore-journal-button').removeClass("disabled"); diff --git a/public/viewjs/components/productcard.js b/public/viewjs/components/productcard.js index 9033cd96..f181127f 100644 --- a/public/viewjs/components/productcard.js +++ b/public/viewjs/components/productcard.js @@ -71,7 +71,7 @@ Grocy.Components.ProductCard.Refresh = function(productId) } $('#productcard-product-edit-button').attr("href", U("/product/" + productDetails.product.id.toString() + '?' + 'returnto=' + encodeURIComponent(Grocy.CurrentUrlRelative))); - $('#productcard-product-journal-button').attr("href", U("/stockjournal?product=" + productDetails.product.id.toString())); + $('#productcard-product-journal-button').attr("href", U("/stockjournal?embedded&product=" + productDetails.product.id.toString())); $('#productcard-product-edit-button').removeClass("disabled"); $('#productcard-product-journal-button').removeClass("disabled"); diff --git a/views/components/batterycard.blade.php b/views/components/batterycard.blade.php index 8786fd25..5ebb5aa6 100644 --- a/views/components/batterycard.blade.php +++ b/views/components/batterycard.blade.php @@ -8,7 +8,7 @@ - + diff --git a/views/components/chorecard.blade.php b/views/components/chorecard.blade.php index e450b8d4..482f25b4 100644 --- a/views/components/chorecard.blade.php +++ b/views/components/chorecard.blade.php @@ -8,7 +8,7 @@ - + diff --git a/views/components/productcard.blade.php b/views/components/productcard.blade.php index a37855ba..d4605d4f 100644 --- a/views/components/productcard.blade.php +++ b/views/components/productcard.blade.php @@ -9,7 +9,7 @@ - +