aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-11 18:32:44 +0000
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>2011-02-11 18:32:44 +0000
commit1596e227843722315f2a364af51015b97e7bc615 (patch)
tree0414d3c4fe2a0a4238d7eac85565f2acb3b4265a /views
parentd8f9c48d8684533dfe21ad5baa0748b264616b42 (diff)
downloadelgg-1596e227843722315f2a364af51015b97e7bc615.tar.gz
elgg-1596e227843722315f2a364af51015b97e7bc615.tar.bz2
Fixes #1303: Pulled html_begin/end into page shells. extracted <head> element into page/elements/head
git-svn-id: http://code.elgg.org/elgg/trunk@8112 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/page/elements/head.php (renamed from views/default/page/elements/html_begin.php)8
-rw-r--r--views/default/page/elements/html_end.php8
-rw-r--r--views/default/page/shells/admin.php17
-rw-r--r--views/default/page/shells/default.php27
-rw-r--r--views/default/page/shells/walled_garden.php523
5 files changed, 291 insertions, 292 deletions
diff --git a/views/default/page/elements/html_begin.php b/views/default/page/elements/head.php
index 6a461d767..0cd3284c8 100644
--- a/views/default/page/elements/html_begin.php
+++ b/views/default/page/elements/head.php
@@ -35,15 +35,11 @@ END;
$js = elgg_get_js('head');
$css = elgg_get_css();
-// we won't trust server configuration but specify utf-8
-header('Content-type: text/html; charset=utf-8');
-
$version = get_version();
$release = get_version(true);
?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
<head>
+
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<meta name="ElggRelease" content="<?php echo $release; ?>" />
<meta name="ElggVersion" content="<?php echo $version; ?>" />
@@ -85,5 +81,3 @@ if ($metatags) {
echo elgg_view('html_head/extend', $vars);
?>
</head>
-
-<body>
diff --git a/views/default/page/elements/html_end.php b/views/default/page/elements/html_end.php
deleted file mode 100644
index 26b0ee451..000000000
--- a/views/default/page/elements/html_end.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-/**
- * Start html output.
- * The standard HTML header that displays across the site
- */
-?>
-</body>
-</html>
diff --git a/views/default/page/shells/admin.php b/views/default/page/shells/admin.php
index 2c5cd2226..e14b24f60 100644
--- a/views/default/page/shells/admin.php
+++ b/views/default/page/shells/admin.php
@@ -12,11 +12,14 @@
// Set the content type
header("Content-type: text/html; charset=UTF-8");
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?php echo elgg_view('page/elements/head', $vars); ?>
+<body>
+ <div class="elgg-page elgg-admin">
+ <?php echo $vars['body']; ?>
+ </div>
+</body>
-echo elgg_view('page/elements/html_begin', $vars);
-
-echo '<div class="elgg-page elgg-admin">';
-echo $vars['body'];
-echo '</div>';
-
-echo elgg_view('page/elements/html_end', $vars); \ No newline at end of file
+</html> \ No newline at end of file
diff --git a/views/default/page/shells/default.php b/views/default/page/shells/default.php
index b239b6339..5ed1ca7ca 100644
--- a/views/default/page/shells/default.php
+++ b/views/default/page/shells/default.php
@@ -24,14 +24,19 @@ if (elgg_get_context() == 'admin') {
// Set the content type
header("Content-type: text/html; charset=UTF-8");
-echo elgg_view('page/elements/html_begin', $vars);
-
-echo '<div class="elgg-page elgg-classic">';
-echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
-echo elgg_view('page/elements/topbar', $vars);
-echo elgg_view('page/elements/header', $vars);
-echo elgg_view('page/elements/body', $vars);
-echo elgg_view('page/elements/footer', $vars);
-echo '</div>';
-
-echo elgg_view('page/elements/html_end', $vars);
+?>
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
+<?php echo elgg_view('page/elements/head', $vars); ?>
+<body>
+<div class="elgg-page elgg-classic">
+<?php
+ echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
+ echo elgg_view('page/elements/topbar', $vars);
+ echo elgg_view('page/elements/header', $vars);
+ echo elgg_view('page/elements/body', $vars);
+ echo elgg_view('page/elements/footer', $vars);
+?>
+</div>
+</body>
+</html> \ No newline at end of file
diff --git a/views/default/page/shells/walled_garden.php b/views/default/page/shells/walled_garden.php
index 905cacdae..faa0cea54 100644
--- a/views/default/page/shells/walled_garden.php
+++ b/views/default/page/shells/walled_garden.php
@@ -16,266 +16,271 @@ if (empty($vars['title'])) {
$title = $site_title . ": " . $vars['title'];
}
-echo elgg_view('page/elements/html_begin', $vars);
// @todo - move the css below into it's own style-sheet
// that is called when running as a private network
?>
-<style type="text/css">
-body {background: white;}
-/* ***************************************
- WalledGarden
-*************************************** */
-#walledgarden_container {
- margin:100px auto 0 auto;
- position:relative;
- padding:0;
- width:563px;
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_extend.gif) repeat-y left top;
- text-align: left;
- word-wrap:break-word;
-}
-#walledgarden {
- position: relative;
- padding:0;
- width:563px;
- min-height:230px;
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
-}
-#walledgarden_bottom {
- margin:0 auto;
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
- width:563px;
- height:54px;
- /* position: relative; */
-}
-.walledgardenintro {
- float:left;
- min-height:200px;
- width:223px;
- padding:15px;
- margin:19px 0 0 23px;
-}
-.walledgardenlogin {
- float:left;
- min-height:200px;
- width:223px;
- padding:15px 15px 0 15px;
- margin:19px 0 0 11px;
-}
-.walledgardenintro h1 {
- color:#666666;
- margin-top:80px;
- line-height: 1.1em;
-}
-.walledgardenlogin h2 {
- color:#666666;
- border-bottom:1px solid #CCCCCC;
- margin-bottom:5px;
- padding-bottom:5px;
-}
-.walledgardenlogin form input.login-textarea {
- margin:0 0 10px 0;
- width:210px;
-}
-.walledgardenlogin form label {
- color:#666666;
-}
-.walledgardenlogin .remember_me label {
- font-size:1em;
- font-weight:normal;
-}
-.walledgardenlogin .remember_me {
- display:block;
- float:right;
- margin-left:0;
- margin-top:-34px;
- text-align:right;
- width:100%;
-}
-.walledgardenlogin .lost_password {
- margin-bottom: 10px;
- color:#999999;
-}
-.walledgardenlogin a.forgotten_password_link,
-.walledgardenlogin a.registration_link {
- color:#999999;
-}
-
-/* override default form styles (for when a theme is running) */
-.walledgardenlogin input {
- font: 120% Arial, Helvetica, sans-serif;
- padding: 5px;
- border: 1px solid #cccccc;
- color:#666666;
- background-color: white;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-.walledgardenlogin textarea {
- font: 120% Arial, Helvetica, sans-serif;
- border: solid 1px #cccccc;
- padding: 5px;
- color:#666666;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
-}
-.walledgardenlogin textarea:focus,
-.walledgardenlogin input[type="text"]:focus {
- border: solid 1px #4690d6;
- background: #e4ecf5;
- color:#333333;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.walledgardenlogin .elgg-input-password {
- width:200px;
-}
-.walledgardenlogin input.elgg-input-password:focus {
- border: solid 1px #4690d6;
- background-color: #e4ecf5;
- color:#333333;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.walledgardenlogin input[type="password"]:focus {
- border: solid 1px #4690d6;
- background-color: #e4ecf5;
- color:#333333;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
- box-shadow: none;
-}
-.walledgardenlogin .submit_button {
- font-size: 14px;
- font-weight: bold;
- color: white;
- text-shadow:1px 1px 0px black;
- text-decoration:none;
- border: 1px solid #4690d6;
- background-color:#4690d6;
- background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
- background-repeat: repeat-x;
- background-position: left 10px;
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- width: auto;
- padding: 2px 4px;
- margin:0 10px 10px 0;
- cursor: pointer;
- -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
- -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
-}
-.walledgardenlogin .submit_button:hover {
- color: white;
- border-color: #0054a7;
- text-decoration:none;
- background-color:#0054a7;
- background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
- background-repeat: repeat-x;
- background-position: left 10px;
-}
-.walledgardenlogin input.action_button {
- -webkit-border-radius: 5px;
- -moz-border-radius: 5px;
- background-color:#cccccc;
- background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
- background-repeat: repeat-x;
- background-position: 0 0;
- border:1px solid #999999;
- color:#333333;
- padding:2px 15px 2px 15px;
- text-align:center;
- font-weight:bold;
- text-decoration:none;
- text-shadow:0 1px 0 white;
- cursor:pointer;
- -webkit-box-shadow: none;
- -moz-box-shadow: none;
-}
-.walledgardenlogin input.action_button:hover,
-.walledgardenlogin input.action_button:focus {
- background-position:0 -15px;
- background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
- background-repeat: repeat-x;
- color:#111111;
- text-decoration: none;
- background-color:#cccccc;
- border:1px solid #999999;
-}
-.walledgardenlogin .action_button.elgg-state-disabled {
- color:#999999;
- padding:2px 7px;
-}
-
-/* override some elgg system message styles */
-#walledgarden_sysmessages {
- position: absolute;
- width:100%;
- text-align: center;
- margin:0 auto;
- top:0;
- z-index:9600;
-}
-#walledgarden_sysmessages #elgg-system-message {
- width: 515px;
- max-width: 515px;
- right:auto;
- margin:30px auto 0 auto;
- position: relative;
-}
-
-
-#lostpassword_form,
-#registration_form {
- right:0;
- position:absolute;
- top:0;
- width:260px;
- background-color: white;
- padding:0;
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
- height:auto;
-}
-#hiddenform_body {
- padding:30px 40px 0 40px;
- height:auto;
-}
-#hiddenform_bottom {
- margin:0 auto;
- background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
- width:563px;
- height:54px;
- position: relative;
-}
-
-#hiddenform_body .cancel_request {
- margin-left:15px;
-}
-
-/* override some visual_captcha styles */
-.walledgardenlogin .visual_captcha_choices {
- margin:10px 0 0 0;
- padding:0;
- height:60px;
-}
-.walledgardenlogin ul.visual_captcha_choices li img {
- width:50px;
- height:auto;
-}
+<html>
+<?php echo elgg_view('page/elements/head', $vars); ?>
+<body>
+ <style type="text/css">
+ body {background: white;}
+ /* ***************************************
+ WalledGarden
+ *************************************** */
+ #walledgarden_container {
+ margin:100px auto 0 auto;
+ position:relative;
+ padding:0;
+ width:563px;
+ background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_extend.gif) repeat-y left top;
+ text-align: left;
+ word-wrap:break-word;
+ }
+ #walledgarden {
+ position: relative;
+ padding:0;
+ width:563px;
+ min-height:230px;
+ background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_top.gif) no-repeat left top;
+ }
+ #walledgarden_bottom {
+ margin:0 auto;
+ background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_background_bottom.gif) no-repeat left bottom;
+ width:563px;
+ height:54px;
+ /* position: relative; */
+ }
+ .walledgardenintro {
+ float:left;
+ min-height:200px;
+ width:223px;
+ padding:15px;
+ margin:19px 0 0 23px;
+ }
+ .walledgardenlogin {
+ float:left;
+ min-height:200px;
+ width:223px;
+ padding:15px 15px 0 15px;
+ margin:19px 0 0 11px;
+ }
+ .walledgardenintro h1 {
+ color:#666666;
+ margin-top:80px;
+ line-height: 1.1em;
+ }
+ .walledgardenlogin h2 {
+ color:#666666;
+ border-bottom:1px solid #CCCCCC;
+ margin-bottom:5px;
+ padding-bottom:5px;
+ }
+ .walledgardenlogin form input.login-textarea {
+ margin:0 0 10px 0;
+ width:210px;
+ }
+ .walledgardenlogin form label {
+ color:#666666;
+ }
+ .walledgardenlogin .remember_me label {
+ font-size:1em;
+ font-weight:normal;
+ }
+ .walledgardenlogin .remember_me {
+ display:block;
+ float:right;
+ margin-left:0;
+ margin-top:-34px;
+ text-align:right;
+ width:100%;
+ }
+ .walledgardenlogin .lost_password {
+ margin-bottom: 10px;
+ color:#999999;
+ }
+ .walledgardenlogin a.forgotten_password_link,
+ .walledgardenlogin a.registration_link {
+ color:#999999;
+ }
-</style>
-
-<?php
-$view = elgg_view('page/elements/messages', array('object' => $vars['sysmessages']));
-
-echo "<div id='walledgarden_sysmessages' class='clearfix'>$view</div>";
-echo '<div id="walledgarden_container"><div id="walledgarden" class="clearfix">';
-echo "<div class=\"walledgardenintro clearfix\"><h1>Welcome to:<br />$title</h1></div>";
-echo "<div class=\"walledgardenlogin clearfix\">{$vars['body']}</div>";
-echo '</div>';
-echo '<div id="walledgarden_bottom"></div>';
-echo '</div>';
-
-echo elgg_view('page/elements/html_end', $vars);
+ /* override default form styles (for when a theme is running) */
+ .walledgardenlogin input {
+ font: 120% Arial, Helvetica, sans-serif;
+ padding: 5px;
+ border: 1px solid #cccccc;
+ color:#666666;
+ background-color: white;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ }
+ .walledgardenlogin textarea {
+ font: 120% Arial, Helvetica, sans-serif;
+ border: solid 1px #cccccc;
+ padding: 5px;
+ color:#666666;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ }
+ .walledgardenlogin textarea:focus,
+ .walledgardenlogin input[type="text"]:focus {
+ border: solid 1px #4690d6;
+ background: #e4ecf5;
+ color:#333333;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ .walledgardenlogin .elgg-input-password {
+ width:200px;
+ }
+ .walledgardenlogin input.elgg-input-password:focus {
+ border: solid 1px #4690d6;
+ background-color: #e4ecf5;
+ color:#333333;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ .walledgardenlogin input[type="password"]:focus {
+ border: solid 1px #4690d6;
+ background-color: #e4ecf5;
+ color:#333333;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ box-shadow: none;
+ }
+ .walledgardenlogin .submit_button {
+ font-size: 14px;
+ font-weight: bold;
+ color: white;
+ text-shadow:1px 1px 0px black;
+ text-decoration:none;
+ border: 1px solid #4690d6;
+ background-color:#4690d6;
+ background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+ background-repeat: repeat-x;
+ background-position: left 10px;
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ width: auto;
+ padding: 2px 4px;
+ margin:0 10px 10px 0;
+ cursor: pointer;
+ -webkit-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+ -moz-box-shadow: 0px 1px 0px rgba(0, 0, 0, 0.40);
+ }
+ .walledgardenlogin .submit_button:hover {
+ color: white;
+ border-color: #0054a7;
+ text-decoration:none;
+ background-color:#0054a7;
+ background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_graduation.png);
+ background-repeat: repeat-x;
+ background-position: left 10px;
+ }
+ .walledgardenlogin input.action_button {
+ -webkit-border-radius: 5px;
+ -moz-border-radius: 5px;
+ background-color:#cccccc;
+ background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
+ background-repeat: repeat-x;
+ background-position: 0 0;
+ border:1px solid #999999;
+ color:#333333;
+ padding:2px 15px 2px 15px;
+ text-align:center;
+ font-weight:bold;
+ text-decoration:none;
+ text-shadow:0 1px 0 white;
+ cursor:pointer;
+ -webkit-box-shadow: none;
+ -moz-box-shadow: none;
+ }
+ .walledgardenlogin input.action_button:hover,
+ .walledgardenlogin input.action_button:focus {
+ background-position:0 -15px;
+ background-image: url(<?php echo elgg_get_site_url(); ?>_graphics/button_background.gif);
+ background-repeat: repeat-x;
+ color:#111111;
+ text-decoration: none;
+ background-color:#cccccc;
+ border:1px solid #999999;
+ }
+ .walledgardenlogin .action_button.elgg-state-disabled {
+ color:#999999;
+ padding:2px 7px;
+ }
+
+ /* override some elgg system message styles */
+ #walledgarden_sysmessages {
+ position: absolute;
+ width:100%;
+ text-align: center;
+ margin:0 auto;
+ top:0;
+ z-index:9600;
+ }
+ #walledgarden_sysmessages #elgg-system-message {
+ width: 515px;
+ max-width: 515px;
+ right:auto;
+ margin:30px auto 0 auto;
+ position: relative;
+ }
+
+
+ #lostpassword_form,
+ #registration_form {
+ right:0;
+ position:absolute;
+ top:0;
+ width:260px;
+ background-color: white;
+ padding:0;
+ background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_top.gif) no-repeat left top;
+ height:auto;
+ }
+ #hiddenform_body {
+ padding:30px 40px 0 40px;
+ height:auto;
+ }
+ #hiddenform_bottom {
+ margin:0 auto;
+ background: url(<?php echo elgg_get_site_url(); ?>_graphics/walled_garden_backgroundfull_bottom.gif) no-repeat left bottom;
+ width:563px;
+ height:54px;
+ position: relative;
+ }
+
+ #hiddenform_body .cancel_request {
+ margin-left:15px;
+ }
+
+ /* override some visual_captcha styles */
+ .walledgardenlogin .visual_captcha_choices {
+ margin:10px 0 0 0;
+ padding:0;
+ height:60px;
+ }
+ .walledgardenlogin ul.visual_captcha_choices li img {
+ width:50px;
+ height:auto;
+ }
+
+ </style>
+ <div id="walledgarden_sysmessages" class="clearfix">
+ <?php echo elgg_view('page/elements/messages', array('object' => $vars['sysmessages'])); ?>
+ </div>
+ <div id="walledgarden_container">
+ <div id="walledgarden" class="clearfix">
+ <div class="walledgardenintro clearfix">
+ <h1>Welcome to:<br /><?php echo $title; ?></h1>
+ </div>
+ <div class="walledgardenlogin clearfix">
+ <?php echo $vars['body']; ?>
+ </div>
+ </div>
+ <div id="walledgarden_bottom"></div>
+ </div>
+</body>
+</html> \ No newline at end of file
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-23 13:18:00 +0000