School board approves diversity plan in wake of charter school questions