City leaders move toward adopting ethics ordinance; voters weigh amending charter