]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
projects / lorea / elgg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8819bab)
Updated to Elgg 1.8.16.
authorSem <sembrestels@riseup.net>
Fri, 23 Aug 2013 02:57:44 +0000 (04:57 +0200)
committerSem <sembrestels@riseup.net>
Fri, 23 Aug 2013 02:57:44 +0000 (04:57 +0200)
views/default/page/default.php patch | blob | history
views/default/page/elements/foot.php [deleted file] patch | blob | history
views/default/page/elements/footer.php patch | blob | history
views/default/page/elements/owner_block.php [deleted file] patch | blob | history
views/default/page/walled_garden.php patch | blob | history
views/default/search/search_box.php patch | blob | history

diff --git a/views/default/page/default.php b/views/default/page/default.php
index 491f691f43d1223f82e0af69497af188363bbbc1..aba69aebcc891bcc407d38fa0b2e11cfb727eccf 100644 (file)
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -30,9 +30,14 @@ $header = elgg_view('page/elements/header', $vars);
 $body = elgg_view('page/elements/body', $vars);
 $footer = elgg_view('page/elements/footer', $vars);
 
+// Set the content type
+header("Content-type: text/html; charset=UTF-8");
+
+$lang = get_current_language();
+
 ?>
 <!DOCTYPE html>
-<html lang="<?php echo get_current_language(); ?>">
+<html lang="<?php echo $lang; ?>">
 <head>
 <?php echo elgg_view('page/elements/head', $vars); ?>
 </head>
@@ -41,14 +46,14 @@ $footer = elgg_view('page/elements/footer', $vars);
        <div class="elgg-page-messages">
                <?php echo $messages; ?>
        </div>
-
-       <?php if (elgg_is_logged_in()): ?>
+       
+       <?php if (elgg_is_logged_in()){ ?>
        <header class="elgg-page-topbar">
                <div class="elgg-inner">
                        <?php echo $topbar; ?>
                </div>
        </header>
-       <?php endif; ?>
+       <?php } ?>
 
        <header class="elgg-page-header">
                <div class="elgg-inner">
diff --git a/views/default/page/elements/foot.php b/views/default/page/elements/foot.php
deleted file mode 100644 (file)
index a56b373..0000000
--- a/views/default/page/elements/foot.php
+++ /dev/null
@@ -1,11 +0,0 @@
-<?php
-
-echo elgg_view('footer/analytics');
-
-$js = elgg_get_loaded_js('footer');
-foreach ($js as $script) { ?>
-       <script type="text/javascript" src="<?php echo $script; ?>"></script>
-<?php
-}
-
-?>
\ No newline at end of file
diff --git a/views/default/page/elements/footer.php b/views/default/page/elements/footer.php
index ded2cea9a4cde914afb01dab1392898b37f35771..318a98b2d4d8ce7b650670f37bbc1a88ff14b022 100644 (file)
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -12,11 +12,11 @@ echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-me
 
 $powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
 
-echo '<div class="mts clearfloat float-alt">';
+echo '<footer class="mts clearfloat float-alt">';
 echo elgg_view('output/url', array(
        'href' => 'http://elgg.org',
        'text' => "<img src=\"$powered_url\" alt=\"Powered by Elgg\" width=\"106\" height=\"15\" />",
        'class' => '',
        'is_trusted' => true,
 ));
-echo '</div>';
+echo '</footer>';
diff --git a/views/default/page/elements/owner_block.php b/views/default/page/elements/owner_block.php
deleted file mode 100644 (file)
index fc7f0f6..0000000
--- a/views/default/page/elements/owner_block.php
+++ /dev/null
@@ -1,31 +0,0 @@
-<?php
-/**
- * Elgg owner block
- * Displays page ownership information
- *
- * @package Elgg
- * @subpackage Core
- *
- */
-
-elgg_push_context('owner_block');
-
-// groups and other users get owner block
-$owner = elgg_get_page_owner_entity();
-if ($owner instanceof ElggGroup ||
-       ($owner instanceof ElggUser && $owner->getGUID() != elgg_get_logged_in_user_guid())) {
-
-       $header = elgg_view_entity($owner, array('full_view' => false));
-
-       $body = elgg_view_menu('owner_block', array('entity' => $owner));
-
-       $body .= elgg_view('page/elements/owner_block/extend', $vars);
-
-       echo elgg_view('page/components/module', array(
-               'header' => $header,
-               'body' => $body,
-               'class' => 'elgg-owner-block',
-       ));
-}
-
-elgg_pop_context();
\ No newline at end of file
diff --git a/views/default/page/walled_garden.php b/views/default/page/walled_garden.php
index 77c901d8cd01fc47b266a198ff1565d8d8f78e02..26d1235c2985d41bd3adac7b4be6d4c192c74bfe 100644 (file)
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -5,6 +5,12 @@
  * Used for the walled garden index page
  */
 
+$is_sticky_register = elgg_is_sticky_form('register');
+$wg_body_class = 'elgg-body-walledgarden';
+if ($is_sticky_register) {
+       $wg_body_class .= ' hidden';
+}
+
 // Set the content type
 header("Content-type: text/html; charset=UTF-8");
 ?>
@@ -18,10 +24,17 @@ header("Content-type: text/html; charset=UTF-8");
        <div class="elgg-page-messages">
                <?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
        </div>
-       <div class="elgg-body-walledgarden">
+       <div class="<?php echo $wg_body_class; ?>">
                <?php echo $vars['body']; ?>
        </div>
 </div>
+<?php if ($is_sticky_register): ?>
+<script type="text/javascript">
+elgg.register_hook_handler('init', 'system', function() {
+       $('.registration_link').trigger('click');
+});
+</script>
+<?php endif; ?>
 <?php echo elgg_view('page/elements/foot'); ?>
 </body>
 </html>
diff --git a/views/default/search/search_box.php b/views/default/search/search_box.php
index c1ea40705fe4a49b3cbef8361d14fef1339c1a5e..4223661b3a3778b6cdc1c40296b6d24a4f8c7c45 100644 (file)
--- a/views/default/search/search_box.php
+++ b/views/default/search/search_box.php
@@ -34,7 +34,7 @@ $display_query = htmlspecialchars($display_query, ENT_QUOTES, 'UTF-8', false);
 
 <form class="<?php echo $class; ?>" action="<?php echo elgg_get_site_url(); ?>search" method="get">
        <fieldset>
-               <input type="text" class="search-input" size="21" name="q" value="<?php echo $display_query; ?>" placeholder="<?php echo elgg_echo('search'); ?>" />
+               <input type="search" class="search-input" size="21" name="q" value="<?php echo $display_query; ?>" placeholder="<?php echo elgg_echo('search'); ?>" />
                <input type="hidden" name="search_type" value="all" />
                <input type="submit" value="<?php echo elgg_echo('search:go'); ?>" class="search-submit-button" />
        </fieldset>
Social Networking Engine