The Houston City Council has approved a controversial nondiscrimination ordinance broadening civil rights legislation to include sexual orientation and gender identity, but opposition pastors continue to fight the law, hoping to put it before voters this fall.