From b0aabd0559eb6ca70af2ffeb35299b63d7edf097 Mon Sep 17 00:00:00 2001
From: Starla Insigna <hatkirby@fourisland.com>
Date: Sat, 3 Oct 2009 15:24:04 -0400
Subject: Fixed voting issue

Because XHTML was accidentally disabled in the previous changeset, a new error was found that, when in HTML mode (required for IE and layouts prior to 7),
voting did not work due to the encoded ampherstand in the query string. This is odd because what works in XHTML should also work in HTML. So, to fix this,
XHTML was re-enabled and now the ampherstand is only encoded when XHTML mode is on.

Also fixed some positioning errors with the tails of bubbles.
---
 theme/comments.tpl          | 4 +---
 theme/css/bubbles.css       | 2 --
 theme/layouts/4.5/style.css | 8 ++++++++
 theme/layouts/6.2/style.css | 8 ++++++++
 theme/layouts/7/style.css   | 7 +++++++
 theme/post.tpl              | 6 +++---
 theme/quotes/browse.tpl     | 2 +-
 7 files changed, 28 insertions(+), 9 deletions(-)

(limited to 'theme')

diff --git a/theme/comments.tpl b/theme/comments.tpl
index 5e1c564..9c86009 100755
--- a/theme/comments.tpl
+++ b/theme/comments.tpl
@@ -1,8 +1,6 @@
-<a name="comments" />
+<a name="comments"></a>
 
 <!--BEGIN COMMENTS-->
-<a name="comment-<!--COMMENTS.ID-->" />
-
 <!--BEGIN COMMENTS.EDITOR-->
 <form action="/edit-comment.php?id=<!--COMMENTS.ID-->" method="post">
 <!--END COMMENTS.EDITOR-->
diff --git a/theme/css/bubbles.css b/theme/css/bubbles.css
index 68a3cc4..29c9930 100755
--- a/theme/css/bubbles.css
+++ b/theme/css/bubbles.css
@@ -8,7 +8,6 @@
 
 div.module + cite {
 	position: relative;
-	top: -0.15em;
 	left: 0.2em;
 	margin: 0;
 	padding: 15px 0px 0px 15px;
@@ -18,7 +17,6 @@ div.module + cite {
 }
 
 div.module.unrounded + cite {
-	top: -0.5em;
 	padding-top: 10px;
 }
 
diff --git a/theme/layouts/4.5/style.css b/theme/layouts/4.5/style.css
index b8afbbb..7e9b574 100644
--- a/theme/layouts/4.5/style.css
+++ b/theme/layouts/4.5/style.css
@@ -231,3 +231,11 @@ div#flash {
 * > html div#flash {
  position: absolute;
 }
+
+div.module + cite {
+	top: -0.15em;
+}
+
+div.module.unrounded + cite {
+	top: -0.4em;
+}
diff --git a/theme/layouts/6.2/style.css b/theme/layouts/6.2/style.css
index 53f3556..e68f7f8 100644
--- a/theme/layouts/6.2/style.css
+++ b/theme/layouts/6.2/style.css
@@ -245,3 +245,11 @@ span.post-vote {
  position: relative;
  top: -20px;
 }
+
+div.module + cite {
+	top: -0.15em;
+}
+
+div.module.unrounded + cite {
+	top: -0.4em;
+}
diff --git a/theme/layouts/7/style.css b/theme/layouts/7/style.css
index c16bdfa..e90ee05 100644
--- a/theme/layouts/7/style.css
+++ b/theme/layouts/7/style.css
@@ -181,3 +181,10 @@ div#sidebar ul li.active a, div#sidebar ul li a:hover {
 	color: black;
 }
 
+div.module + cite {
+	top: -0.4em;
+}
+
+div.module.unrounded + cite {
+	top: -0.7em;
+}
diff --git a/theme/post.tpl b/theme/post.tpl
index 2c65e51..7bf5481 100755
--- a/theme/post.tpl
+++ b/theme/post.tpl
@@ -7,13 +7,13 @@
 
 function ratePost(id, dir)
 {
-	jQuery("#post-"+id+" .post-rating-up").addClass("post-action-done").html("&lt;img src='/theme/images/icons/thumb_up.png' alt='+1' /&gt;");
-	jQuery("#post-"+id+" .post-rating-down").addClass("post-action-done").html("&lt;img src='/theme/images/icons/thumb_down.png' alt='-1' /&gt;");
+	jQuery("#post-"+id+" .post-rating-up").addClass("post-action-done").html("<!--IFXLT-->img src='/theme/images/icons/thumb_up.png' alt='+1' /<!--IFXGT-->");
+	jQuery("#post-"+id+" .post-rating-down").addClass("post-action-done").html("<!--IFXLT-->img src='/theme/images/icons/thumb_down.png' alt='-1' /<!--IFXGT-->");
 	jQuery("#flash").text("Processing....").slideDown();
 	jQuery.ajax({
 		type: "GET",
 		url: "/vote.php",
-		data: "id="+id+"&amp;dir="+dir,
+		data: "id="+id+"<!--IFXAMP-->dir="+dir,
 		dataType: "text",
 		success: function(msg) {
 			if (msg != "")
diff --git a/theme/quotes/browse.tpl b/theme/quotes/browse.tpl
index d710d3f..24afd14 100755
--- a/theme/quotes/browse.tpl
+++ b/theme/quotes/browse.tpl
@@ -10,7 +10,7 @@ function voteQuote(id, dir)
 	jQuery.ajax({
 		type: "GET",
 		url: "/quotes/vote.php",
-		data: "id="+id+"&amp;dir="+dir,
+		data: "id="+id+"<!--IFXAMP-->dir="+dir,
 		dataType: "text",
 		success: function(msg) {
 			if (msg != "")
-- 
cgit 1.4.1