From 4d7a6aaed240aa04e969aa33e6fd6ed6b6cb6bc8 Mon Sep 17 00:00:00 2001
From: Andrej Stieben <e-mail@stieben.de>
Date: Tue, 9 Feb 2016 15:54:35 +0100
Subject: [PATCH 1/2] Moved div#pause from index.php to view/default.php
This closes #2320.
---
index.php | 9 ---------
view/default.php | 5 +++--
2 files changed, 3 insertions(+), 11 deletions(-)
diff --git a/index.php b/index.php
index 2b1053cc1..ca93eb61e 100644
--- a/index.php
+++ b/index.php
@@ -416,15 +416,6 @@ if(x($_SESSION,'sysmsg_info')) {
call_hooks('page_end', $a->page['content']);
-/**
- *
- * Add a place for the pause/resume Ajax indicator
- *
- */
-
-$a->page['content'] .= '<div id="pause"></div>';
-
-
/**
*
* Add the navigation (menu) template
diff --git a/view/default.php b/view/default.php
index 78ca97ac9..121d5212c 100644
--- a/view/default.php
+++ b/view/default.php
@@ -8,11 +8,12 @@
<body>
<?php if(x($page,'nav')) echo $page['nav']; ?>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <section>
+ <?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div>
</section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body>
</html>
-
From e104c5819123cc9e836e8c6bd5f253bc87da341d Mon Sep 17 00:00:00 2001
From: Andrej Stieben <e-mail@stieben.de>
Date: Tue, 9 Feb 2016 16:41:19 +0100
Subject: [PATCH 2/2] Added div#pause to themes' default.php
As requested by @tobiasd and @rabuzarus.
---
view/theme/frost-mobile/default.php | 5 +++--
view/theme/frost/default.php | 5 +++--
view/theme/smoothly/default.php | 5 +++--
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php
index ad464760f..3a424ad5f 100644
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -28,7 +28,9 @@
<!-- <div class='main-content-container'>-->
<div class='section-wrapper'>
<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>
- <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <section>
+ <?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div>
</section>
</div>
@@ -41,4 +43,3 @@
<?php if(x($page,'end')) echo $page['end']; ?>
</body>
</html>
-
diff --git a/view/theme/frost/default.php b/view/theme/frost/default.php
index 95a9b1e8c..c379955f7 100644
--- a/view/theme/frost/default.php
+++ b/view/theme/frost/default.php
@@ -28,7 +28,9 @@
<!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
<div class='main-content-container'>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <section>
+ <?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div>
</section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
@@ -39,4 +41,3 @@
<?php if(x($page,'end')) echo $page['end']; ?>
</body>
</html>
-
diff --git a/view/theme/smoothly/default.php b/view/theme/smoothly/default.php
index 9ac49820a..405e1cad3 100644
--- a/view/theme/smoothly/default.php
+++ b/view/theme/smoothly/default.php
@@ -19,7 +19,9 @@
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>
- <section><?php if(x($page,'content')) echo $page['content']; ?>
+ <section>
+ <?php if(x($page,'content')) echo $page['content']; ?>
+ <div id="pause"></div> <!-- The pause/resume Ajax indicator -->
<div id="page-footer"></div>
</section>
@@ -41,4 +43,3 @@
<?php if (x($page, 'bottom')) echo $page['bottom']; ?>
</body>
</html>
-