What would be the proper dress for a early dinner at The California Grill at the Contemporary Resort? The CM I spoke with suggested "khaki shorts and a polo/golf shirt for the gentlemen and khaki shorts/capris and a blouse for the ladies." Opinions, please!

I've posted in a couple of different threads about this but when DH and I dined there last week they were strictly enforcing the dress code. No Collared Shirt = No Food For You!
My DH was planning on wearing one to CG this summer. Maybe he should go with shorts and a polo shirt instead, if the collar is the issue. 