From: Sem <sembrestels@riseup.net>
Date: Sat, 9 Nov 2013 15:30:07 +0000 (+0100)
Subject: Add 'mod/html5/' from commit 'b623f64507956f7beee0d8352fd044bdb70f5d23'
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=e843405646960ffd1918d8191c5eba6219ba38b3;p=lorea%2Felgg.git

Add 'mod/html5/' from commit 'b623f64507956f7beee0d8352fd044bdb70f5d23'

git-subtree-dir: mod/html5
git-subtree-mainline: dee4ff21a5a5e8b8c5dbeae0a2f89a36a3f1c6cc
git-subtree-split: b623f64507956f7beee0d8352fd044bdb70f5d23
---

e843405646960ffd1918d8191c5eba6219ba38b3
diff --cc mod/html5/.gitignore
index 000000000,000000000..336139754
new file mode 100644
--- /dev/null
+++ b/mod/html5/.gitignore
@@@ -1,0 -1,0 +1,3 @@@
++/.project
++/.buildpath
++/.settings
diff --cc mod/html5/README
index 000000000,29e8181b9..29e8181b9
mode 000000,100644..100644
--- a/mod/html5/README
+++ b/mod/html5/README
diff --cc mod/html5/manifest.xml
index 000000000,e5a53dda7..e5a53dda7
mode 000000,100644..100644
--- a/mod/html5/manifest.xml
+++ b/mod/html5/manifest.xml
diff --cc mod/html5/start.php
index 000000000,462eb88e7..462eb88e7
mode 000000,100644..100644
--- a/mod/html5/start.php
+++ b/mod/html5/start.php
diff --cc mod/html5/vendors/Modernizr-1.5.min.js
index 000000000,a8dc724e6..a8dc724e6
mode 000000,100644..100644
--- a/mod/html5/vendors/Modernizr-1.5.min.js
+++ b/mod/html5/vendors/Modernizr-1.5.min.js
diff --cc mod/html5/vendors/jquery/jquery.placeholder-1.0.1.js
index 000000000,61dfb87e6..61dfb87e6
mode 000000,100644..100644
--- a/mod/html5/vendors/jquery/jquery.placeholder-1.0.1.js
+++ b/mod/html5/vendors/jquery/jquery.placeholder-1.0.1.js
diff --cc mod/html5/views/default/html/img.php
index 000000000,10fcbe0d1..10fcbe0d1
mode 000000,100644..100644
--- a/mod/html5/views/default/html/img.php
+++ b/mod/html5/views/default/html/img.php
diff --cc mod/html5/views/default/html5/css.php
index 000000000,eae9c7d13..eae9c7d13
mode 000000,100644..100644
--- a/mod/html5/views/default/html5/css.php
+++ b/mod/html5/views/default/html5/css.php
diff --cc mod/html5/views/default/html5/theme_preview/forms/inputs.php
index 000000000,de38dc71c..de38dc71c
mode 000000,100644..100644
--- a/mod/html5/views/default/html5/theme_preview/forms/inputs.php
+++ b/mod/html5/views/default/html5/theme_preview/forms/inputs.php
diff --cc mod/html5/views/default/input/color.php
index 000000000,be8154fc9..be8154fc9
mode 000000,100644..100644
--- a/mod/html5/views/default/input/color.php
+++ b/mod/html5/views/default/input/color.php
diff --cc mod/html5/views/default/input/datetime-local.php
index 000000000,468843901..468843901
mode 000000,100644..100644
--- a/mod/html5/views/default/input/datetime-local.php
+++ b/mod/html5/views/default/input/datetime-local.php
diff --cc mod/html5/views/default/input/datetime.php
index 000000000,69e4bd7f7..69e4bd7f7
mode 000000,100644..100644
--- a/mod/html5/views/default/input/datetime.php
+++ b/mod/html5/views/default/input/datetime.php
diff --cc mod/html5/views/default/input/image.php
index 000000000,cf740f782..cf740f782
mode 000000,100644..100644
--- a/mod/html5/views/default/input/image.php
+++ b/mod/html5/views/default/input/image.php
diff --cc mod/html5/views/default/input/month.php
index 000000000,c99b3f34c..c99b3f34c
mode 000000,100644..100644
--- a/mod/html5/views/default/input/month.php
+++ b/mod/html5/views/default/input/month.php
diff --cc mod/html5/views/default/input/number.php
index 000000000,ec4938734..ec4938734
mode 000000,100644..100644
--- a/mod/html5/views/default/input/number.php
+++ b/mod/html5/views/default/input/number.php
diff --cc mod/html5/views/default/input/option.php
index 000000000,05d5d649f..05d5d649f
mode 000000,100644..100644
--- a/mod/html5/views/default/input/option.php
+++ b/mod/html5/views/default/input/option.php
diff --cc mod/html5/views/default/input/range.php
index 000000000,235687257..235687257
mode 000000,100644..100644
--- a/mod/html5/views/default/input/range.php
+++ b/mod/html5/views/default/input/range.php
diff --cc mod/html5/views/default/input/search.php
index 000000000,becf8a11b..becf8a11b
mode 000000,100644..100644
--- a/mod/html5/views/default/input/search.php
+++ b/mod/html5/views/default/input/search.php
diff --cc mod/html5/views/default/input/tel.php
index 000000000,0704344a8..0704344a8
mode 000000,100644..100644
--- a/mod/html5/views/default/input/tel.php
+++ b/mod/html5/views/default/input/tel.php
diff --cc mod/html5/views/default/input/time.php
index 000000000,6bb557266..6bb557266
mode 000000,100644..100644
--- a/mod/html5/views/default/input/time.php
+++ b/mod/html5/views/default/input/time.php
diff --cc mod/html5/views/default/input/week.php
index 000000000,3d09ba07f..3d09ba07f
mode 000000,100644..100644
--- a/mod/html5/views/default/input/week.php
+++ b/mod/html5/views/default/input/week.php
diff --cc mod/html5/views/default/output/friendlytime.php
index 000000000,000000000..dc9699fba
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/output/friendlytime.php
@@@ -1,0 -1,0 +1,14 @@@
++<?php
++/**
++ * Friendly time
++ * Translates an epoch time into a human-readable time.
++ * 
++ * @uses string $vars['time'] Unix-style epoch timestamp
++ * @override views/default/output/friendlytime.php
++ */
++
++$friendly_time = elgg_get_friendly_time($vars['time']);
++$timestamp = htmlentities(date(elgg_echo('friendlytime:date_format'), $vars['time']));
++$datetime = htmlentities(date("c", $vars['time']));
++
++echo "<time title=\"$timestamp\" datetime=\"$datetime\" class=\"timestamp\">$friendly_time</time>";
diff --cc mod/html5/views/default/page/admin.php
index 000000000,000000000..e1180e851
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/admin.php
@@@ -1,0 -1,0 +1,68 @@@
++<?php
++/**
++ * Elgg pageshell for the admin area
++ *
++ * @package Elgg
++ * @subpackage Core
++ *
++ * @uses $vars['title']       The page title
++ * @uses $vars['body']        The main content of the page
++ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
++ * 
++ * @override views/default/page/admin.php
++ */
++
++$notices_html = '';
++$notices = elgg_get_admin_notices();
++if ($notices) {
++	foreach ($notices as $notice) {
++		$notices_html .= elgg_view_entity($notice);
++	}
++
++	$notices_html = "<div class=\"elgg-admin-notices\">$notices_html</div>";
++}
++
++// render content before head so that JavaScript and CSS can be loaded. See #4032
++$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
++$header = elgg_view('admin/header', $vars);
++$body = $vars['body'];
++$footer = elgg_view('admin/footer', $vars);
++
++
++// Set the content type
++header("Content-type: text/html; charset=UTF-8");
++
++?>
++<!DOCTYPE html>
++<html lang="<?php echo get_current_language(); ?>">
++<head>
++<?php echo elgg_view('page/elements/head', $vars); ?>
++</head>
++<body>
++	<div class="elgg-page elgg-page-admin">
++		<div class="elgg-inner">
++			<div class="elgg-page-header">
++				<div class="elgg-inner clearfix">
++					<?php echo $header; ?>
++				</div>
++			</div>
++			<div class="elgg-page-messages">
++				<?php echo $messages; ?>
++				<?php echo $notices_html; ?>
++			</div>
++			<div class="elgg-page-body">
++				<div class="elgg-inner">
++					<?php echo $body; ?>
++				</div>
++			</div>
++			<div class="elgg-page-footer">
++				<div class="elgg-inner">
++					<?php echo $footer; ?>
++				</div>
++			</div>
++		</div>
++	</div>
++	<?php echo elgg_view('page/elements/foot'); ?>
++</body>
++
++</html>
diff --cc mod/html5/views/default/page/default.php
index 000000000,000000000..4ff2215da
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/default.php
@@@ -1,0 -1,0 +1,78 @@@
++<?php
++/**
++ * Elgg pageshell
++ * The standard HTML page shell that everything else fits into
++ *
++ * @package Elgg
++ * @subpackage Core
++ *
++ * @uses $vars['title']       The page title
++ * @uses $vars['body']        The main content of the page
++ * @uses $vars['sysmessages'] A 2d array of various message registers, passed from system_messages()
++ * 
++ * @override views/default/page/default.php
++ */
++
++// backward compatability support for plugins that are not using the new approach
++// of routing through admin. See reportedcontent plugin for a simple example.
++if (elgg_get_context() == 'admin') {
++	if (get_input('handler') != 'admin') {
++		elgg_deprecated_notice("admin plugins should route through 'admin'.", 1.8);
++	}
++	elgg_admin_add_plugin_settings_menu();
++	elgg_unregister_css('elgg');
++	echo elgg_view('page/admin', $vars);
++	return true;
++}
++
++// render content before head so that JavaScript and CSS can be loaded. See #4032
++$topbar = elgg_view('page/elements/topbar', $vars);
++$messages = elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
++$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 $lang; ?>">
++<head>
++<?php echo elgg_view('page/elements/head', $vars); ?>
++</head>
++<body>
++<div class="elgg-page elgg-page-default">
++	<div class="elgg-page-messages">
++		<?php echo $messages; ?>
++	</div>
++	
++	<?php if (elgg_is_logged_in()){ ?>
++	<header class="elgg-page-topbar">
++		<div class="elgg-inner">
++			<?php echo $topbar; ?>
++		</div>
++	</header>
++	<?php } ?>
++
++	<header class="elgg-page-header">
++		<div class="elgg-inner">
++			<?php echo $header; ?>
++		</div>
++	</header>
++	<div class="elgg-page-body">
++		<div class="elgg-inner">
++			<?php echo $body; ?>
++		</div>
++	</div>
++	<footer class="elgg-page-footer">
++		<div class="elgg-inner">
++			<?php echo $footer; ?>
++		</div>
++	</footer>
++</div>
++<?php echo elgg_view('page/elements/foot'); ?>
++</body>
++</html>
diff --cc mod/html5/views/default/page/elements/footer.php
index 000000000,000000000..c0da2f370
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/elements/footer.php
@@@ -1,0 -1,0 +1,23 @@@
++<?php
++/**
++ * Elgg footer
++ * The standard HTML footer that displays across the site
++ *
++ * @package Elgg
++ * @subpackage Core
++ * @override views/default/page/elements/footer.php
++ *
++ */
++
++echo elgg_view_menu('footer', array('sort_by' => 'priority', 'class' => 'elgg-menu-hz'));
++
++$powered_url = elgg_get_site_url() . "_graphics/powered_by_elgg_badge_drk_bckgnd.gif";
++
++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 '</footer>';
diff --cc mod/html5/views/default/page/elements/head.php
index 000000000,000000000..47254934e
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/elements/head.php
@@@ -1,0 -1,0 +1,78 @@@
++<?php
++/**
++ * The standard HTML head
++ *
++ * @uses $vars['title'] The page title
++ * @override views/default/page/elements/head.php
++ */
++
++// Set title
++if (empty($vars['title'])) {
++	$title = elgg_get_config('sitename');
++} else {
++	$title = elgg_get_config('sitename') . ": " . $vars['title'];
++}
++
++global $autofeed;
++if (isset($autofeed) && $autofeed == true) {
++	$url = current_page_url();
++	if (substr_count($url,'?')) {
++		$url .= "&view=rss";
++	} else {
++		$url .= "?view=rss";
++	}
++	$url = elgg_format_url($url);
++	$feedref = <<<END
++
++	<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
++
++END;
++} else {
++	$feedref = "";
++}
++
++$js = elgg_get_loaded_js('head');
++$css = elgg_get_loaded_css();
++
++$release = get_version(true);
++?>
++	<meta charset="utf-8" />
++	<meta name="generator" content="Elgg <?php echo $release; ?>" />
++	<title><?php echo $title; ?></title>
++	<?php echo elgg_view('page/elements/shortcut_icon', $vars); ?>
++
++<?php foreach ($css as $link) { ?>
++	<link rel="stylesheet" href="<?php echo $link; ?>" type="text/css" />
++<?php } ?>
++
++<?php
++	$ie_url = elgg_get_simplecache_url('css', 'ie');
++	$ie7_url = elgg_get_simplecache_url('css', 'ie7');
++	$ie6_url = elgg_get_simplecache_url('css', 'ie6');
++?>
++	<!--[if gt IE 7]>
++		<link rel="stylesheet" type="text/css" href="<?php echo $ie_url; ?>" />
++	<![endif]-->
++	<!--[if IE 7]>
++		<link rel="stylesheet" type="text/css" href="<?php echo $ie7_url; ?>" />
++	<![endif]-->
++	<!--[if IE 6]>
++		<link rel="stylesheet" type="text/css" href="<?php echo $ie6_url; ?>" />
++	<![endif]-->
++
++<?php foreach ($js as $script) { ?>
++	<script type="text/javascript" src="<?php echo $script; ?>"></script>
++<?php } ?>
++
++<script type="text/javascript">
++	<?php echo elgg_view('js/initialize_elgg'); ?>
++</script>
++
++<?php
++echo $feedref;
++
++$metatags = elgg_view('metatags', $vars);
++if ($metatags) {
++	elgg_deprecated_notice("The metatags view has been deprecated. Extend page/elements/head instead", 1.8);
++	echo $metatags;
++}
diff --cc mod/html5/views/default/page/layouts/admin.php
index 000000000,000000000..683ba3468
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/layouts/admin.php
@@@ -1,0 -1,0 +1,42 @@@
++<?php
++/**
++ * Elgg Admin Area Canvas
++ *
++ * @package Elgg
++ * @subpackage Core
++ *
++ * @uses $vars['content'] Content string
++ * @uses $vars['sidebar'] Optional sidebar content
++ * @uses $vars['title']   Title string
++ * 
++ * @override views/default/page/layouts/admin.php
++ */
++
++?>
++
++<div class="elgg-layout elgg-layout-one-sidebar">
++	<aside class="elgg-sidebar clearfix">
++		<?php
++			echo elgg_view('admin/sidebar', $vars);
++		?>
++	</aside>
++	<div class="elgg-main elgg-body">
++		<div class="elgg-head">
++		<?php
++			echo elgg_view_menu('title', array(
++				'sort_by' => 'priority',
++				'class' => 'elgg-menu-hz',
++			));
++
++			if (isset($vars['title'])) {
++				echo elgg_view_title($vars['title']);
++			}
++		?>
++		</div>
++		<?php
++			if (isset($vars['content'])) {
++				echo $vars['content'];
++			}
++		?>
++	</div>
++</div>
diff --cc mod/html5/views/default/page/layouts/one_sidebar.php
index 000000000,000000000..e5e063b51
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/layouts/one_sidebar.php
@@@ -1,0 -1,0 +1,50 @@@
++<?php
++/**
++ * Layout for main column with one sidebar
++ *
++ * @package Elgg
++ * @subpackage Core
++ *
++ * @uses $vars['content'] Content HTML for the main column
++ * @uses $vars['sidebar'] Optional content that is displayed in the sidebar
++ * @uses $vars['title']   Optional title for main content area
++ * @uses $vars['class']   Additional class to apply to layout
++ * @uses $vars['nav']     HTML of the page nav (override) (default: breadcrumbs)
++ * 
++ * @override views/default/page/layouts/one_sidebar.php
++ */
++
++$class = 'elgg-layout elgg-layout-one-sidebar clearfix';
++if (isset($vars['class'])) {
++	$class = "$class {$vars['class']}";
++}
++
++// navigation defaults to breadcrumbs
++$nav = elgg_extract('nav', $vars, elgg_view('navigation/breadcrumbs'));
++
++?>
++
++<div class="<?php echo $class; ?>">
++	<aside class="elgg-sidebar">
++		<?php
++			echo elgg_view('page/elements/sidebar', $vars);
++		?>
++	</aside>
++
++	<div class="elgg-main elgg-body">
++		<?php
++			echo $nav;
++			
++			if (isset($vars['title'])) {
++				echo elgg_view_title($vars['title']);
++			}
++			// @todo deprecated so remove in Elgg 2.0
++			if (isset($vars['area1'])) {
++				echo $vars['area1'];
++			}
++			if (isset($vars['content'])) {
++				echo $vars['content'];
++			}
++		?>
++	</div>
++</div>
diff --cc mod/html5/views/default/page/layouts/two_sidebar.php
index 000000000,000000000..929547424
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/layouts/two_sidebar.php
@@@ -1,0 -1,0 +1,45 @@@
++<?php
++/**
++ * Elgg 2 sidebar layout
++ *
++ * @package Elgg
++ * @subpackage Core
++ *
++ * @uses $vars['content']     The content string for the main column
++ * @uses $vars['sidebar']     Optional content that is displayed in the sidebar
++ * @uses $vars['sidebar_alt'] Optional content that is displayed in the alternate sidebar
++ * @uses $vars['class']       Additional class to apply to layout
++ * 
++ * @override views/default/page/layouts/two_sidebar.php
++ */
++
++$class = 'elgg-layout elgg-layout-two-sidebar clearfix';
++if (isset($vars['class'])) {
++	$class = "$class {$vars['class']}";
++}
++?>
++
++<div class="<?php echo $class; ?>">
++	<aside class="elgg-sidebar">
++		<?php
++			echo elgg_view('page/elements/sidebar', $vars);
++		?>
++	</aside>
++	<aside class="elgg-sidebar-alt">
++		<?php
++			echo elgg_view('page/elements/sidebar_alt', $vars);
++		?>
++	</aside>
++
++	<div class="elgg-main elgg-body">
++		<?php
++			// @todo deprecated so remove in Elgg 2.0
++			if (isset($vars['area1'])) {
++				echo $vars['area1'];
++			}
++			if (isset($vars['content'])) {
++				echo $vars['content'];
++			}
++		?>
++	</div>
++</div>
diff --cc mod/html5/views/default/page/walled_garden.php
index 000000000,000000000..c12a7203d
new file mode 100644
--- /dev/null
+++ b/mod/html5/views/default/page/walled_garden.php
@@@ -1,0 -1,0 +1,42 @@@
++<?php
++/**
++ * Walled garden page shell
++ *
++ * Used for the walled garden index page
++ * 
++ * @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");
++?>
++<!DOCTYPE html>
++<html lang="<?php echo get_current_language(); ?>">
++<head>
++<?php echo elgg_view('page/elements/head', $vars); ?>
++</head>
++<body>
++<div class="elgg-page elgg-page-walledgarden">
++	<div class="elgg-page-messages">
++		<?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
++	</div>
++	<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 --cc mod/html5/views/default/search/search_box.php
index 000000000,2abc47ca3..2abc47ca3
mode 000000,100644..100644
--- a/mod/html5/views/default/search/search_box.php
+++ b/mod/html5/views/default/search/search_box.php