Sorry - may be a bit late for you now, but shorts should be over the knee for men, I wore trousers but the other member of the party wore long shorts.
Shirts should cover the shoulders, I made the mistake of wearing a square cut T shirt, actually has very short sleeves) one night and enough of my shoulder was on view for it to get me sent out to change!

The stricter codes only apply in the evening.