keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #2336 from stieben/move-div-pause

Browse source 
Move div#pause to view/default.php
This commit is contained in:
Tobias Diekershoff 2016-02-11 07:36:37 +01:00
commit c5f2157eb2
5 changed files with 12 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
index.php
View file

@ -407,15 +407,6 @@ if(x($_SESSION,'sysmsg_info')) {
call_hooks('page_end', $a->page['content']); 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 * Add the navigation (menu) template

5
view/default.php
View file

@ -8,11 +8,12 @@
<body> <body>
<?php if(x($page,'nav')) echo $page['nav']; ?> <?php if(x($page,'nav')) echo $page['nav']; ?>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <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> <div id="page-footer"></div>
</section> </section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>
<footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer> <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>
</body> </body>
</html> </html>

5
view/theme/frost-mobile/default.php
View file

@ -28,7 +28,9 @@
<!-- <div class='main-content-container'>--> <!-- <div class='main-content-container'>-->
<div class='section-wrapper'> <div class='section-wrapper'>
<?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?> <?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> <div id="page-footer"></div>
</section> </section>
</div> </div>
@ -41,4 +43,3 @@
<?php if(x($page,'end')) echo $page['end']; ?> <?php if(x($page,'end')) echo $page['end']; ?>
</body> </body>
</html> </html>

5
view/theme/frost/default.php
View file

@ -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-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->
<div class='main-content-container'> <div class='main-content-container'>
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <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> <div id="page-footer"></div>
</section> </section>
<right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside> <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']; ?> <?php if(x($page,'end')) echo $page['end']; ?>
</body> </body>
</html> </html>

5
view/theme/smoothly/default.php
View file

@ -19,7 +19,9 @@
<aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside> <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> <div id="page-footer"></div>
</section> </section>
@ -41,4 +43,3 @@
<?php if (x($page, 'bottom')) echo $page['bottom']; ?> <?php if (x($page, 'bottom')) echo $page['bottom']; ?>
</body> </body>
</html> </html>