aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorSem <sembrestels@riseup.net>2013-08-22 23:38:47 -0400
committerSem <sembrestels@riseup.net>2013-08-22 23:38:47 -0400
commitf24e08416c793428ba863840e7d5e502e6d68cfc (patch)
treed7797c71630ec90fbea310f588a432ac0d39b597 /views
parent88733a24caee170acda071281eb4630bf5ef5794 (diff)
parent46c365abd6e190a5c389b0dd49b02cd6e878ccd9 (diff)
downloadelgg-f24e08416c793428ba863840e7d5e502e6d68cfc.tar.gz
elgg-f24e08416c793428ba863840e7d5e502e6d68cfc.tar.bz2
Merge branch '1.8' of gitorious.org:lorea/html5 into 1.8
Conflicts: views/default/page/elements/foot.php views/default/page/elements/owner_block.php
Diffstat (limited to 'views')
-rw-r--r--views/default/page/default.php13
-rw-r--r--views/default/page/elements/foot.php14
-rw-r--r--views/default/page/elements/footer.php4
-rw-r--r--views/default/page/elements/owner_block.php32
-rw-r--r--views/default/page/walled_garden.php15
-rw-r--r--views/default/search/search_box.php2
6 files changed, 26 insertions, 54 deletions
diff --git a/views/default/page/default.php b/views/default/page/default.php
index 7a74a0459..4ff2215da 100644
--- a/views/default/page/default.php
+++ b/views/default/page/default.php
@@ -32,9 +32,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>
@@ -43,14 +48,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
index 6736fe3ab..000000000
--- a/views/default/page/elements/foot.php
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-/**
- * @override views/default/page/elements/foot.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 f1e120d52..c0da2f370 100644
--- a/views/default/page/elements/footer.php
+++ b/views/default/page/elements/footer.php
@@ -13,11 +13,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
index 3a234c162..000000000
--- a/views/default/page/elements/owner_block.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-/**
- * Elgg owner block
- * Displays page ownership information
- *
- * @package Elgg
- * @subpackage Core
- * @override views/default/page/elements/owner_block.php
- *
- */
-
-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 1075ea811..c12a7203d 100644
--- a/views/default/page/walled_garden.php
+++ b/views/default/page/walled_garden.php
@@ -7,6 +7,12 @@
* @override views/default/page/walled_garden.php
*/
+$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");
?>
@@ -20,10 +26,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 9d0ed5e91..2abc47ca3 100644
--- a/views/default/search/search_box.php
+++ b/views/default/search/search_box.php
@@ -36,7 +36,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>