Merge pull request #932 from gannetson/project-links

Fix links on project detail

apps/projects/static/js/bluebottle/projects/models.js

@@ -47,18 +47,37 @@ App.Organization = DS.Model.extend({
     website: DS.attr('string', {defaultValue: ""}),
     facebook: DS.attr('string', {defaultValue: ""}),
     twitter: DS.attr('string', {defaultValue: ""}),
-    skype: DS.attr('string', {defaultValue: ""}),
-
 
+    websiteUrl: function(){
+        var website = this.get('website');
+        if (website) {
+            if (website.substr(0, 4) != 'http') {
+                return 'http://' + website;
+            }
+            return website;
+        }
+        return "";
+    }.property('website'),
     facebookUrl: function(){
-        return this.get('facebook');
+        var facebook = this.get('facebook');
+        if (facebook) {
+            if (facebook.substr(0, 4) != 'http') {
+                return 'http://' + facebook;
+            }
+            return facebook;
+        }
+        return "";
     }.property('facebook'),
     twitterUrl: function(){
-        return this.get('twitter');
+        var twitter = this.get('facebook');
+        if (twitter) {
+            if (twitter.substr(0, 4) != 'http') {
+                return 'http://' + twitter;
+            }
+            return twitter;
+        }
+        return "";
     }.property('twitter'),
-    skypeUrl: function(){
-        return 'callto:' + this.get('skype');
-    }.property('skype'),
 
     // Legal
     legalStatus: DS.attr('string', {defaultValue: ""})

apps/projects/templates/projects.hbs

@@ -436,12 +436,11 @@
                 	    <h2>{% trans "Organisation" %}</h2>
     				    <h3>{{organization.name}}</h3>
                         <p>{{organization.description}}</p>
-
-
+
                         {{#if organization.website}}
                             <dl>
                                 <dt><span class="flaticon solid link-1"></span> Website</dt>
-                                <dd><a href="{{organization.website}}">{{organization.website}}</a></dd>
+                                <dd><a {{bindAttr href=organization.websiteUrl}}>{{organization.website}}</a></dd>
                             </dl>
                         {{/if}}
                         {{#if organization.twitter}}
@@ -456,12 +455,6 @@
                                 <dd><a {{bindAttr href=organization.facebookUrl}}>{{organization.facebook}}</a></dd>
                             </dl>
                         {{/if}}
-                        {{#if organization.skype}}
-                            <dl>
-                                <dt><span class="flaticon social skype-2"></span> Skype</dt>
-                                <dd><a {{bindAttr href=organization.skypeUrl}}>{{organization.skype}}</a></dd>
-                            </dl>
-                        {{/if}}
                         </ul>
     				</article>	
                 {{/if}}