From 4273ea2246e280334d11edb5a8063a892c7beaf5 Mon Sep 17 00:00:00 2001
From: Rix <Me@Rix.xxx>
Date: Sun, 7 Oct 2012 13:36:24 +0800
Subject: [PATCH] Revert "fixes"

This reverts commit 82fb1b4e32ba284e20151d9ad9f067d3dfeae90d.
---
 client/css/style.css | 2 +-
 client/js/script.js  | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/client/css/style.css b/client/css/style.css
index c7fd968..d8f0115 100644
--- a/client/css/style.css
+++ b/client/css/style.css
@@ -124,7 +124,7 @@ div.notice.general{
 	margin-bottom: 10px;
 }
 
-div.notice.common{
+div.notice.general.common{
 	border-color:rgba(145, 255, 5, 0.5);
 	background-color:rgba(18, 150, 0, 0.6);
 	color:#AAFF83;
diff --git a/client/js/script.js b/client/js/script.js
index d9ed5ac..547cfc1 100644
--- a/client/js/script.js
+++ b/client/js/script.js
@@ -177,7 +177,7 @@ $(document)
 
 // Match with the notice table and handel the notice messages
 function notice_handler(notice_key, target) {
-	notice_key = (typeof notice_key == 'undefined' || notice_key == '' || notice_key == null || typeof notice_table[notice_key] == 'undefined') ? 'unknown_error' : notice_key;
+	notice_key = (typeof notice_key == 'undefined') ? 'unknown_error' : notice_key;
 	target = (typeof target == 'undefined') ? '' : target;
 	if(target != '') {
 		add_card_notice(target, notice_table[notice_key].message, notice_table[notice_key].style, notice_table[notice_key].delay);
@@ -372,7 +372,7 @@ function book_meal_start() {
 			}
 		}
 
-		if((forum_uid < 1) && (typeof card_psw == 'undefined' || card_psw == '' || card_psw == null)) {
+		if((forum_uid < 1) && (typeof card_psw == 'undefined' && card_psw != '' && card_psw != null)) {
 			notice_handler('no_password', card_no);
 		} else {
 			card_e(card_no, 'btn')
@@ -414,7 +414,7 @@ function book_meal_start() {
 function card_e(card_no, target) {
 	var table = $(card_table);
 	target = (typeof target == 'undefined') ? '' : target;
-	e_card_no_input = table.find('input[value=' + card_no + ']:first');
+	e_card_no_input = table.find('input[value="' + card_no + '"]:first');
 	switch(target) {
 	case 'tr':
 		return e_card_no_input.closest('tr');
@@ -429,7 +429,7 @@ function card_e(card_no, target) {
 		break;
 	case 'btn':
 		return e_card_no_input.closest('tr')
-			.find('a[name=card_btn]:first');
+			.find('a[name="card_btn"]:first');
 		break;
 	}
 	return e_card_no_input;