mirror of
https://github.com/friendica/friendica
synced 2024-11-08 11:42:23 +01:00
Merge pull request #2336 from stieben/move-div-pause
Move div#pause to view/default.php
This commit is contained in:
commit
c5f2157eb2
|
@ -407,15 +407,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
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
|
@ -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>
|
||||
|
||||
|
|
Loading…
Reference in a new issue