I would hope the City engages in a full-court press on domestic partner benefits, even as the City brings a tight enough game to the table with the county on many other things. Agreed.
IMO, marriage no civil right. Those partnership benefits which government chooses to accord this thing we call marriage are civil rights by way of equal protection. Marriage is an issue to take up among religious institutions, and partnership benefits are an issue to take up among those who, by law or by custom, accord these benefits.