]> source.dussan.org Git - nextcloud-server.git/commitdiff
merge master
authorJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 24 Jul 2013 14:31:01 +0000 (16:31 +0200)
committerJan-Christoph Borchardt <hey@jancborchardt.net>
Wed, 24 Jul 2013 14:31:01 +0000 (16:31 +0200)
1  2 
core/templates/layout.guest.php
lib/config.php

index f49d8ee215fc779f1df2bbd1c91a8a0aaf10fa9b,9f645b6500d7e5996e726a58b3dab06bb767abc2..9c9eb63382fff615bb93777b226c6570f94e9e89
        </head>
  
        <body id="body-login">
 -              <div id="login">
 +              <div class="wrapper"><!-- for sticky footer -->
                        <header><div id="header">
-                               <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="ownCloud" />
-                               <div id="logo-claim" style="display:none;"><?php p($defaults->getLogoClaim()); ?></div>
+                               <img src="<?php print_unescaped(image_path('', 'logo.svg')); ?>" class="svg" alt="<?php p($theme->getName()); ?>" />
+                               <div id="logo-claim" style="display:none;"><?php p($theme->getLogoClaim()); ?></div>
                        </div></header>
 +
                        <?php print_unescaped($_['content']); ?>
 +
 +                      <div class="push"></div><!-- for sticky footer -->
                </div>
 +
                <footer>
                        <p class="info">
-                               <?php print_unescaped($defaults->getLongFooter()); ?>
+                               <?php print_unescaped($theme->getLongFooter()); ?>
 -                      </p></footer>
 +                      </p>
 +              </footer>
        </body>
  </html>
diff --cc lib/config.php
Simple merge