Make it more obvious that a format string constant is a format string by appending _FMT. Patch by: Todd Larsen

Fix getKeyValues() method footprint mismatches in soc.logic.models.site.Logic after the recent refactoring. Remove 'Link scope' drop-down from Edit Site Settings form. Patch by: Todd Larsen

Add a page name for 'Edit Main Site Settings'

Refactor classes in soc/logic/models to make more use of inheritance. Add some missing classes, such as soc.logic.models.group.Logic, so that key name similarities between various Groups can be exploited via inheritance instead of repetition of code. Patch by: Todd Larsen

Replace HomeSettings with Presence Model class. Replace SiteSettings with Site Model class. Derive Group Model class from Presence, adding the "home page settings" properties in a Melange site presence to every Group. Patch by: Todd Larsen

Move LINK_ID and SCOPE_PATH regular expressions to soc/models/linkable.py. Fix some too-long lines. Change key names back to type:scope_path/link_id (instead of type:scope_path:link_id). Some minor __doc__ string updates. Patch by: Todd Larsen

Removed unnecesary lines according to comment on r1067 Patch by: Lennard de Rijk

Make editSelf() work by adding 'inheritance_line' to the list of excluded fields in the UserForm. Also, fix a few too-long lines and add some missing parentheses (the style guide says do not rely on operator precedence). Patch by: Todd Larsen

Remove imports of the soc.logic.key_name module, since it was deleted by r1071 (and wasn't referenced in these modules anyway). Patch by: Todd Larsen

Replace nick_name and its variants with public_name. Remove the soc/templates/soc/person/edit.html template, since it does not appear to be referenced anywhere (and contained a nick_name reference that would otherwise need to be remedied). Patch by: Todd Larsen