merge conflict

src/css/main.css

@@ -946,6 +946,9 @@ footer {
 .icon-github {
   background-image: url("../img/icon-github.svg"); }
 
+.icon-email {
+  background-image: url("../img/icon-email.svg"); }
+
 .icon-twitter {
   background-image: url("../img/icon-twitter.svg"); }
 

src/js/common.js

@@ -88,7 +88,7 @@ $(function() {
     fade: {
       crossFade: true
     }
-});
+  });
   var swiper2 = new Swiper('.swiper2', {
     loop: true,
     autoplay: 2000,
@@ -108,6 +108,20 @@ $(function() {
     setTimeout(function(){
       $('#maitre-field-email input').focus();
     },1000);
-});
+  });
+  var shareLinkInput = $("#shareLinkInput");
+  
+  shareLinkInput.click(function(test) {
+    shareLinkInput.focus();
+    shareLinkInput[0].setSelectionRange(0, shareLinkInput.val().length);
+    try {
+      succeeded = document.execCommand('copy');
+    } catch (err) {
+      succeeded = false;
+    }
+    if (!succeeded) {
+      // Browser doesn't support execCommand
+    }
+  });
 
 });

src/post-receive.php

@@ -2,12 +2,17 @@
 $command = "cd /var/www/status-site && git reset --hard HEAD && git pull origin master && gulp build";
 
 // TODO check against ip or secret hash
-
+$log_file = "/var/www/status-site/build.log";
+file_put_contents($log_file, var_export($_SERVER, true), FILE_APPEND);
+$content = file_get_contents("php://input");
+file_put_contents($log_file, var_export($content, true), FILE_APPEND);
 if ( $_SERVER['HTTP_X_GITHUB_EVENT'] == 'push' ) {
 
     if( ($fp = popen($command, "r")) ) {
         while( !feof($fp) ){
-            echo fread($fp, 1024);
+            $result = fread($fp, 1024);
+            file_put_contents($log_file, $result, FILE_APPEND);
+            echo $result;
             flush();
         }
         fclose($fp);

src/sass/index.scss

@@ -971,6 +971,10 @@ footer {
   background-image: url('../img/icon-github.svg');
 }
 
+.icon-email {
+  background-image: url("../img/icon-email.svg");
+}
+
 .icon-twitter {
   background-image: url('../img/icon-twitter.svg');
 }

src/waitlist.html

@@ -104,7 +104,6 @@
                         jQuery("#maitre-verification").html(
                           "Remember to confirm your email to be added to the signup queue. <br /> Improve your position by referring your friends and spreading the word.");
                         jQuery("#maitre-people-behind-number").html("0");
-
                         jQuery(".gradient-text").empty();
 
                         jQuery("#maitre-share-plain-url").on('click', function () {

src/welcome.html

@@ -99,16 +99,16 @@
               <p>You'll be notifed when Status is ready to launch.<br /> Help us spread the word by inviting your friends! The more friends you invite, the sooner you'll get access: </p>
           
                <div class="footer-icons-social">
-                <a href="mailto:?&subject=Ethereum Mobile Client&body=Hey,%20I%20just%20signed%20up%20to%20Status%20-%20it's%20mobile%20client%20built%20on%20Ethereum,%20check%20it%20out!%20https%3A//status.im/invite/MAITRE_CODE" class="footer-icon icon-email" target="_blank"></a>
+                <a id="emailLink" href="#" class="footer-icon icon-email" target="_blank"></a>
 
-                <a href="https://twitter.com/home?status=I%20just%20signed%20up%20to%20%40ethstatus%20-%20an%20%23ethereum%20%23dapps%20browser%20for%20mobile%3A%20https%3A//status.im/invite/MAITRE_CODE" target="_blank" class="footer-icon icon-twitter"></a>
+                <a id="twitterLink" href="#" target="_blank" class="footer-icon icon-twitter"></a>
 
-                <a href="http://www.facebook.com/sharer.php?u=https%3A//status.im/invite/MAITRE_CODE" class="footer-icon icon-facebook"></a>
+                <a id="facebookLink" href="#" class="footer-icon icon-facebook"></a>
               </div>
 
                <p>Or share your unique link:</p><br/>
                <div class="status-email" style="width:314px;margin:auto">
-               <input type="email" value="https://status.im/invite/MAITRE_CODE" >
+               <input id="shareLinkInput" type="email" value="" >
               <div class="email">
 
             </div>
@@ -116,6 +116,18 @@
 
               </div>
             </div>
+            <script>
+            var maitreCode = getParameterByName('maitre_code'); // Referral Code
+            var maitrePosition = getParameterByName('maitre_position'); // Waitlist Position
+            var email = "mailto:?&subject=Ethereum Mobile Client&body=Hey,%20I%20just%20signed%20up%20to%20Status%20-%20it's%20mobile%20client%20built%20on%20Ethereum,%20check%20it%20out!%20https%3A//status.im/invite/" + maitreCode;
+            var twitter = "https://twitter.com/home?status=I%20just%20signed%20up%20to%20%40ethstatus%20-%20an%20%23ethereum%20%23dapps%20browser%20for%20mobile%3A%20https%3A//status.im/invite/" + maitreCode;
+            var facebook = "http://www.facebook.com/sharer.php?u=https%3A//status.im/invite/" + maitreCode;
+            var input = "https://status.im/invite/" + maitreCode;
+            document.getElementById("emailLink").href = email;
+            document.getElementById("twitterLink").href = twitter;
+            document.getElementById("facebookLink").href = facebook;
+            document.getElementById("shareLinkInput").value = input;
+            </script>
           </div>
         </div>
         <div class="table-right table-bottom">