From 1596e227843722315f2a364af51015b97e7bc615 Mon Sep 17 00:00:00 2001 From: ewinslow Date: Fri, 11 Feb 2011 18:32:44 +0000 Subject: Fixes #1303: Pulled html_begin/end into page shells. extracted element into page/elements/head git-svn-id: http://code.elgg.org/elgg/trunk@8112 36083f99-b078-4883-b0ff-0f9b5a30f544 --- views/default/page/elements/head.php | 83 +++++ views/default/page/elements/html_begin.php | 89 ----- views/default/page/elements/html_end.php | 8 - views/default/page/shells/admin.php | 17 +- views/default/page/shells/default.php | 27 +- views/default/page/shells/walled_garden.php | 523 ++++++++++++++-------------- 6 files changed, 373 insertions(+), 374 deletions(-) create mode 100644 views/default/page/elements/head.php delete mode 100644 views/default/page/elements/html_begin.php delete mode 100644 views/default/page/elements/html_end.php (limited to 'views') diff --git a/views/default/page/elements/head.php b/views/default/page/elements/head.php new file mode 100644 index 000000000..0cd3284c8 --- /dev/null +++ b/views/default/page/elements/head.php @@ -0,0 +1,83 @@ + + +END; +} else { + $feedref = ""; +} + +$js = elgg_get_js('head'); +$css = elgg_get_css(); + +$version = get_version(); +$release = get_version(true); +?> + + + + + + <?php echo $title; ?> + + + + + + + + + + + + diff --git a/views/default/page/elements/html_begin.php b/views/default/page/elements/html_begin.php deleted file mode 100644 index 6a461d767..000000000 --- a/views/default/page/elements/html_begin.php +++ /dev/null @@ -1,89 +0,0 @@ - - -END; -} else { - $feedref = ""; -} - -$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); -?> - - - - - - - <?php echo $title; ?> - - - - - - - - - - - - - - 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 @@ - - - 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"); +?> + + + + +
+ +
+ -echo elgg_view('page/elements/html_begin', $vars); - -echo '
'; -echo $vars['body']; -echo '
'; - -echo elgg_view('page/elements/html_end', $vars); \ No newline at end of file + \ 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 '
'; -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 '
'; - -echo elgg_view('page/elements/html_end', $vars); +?> + + + + +
+ $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); +?> +
+ + \ 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 ?> - - - $vars['sysmessages'])); - -echo "
$view
"; -echo '
'; -echo "

Welcome to:
$title

"; -echo "
{$vars['body']}
"; -echo '
'; -echo '
'; -echo '
'; - -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(_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(_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(_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(_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(_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(_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; + } + + +
+ $vars['sysmessages'])); ?> +
+
+
+
+

Welcome to:

+
+
+ +
+
+
+
+ + \ No newline at end of file -- cgit v1.2.3