Merge pull request #694 from SISheogorath/refactor/socialmedia

Reorganize social media links and footer

Author: SISheogorath

locales/de.json

@@ -104,5 +104,6 @@
 	"OR": "Oder",
 	"Export to Snippet": "Zu Snippet exportieren",
 	"Select Visibility Level": "Sichtbarkeit bestimmen",
-	"Night Theme": "Nachtmodus"
+	"Night Theme": "Nachtmodus",
+	"Follow us on %s and %s.": "Folge uns auf %s und %s."
 }

locales/en.json

@@ -104,5 +104,6 @@
 	"OR": "OR",
 	"Export to Snippet": "Export to Snippet",
 	"Select Visibility Level": "Select Visibility Level",
-	"Night Theme": "Night Theme"
+	"Night Theme": "Night Theme",
+	"Follow us on %s and %s.": "Follow us on %s, and %s."
 }

locales/zh-CN.json

@@ -104,5 +104,6 @@
 	"Select Visibility Level": "选择可见层级",
 	"Night Theme": "夜间主题",
 	"Do you really want to delete this note?": "确定要删除这个文件吗？",
-	"All users will lose their connection.": "所有用户将失去连接"
+	"All users will lose their connection.": "所有用户将失去连接",
+	"Follow us on %s and %s.": "在%s和%s上关注我们"
 }

public/views/index/body.ejs

@@ -123,12 +123,6 @@
 
             <div class="mastfoot">
                 <div class="inner">
-                    <h6 class="social-foot">
-                        <iframe src="//ghbtns.com/github-btn.html?user=hackmdio&repo=hackmd&type=star&count=true" frameborder="0" scrolling="0" width="104px" height="20px"></iframe>
-                    </h6>
-                    <p>
-                        &copy; 2018 <a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a>
-                    </p>
                     <select class="ui-locale">
                         <option value="en">English</option>
                         <option value="zh-CN">简体中文</option>
@@ -152,6 +146,12 @@
                         <option value="eo">Esperanto</option>
                         <option value="da">dansk</option>
                     </select>
+                    <p>
+                        &copy; 2018 <a href="https://hackmd.io">HackMD</a> | <a href="<%- url %>/s/release-notes" target="_blank"><%= __('Releases') %></a>
+                    </p>
+                    <h6 class="social-foot">
+                        <%- __('Follow us on %s and %s.', '<a href="https://github.com/hackmdio/HackMD" target="_blank"><i class="fa fa-github"></i> GitHub</a>, <a href="https://twitter.com/hackmdio" target="_blank"><i class="fa fa-twitter"></i> Twitter</a>', '<a href="https://www.facebook.com/hackmdio" target="_blank"><i class="fa fa-facebook-square"></i> Facebook</a>') %>
+                    </h6>
                 </div>
             </div>
         </div>