Merge branch 'master' of git://github.com/globaliist/ssf

Author: flavour

deployment-templates/models/000_config.py

@@ -64,8 +64,8 @@
 deployment_settings.auth.always_notify_approver = True
 
 # Base settings
-deployment_settings.base.system_name = T("Sahana Eden Humanitarian Management Platform")
-deployment_settings.base.system_name_short = T("Sahana Eden")
+deployment_settings.base.system_name = T("The Sahana Sunflower: A Community Portal")
+deployment_settings.base.system_name_short = T("Sahana Sunflower")
 
 # Set this to the Public URL of the instance
 deployment_settings.base.public_url = "http://127.0.0.1:8000"
@@ -182,7 +182,7 @@
     "none":T("none"),
     "christian":T("Christian"),
     "muslim":T("Muslim"),
-    "jew":T("Jew"),
+	"jewish":T("Jewish"),
     "buddhist":T("Buddhist"),
     "hindu":T("Hindu"),
     "bahai":T("Bahai"),

static/img/social/YouTube.png

@@ -4,9 +4,9 @@
 <p id="space" style="float: left; width: 23%; text-align: left;"></p>
 <p id="see also" style="float: left; width: 50%; text-align: center;">
 	<a href='http://sahanafoundation.org' target='_blank' title='{{=T("SahanaFoundation.org")}}'><img src='/{{=request.application}}/static/img/ssf/SSF.png' width='154' height='51' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation")}}' /></a> 
-	<a href='http://twitter.com/#!/sahanafoss' target='_blank' title='{{=T("@SahanaFOSS on Twitter")}}'><img src='/{{=request.application}}/static/img/social/twitter.gif' width='30' height='30' style='vertical-align: middle;' alt='{{=T("@SahanaFOSS on Twitter")}}' /></a> 
-	<a href='http://facebook.com/sahanasoftwarefoundation' target='_blank' title='{{=T("Sahana Software Foundation on Facebook")}}'><img src='/{{=request.application}}/static/img/social/facebook.png' width='28' height='28' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation on Facebook")}}' /></a> 
-	<a href='http://www.youtube.com/user/SahanaFOSS' target='_blank' title='{{=T("Sahana Software Foundation on YouTube")}}'><img src='/{{=request.application}}/static/img/social/YouTube.png' width='32' height='32' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation on YouTube")}}' /></a> 
+	<a href='http://twitter.com/#!/sahanafoss' target='_blank' title='{{=T("@SahanaFOSS on Twitter")}}'><img src='/{{=request.application}}/static/img/social/twitter.png' width='30' height='30' style='vertical-align: middle;' alt='{{=T("@SahanaFOSS on Twitter")}}' /></a> 
+	<a href='http://facebook.com/sahanasoftwarefoundation' target='_blank' title='{{=T("Sahana Software Foundation on Facebook")}}'><img src='/{{=request.application}}/static/img/social/facebook.png' width='30' height='30' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation on Facebook")}}' /></a> 
+	<a href='http://www.youtube.com/user/SahanaFOSS' target='_blank' title='{{=T("Sahana Software Foundation on YouTube")}}'><img src='/{{=request.application}}/static/img/social/YouTube.png' width='30' height='30' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation on YouTube")}}' /></a> 
 	<a href='http://slideshare.net/sahanafoss' target='_blank' title='{{=T("Sahana Software Foundation on Slideshare")}}'><img src='/{{=request.application}}/static/img/social/slideshare.png' width='30' height='30' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation on Slideshare")}}' /></a> 
 	<a href='http://www.flickr.com/photos/63240361@N02/' target='_blank' title='{{=T("Sahana Software Foundation on Flickr")}}'><img src='/{{=request.application}}/static/img/social/flickr.png' width='30' height='30' style='vertical-align: middle;' alt='{{=T("Sahana Software Foundation on Flickr")}}' /></a> 
 </p>