aboutsummaryrefslogtreecommitdiff
path: root/views
diff options
context:
space:
mode:
authorbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-08 17:00:48 +0000
committerbrettp <brettp@36083f99-b078-4883-b0ff-0f9b5a30f544>2010-03-08 17:00:48 +0000
commitb0d8cb4a7653320826ab30c49579720f33d2abc3 (patch)
tree8b3735bf3f4d97a6f98aee7d065ef045f87ce1de /views
parent1336b9e8ed9cc3f9b9b9c4427f1e0f8bccc96f7d (diff)
downloadelgg-b0d8cb4a7653320826ab30c49579720f33d2abc3.tar.gz
elgg-b0d8cb4a7653320826ab30c49579720f33d2abc3.tar.bz2
Commenting out old (hopefully unneeded) jquery hack.
git-svn-id: http://code.elgg.org/elgg/trunk@5305 36083f99-b078-4883-b0ff-0f9b5a30f544
Diffstat (limited to 'views')
-rw-r--r--views/default/page_elements/html_begin.php18
1 files changed, 11 insertions, 7 deletions
diff --git a/views/default/page_elements/html_begin.php b/views/default/page_elements/html_begin.php
index 6836c5ee4..68a6950c2 100644
--- a/views/default/page_elements/html_begin.php
+++ b/views/default/page_elements/html_begin.php
@@ -27,7 +27,7 @@ if (isset($autofeed) && $autofeed == true) {
$feedref = <<<END
<link rel="alternate" type="application/rss+xml" title="RSS" href="{$url}" />
-
+
END;
} else {
$feedref = "";
@@ -49,7 +49,7 @@ $release = get_version(true);
<title><?php echo $title; ?></title>
<link REL="SHORTCUT ICON" HREF="<?php echo $vars['url']; ?>_graphics/favicon.ico">
- <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.min.js"></script>
+ <script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-1.4.min.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery-ui-1.7.2.min.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/jquery.form.js"></script>
<script type="text/javascript" src="<?php echo $vars['url']; ?>vendors/jquery/custom-form-elements.js"></script>
@@ -58,11 +58,15 @@ $release = get_version(true);
<?php
echo $feedref;
echo elgg_view('metatags',$vars);
+
+ // this was previously required because of an odd browser canvas drawing bug
+ // in firefox. It seems to not be require with the new layout...?
+// <script type="text/javascript">
+// jQuery(document).ready(function($) {
+// });
+// </script>
+
?>
- <script type="text/javascript">
- jQuery(document).ready(function($) {
- });
- </script>
<?php
global $pickerinuse;
@@ -80,7 +84,7 @@ $release = get_version(true);
<!--[if IE 6]>
<link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie6.php" />
<![endif]-->
-
+
<!--[if gt IE 6]>
<link rel="stylesheet" type="text/css" href="<?php echo $vars['url']; ?>mod/elgg_layout/css_ie.php" />
<![endif]-->