Merge pull request #2544 from annando/issue-1769

[friendica.git] / view / theme / frost-mobile / default.php
diff --git a/view/theme/frost-mobile/default.php b/view/theme/frost-mobile/default.php

index 99f96f4b6869cc4e008cafe1a7c5edb3268b82aa..332291ca9266d442839a46c4f90daf028b6e060e 100644 (file)
--- a/view/theme/frost-mobile/default.php
+++ b/view/theme/frost-mobile/default.php
@@ -1,42 +1,45 @@
  <!DOCTYPE html >\r
-<html>\r
+<html lang="<?php echo $lang; ?>">\r
  <head>\r
    <title><?php if(x($page,'title')) echo $page['title'] ?></title>\r
    <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-container'>\r
-               <aside><?php if(x($page,'aside')) echo $page['aside']; ?></aside>\r
+<!--           <div class='main-content-container'>-->\r
                 <div class='section-wrapper'>\r
-               <section><?php if(x($page,'content')) echo $page['content']; ?>\r
+               <?php if( ($a->module === 'settings' || $a->module === 'message' || $a->module === 'profile') && x($page,'aside')) echo $page['aside']; ?>\r
+               <section>\r
+                       <?php if(x($page,'content')) echo $page['content']; ?>\r
+                       <div id="pause"></div> <!-- The pause/resume Ajax indicator -->\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
+               <?php if( ($a->module === 'contacts') && x($page,'aside')) echo $page['aside']; ?>\r
                 <footer><?php if(x($page,'footer')) echo $page['footer']; ?></footer>\r
-               </div>\r
+<!--           </div>-->\r
         </div>\r
         <?php } ?>\r
         <?php if(x($page,'end')) echo $page['end']; ?>\r
  </body>\r
  </html>\r
-\r