From: Richard Mathot <rim@odoo.com>
Date: Thu, 11 Dec 2014 09:13:53 +0000 (+0100)
Subject: [FIX] website: Odoo's social URLs
X-Git-Url: http://git.inspyration.org/?p=odoo%2Fodoo.git;a=commitdiff_plain;h=657371a061c0b8a188236e3182e6e95570b5013c

[FIX] website: Odoo's social URLs
---

diff --git a/addons/website/data/demo.xml b/addons/website/data/demo.xml
index e72c05d..70fe9fb 100644
--- a/addons/website/data/demo.xml
+++ b/addons/website/data/demo.xml
@@ -3,10 +3,10 @@
     <data>
 
         <record id="default_website" model="website">
-            <field name="social_twitter">https://twitter.com/odooapps</field>
+            <field name="social_twitter">https://twitter.com/Odoo</field>
             <field name="social_facebook">https://www.facebook.com/Odoo</field>
             <field name="social_googleplus">https://plus.google.com/+Odooapps</field>
-            <field name="social_linkedin">http://www.linkedin.com/company/odoo</field>
+            <field name="social_linkedin">https://www.linkedin.com/company/odoo</field>
         </record>
 
         <record id="base.main_company" model="res.company">
@@ -135,10 +135,10 @@ response = request.render("website.template_partner_comment", values)
 
         <record id="website2" model="website">
             <field name="name">0.0.0.0</field>
-            <field name="social_twitter">https://twitter.com/odooapps</field>
+            <field name="social_twitter">https://twitter.com/Odoo</field>
             <field name="social_facebook">https://www.facebook.com/Odoo</field>
             <field name="social_googleplus">https://plus.google.com/+Odooapps</field>
-            <field name="social_linkedin">http://www.linkedin.com/company/odoo</field>
+            <field name="social_linkedin">https://www.linkedin.com/company/odoo</field>
             <field name="language_ids" eval="[(6, 0, [ ref('base.lang_en')])]"/>
             <field name="default_lang_id" ref="base.lang_en"/>
         </record>
diff --git a/addons/website/views/res_config.xml b/addons/website/views/res_config.xml
index 91fb3aa..b0d0821 100644
--- a/addons/website/views/res_config.xml
+++ b/addons/website/views/res_config.xml
@@ -29,13 +29,13 @@
                             <label for="social_twitter"/>
                             <div name="social_twitter">
                                 <div class="oe_inline">
-                                    <field name="social_twitter" placeholder="https://twitter.com/openerp"/>
+                                    <field name="social_twitter" placeholder="https://twitter.com/Odoo"/>
                                 </div>
                             </div>
                             <label for="social_facebook"/>
                             <div name="social_facebook">
                                 <div class="oe_inline">
-                                    <field name="social_facebook" placeholder="https://facebook.com/openerp"/>
+                                    <field name="social_facebook" placeholder="https://www.facebook.com/Odoo"/>
                                 </div>
                             </div>
                             <label for="social_github"/>
@@ -47,19 +47,19 @@
                             <label for="social_linkedin"/>
                             <div name="social_linkedin">
                                 <div class="oe_inline">
-                                    <field name="social_linkedin" placeholder="http://www.linkedin.com/company/openerp"/>
+                                    <field name="social_linkedin" placeholder="https://www.linkedin.com/company/odoo"/>
                                 </div>
                             </div>
                             <label for="social_youtube"/>
                             <div name="social_youtube">
                                 <div class="oe_inline">
-                                    <field name="social_youtube" placeholder="http://www.youtube.com/channel/HCU842OHPPNrQ"/>
+                                    <field name="social_youtube" placeholder="https://www.youtube.com/user/OpenERPonline"/>
                                 </div>
                             </div>
                             <label for="social_googleplus"/>
                             <div name="social_googleplus">
                                 <div class="oe_inline">
-                                    <field name="social_googleplus" placeholder="https://plus.google.com/+openerp"/>
+                                    <field name="social_googleplus" placeholder="https://plus.google.com/+Odooapps"/>
                                 </div>
                             </div>
                         </group>
diff --git a/addons/website/views/website_views.xml b/addons/website/views/website_views.xml
index 8507d1d..553ac1b 100644
--- a/addons/website/views/website_views.xml
+++ b/addons/website/views/website_views.xml
@@ -32,11 +32,11 @@
                     <div name="social_media">
                         <separator string="Social Media"/>
                         <group name="social_media">
-                            <field name="social_twitter" placeholder="https://twitter.com/odooapps"/>
-                            <field name="social_facebook" placeholder="https://facebook.com/odoo"/>
+                            <field name="social_twitter" placeholder="https://twitter.com/Odoo"/>
+                            <field name="social_facebook" placeholder="https://www.facebook.com/odoo"/>
                             <field name="social_googleplus" placeholder="https://plus.google.com/+Odooapps"/>
-                            <field name="social_linkedin" placeholder="http://www.linkedin.com/company/odoo"/>
-                            <field name="social_youtube" placeholder="https://www.youtube.com/channel/UCkQPikELWZFLgQNHd73jkdg"/>
+                            <field name="social_linkedin" placeholder="https://www.linkedin.com/company/odoo"/>
+                            <field name="social_youtube" placeholder="https://www.youtube.com/user/OpenERPonline"/>
                             <field name="social_github" placeholder="https://youraccount.github.io"/>
                         </group>
                     </div>