summaryrefslogtreecommitdiff
path: root/ishtar_common/static
diff options
context:
space:
mode:
Diffstat (limited to 'ishtar_common/static')
-rw-r--r--ishtar_common/static/js/ishtar.js9
-rw-r--r--ishtar_common/static/media/styles.css8
2 files changed, 16 insertions, 1 deletions
diff --git a/ishtar_common/static/js/ishtar.js b/ishtar_common/static/js/ishtar.js
index dfe59105c..e89be9ff3 100644
--- a/ishtar_common/static/js/ishtar.js
+++ b/ishtar_common/static/js/ishtar.js
@@ -272,7 +272,14 @@ function load_window(url, speed, on_success){
$("#progress").hide();
$(".previous_page").remove();
$(".next_page").remove();
- $("#window").append(html);
+ var register_id = $(html).find(".card-header").attr("data-sheet-id");
+ var current_sheet = $('[data-sheet-id="' + register_id + '"]');
+ if (current_sheet.length){
+ $(".collapse").removeClass('show');
+ current_sheet.parent().find('.collapse').addClass('show');
+ } else {
+ $("#window").append(html);
+ }
$("#"+last_window).show();
if (on_success) on_success();
},
diff --git a/ishtar_common/static/media/styles.css b/ishtar_common/static/media/styles.css
index ed6900fd0..773554b95 100644
--- a/ishtar_common/static/media/styles.css
+++ b/ishtar_common/static/media/styles.css
@@ -95,6 +95,14 @@ div#foot{
margin-bottom: 1em;
}
+.table-modal-lg .current-sheets{
+ margin-bottom: 1em;
+}
+
+.dataTables_wrapper .dataTables_processing{
+ height: auto;
+}
+
.display_details{
font-size: 1.4em;
}