]> git.mxchange.org Git - friendica.git/blobdiff - view/theme/frost/default.php
Merge https://github.com/friendica/friendica into pull
[friendica.git] / view / theme / frost / default.php
index 9f764c73ef06e0eb78889093042c79c8b5672777..95a9b1e8c7b7403e4adc1362f1c9101811c94e61 100644 (file)
@@ -5,33 +5,32 @@
   <script>var baseurl="<?php echo $a->get_baseurl() ?>";</script>\r
   <?php if(x($page,'htmlhead')) echo $page['htmlhead'] ?>\r
 </head>\r
-<body>\r
+<body <?php if($a->module === 'home') echo 'onLoad="setTimeout(\'homeRedirect()\', 1500)"'?>>\r
+       <?php if(x($page,'nav')) echo $page['nav']; ?>\r
+\r
        <?php if( $a->module === 'home' ) { ?>\r
        <center>\r
        <div class="login-button">\r
-       <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendika-1600.png" title="Click to log in"></a>\r
+       <a href="login" class="login-button-link"><img class="login-button-image" src="/images/friendica-1600.png" title="Click to log in"></a>\r
        </div>\r
        </center>\r
+\r
        <?php } elseif ( $a->module === 'login' || $a->module === 'register' || $a->module === 'lostpass' ) {\r
        ?>\r
-\r
        <div class='section-wrapper'>\r
        <section><?php if(x($page,'content')) echo $page['content']; ?>\r
        </section>\r
        </div>\r
+       <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
 \r
-       <?php } else {\r
-\r
-       if(x($page,'nav')) echo $page['nav']; ?>\r
+       <?php } else { ?>\r
        <div class='main-container'>\r
                <!--<div class='main-content-loading'><img src="/view/theme/frost/images/ajax-loader.gif" alt="Please wait..."></div>-->\r
                <div class='main-content-container'>\r
                <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
-               <div class='section-wrapper'>\r
                <section><?php if(x($page,'content')) echo $page['content']; ?>\r
                        <div id="page-footer"></div>\r
                </section>\r
-               </div>\r
                <right_aside><?php if(x($page,'right_aside')) echo $page['right_aside']; ?></right_aside>\r
                <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
                </div>\r