Shall members of the legislative body of the City of Costa Mesa be elected by district as described in Ordinance No. 16-05, establishing six equal, geographically based districts, and the Mayor of the City of Costa Mesa elected on a citywide basis for a term of two years by the voters of the entire city, for a maximum of two terms?