From 75dea2cc14befd1dd867e2626fd16e96862bba32 Mon Sep 17 00:00:00 2001
From: Miguel Freitas <miguelfreitas@users.noreply.github.com>
Date: Thu, 10 Apr 2014 18:24:03 -0300
Subject: [PATCH] merge tox and bitmessage support from calm

---
 css/profile.css       |  74 ++++++++++++++++++++++++++++++++++++++++--
 home.html             |  15 ++++++---
 img/bm.png            | Bin 0 -> 4928 bytes
 img/tox.png           | Bin 0 -> 3093 bytes
 js/twister_actions.js |   2 ++
 js/twister_io.js      |  24 ++++++++++++++
 js/twister_user.js    |  10 ++++++
 profile-edit.html     |   2 ++
 8 files changed, 120 insertions(+), 7 deletions(-)
 create mode 100644 img/bm.png
 create mode 100644 img/tox.png

diff --git a/css/profile.css b/css/profile.css
index 9559745..e337f4a 100644
--- a/css/profile.css
+++ b/css/profile.css
@@ -11,6 +11,7 @@
 .profile-card-main
 {
     width: 540px;
+    padding: 10px;
     text-align: center;
     position: relative;
     transition: all .2s linear;
@@ -91,6 +92,8 @@
 .forEdition .profile-card-photo
 {
     border: solid 2px #fff;
+    border-radius: 0%;
+    float:none;
     position: relative;
     cursor: pointer;
     transition: all .2s linear;
@@ -145,6 +148,12 @@
 {
     display: inline-block;
 }
+.forEdition .profile-card-main .input-tox,
+.forEdition .profile-card-main .input-bitmessage
+{
+    width: 90%;
+    margin-top: 10px;
+}
 .profile-edition-buttons
 {
     padding: 10px;
@@ -170,11 +179,72 @@
     height: 90%;
 }
 .profile-modal .profile-bio,
-.profile-modal .profile-contact
 {
    min-height: 27px;
    overflow-y: visible;
 }
+#msngrswr {
+    display: none;
+    margin-top: 20px;
+    height: 30px;
+}
+#toxbtnwr, #bmbtnwr {
+    float: left;
+    display: none;
+}
+.bitmessage-ctc, .tox-ctc {
+    height: 30px;
+    width: 30px;
+    display: inline-block;
+    margin-right: 5px;
+    border: 1px solid #d6d8dc;
+    background: #e3e5ea url(img/clipboard.png) center no-repeat;
+    opacity: .8;
+    -webkit-border-radius: 0 5px 5px 0;
+    -moz-border-radius: 0 5px 5px 0;
+    border-radius: 0 5px 5px 0;
+    -webkit-transition: all 20ms;
+    -moz-transition: all 20ms;
+    -ms-transition: all 20ms;
+    -o-transition: all 20ms;
+    transition: all 20ms;
+}
+.bitmessage-ctc:hover, .tox-ctc:hover {
+    background-color: #f0f2f8;
+    opacity: 1;
+    cursor: pointer;
+}
+.bitmessage-ctc:active, .tox-ctc:active {
+    background-color: #edfced;
+}
+.profile-modal .profile-tox, .profile-modal .profile-bitmessage {
+    display: inline-block;
+    width: 70px;
+    height: 30px;
+    border: 1px solid #c0c2c6;
+    opacity: .8;
+    -webkit-border-radius: 5px 0 0 5px;
+    -moz-border-radius: 5px 0 0 5px;
+    border-radius: 5px 0 0 5px;
+    -webkit-transition: all 200ms;
+    -moz-transition: all 200ms;
+    -ms-transition: all 200ms;
+    -o-transition: all 200ms;
+    transition: all 200ms;
+}
+.profile-modal .profile-tox:hover, .profile-modal .profile-bitmessage:hover {
+    opacity: 1;
+    background-color: #f0f2f8;
+}
+.profile-modal .profile-tox:active, .profile-modal .profile-bitmessage:active {
+    background-color: #edfced;
+}
+.profile-modal .profile-tox {
+    background: #e3e5ea url(../img/tox.png) center no-repeat;
+}
+.profile-modal .profile-bitmessage {
+    background: #e3e5ea url(../img/bm.png) center no-repeat;
+}
 .profile-modal .profile-data
 {
     display: inline-block;
@@ -241,4 +311,4 @@ h2.profile-screen-name {
 
 .profile-modal .modal-buttons {
    display: none;
-}
\ No newline at end of file
+}
diff --git a/home.html b/home.html
index af21dc7..489e5d5 100644
--- a/home.html
+++ b/home.html
@@ -374,11 +374,16 @@
               <img class="profile-card-photo" src="img/grayed_avatar_placeholder_24.png"/>
               <h1 class="profile-name"></h1>
               <h2 class="profile-screen-name">@<b></b></h2>
-              <div class="profile-contact">
-                <span class="profile-location"></span>
-                <a class="profile-url" rel="nofollow" target="_blank"></a>
-              </div>
-              <div class="profile-bio">
+              <span class="profile-location"></span>
+              <a class="profile-url" rel="nofollow" target="_blank"></a>
+              <div class="profile-bio"></div>
+              <div id="msngrswr">
+                <div id="toxbtnwr">
+                  <a class="profile-tox"></a><a class="tox-ctc"></a>
+                </div>
+                <div id="bmbtnwr">
+                  <a class="profile-bitmessage"></a><a class="bitmessage-ctc"></a>
+                </div>
               </div>
             </div>
             <ul class="module profile-data">
diff --git a/img/bm.png b/img/bm.png
new file mode 100644
index 0000000000000000000000000000000000000000..0b5afc10beff9ee14751590f62d382d48a922222
GIT binary patch
literal 4928
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%0AsEjvl
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
TYssGf-Il=B?yFWRn}z-ZEut)r

literal 0
HcmV?d00001

diff --git a/img/tox.png b/img/tox.png
new file mode 100644
index 0000000000000000000000000000000000000000..69ea4f6f802af14d94edb2a445d4be0f1b56cce4
GIT binary patch
literal 3093
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

literal 0
HcmV?d00001

diff --git a/js/twister_actions.js b/js/twister_actions.js
index 168f12e..d6c14c8 100644
--- a/js/twister_actions.js
+++ b/js/twister_actions.js
@@ -170,6 +170,8 @@ function updateProfileData(profileModalContent, username) {
     getLocation( username, profileModalContent.find(".profile-location") );
     getWebpage( username, profileModalContent.find(".profile-url") );
     getBio( username, profileModalContent.find(".profile-bio") );
+    getTox( username, profileModalContent.find(".profile-tox") );
+    getBitmessage( username, profileModalContent.find(".profile-bitmessage") );
     getAvatar( username, profileModalContent.find(".profile-card-photo") );
     getPostsCount( username,  profileModalContent.find(".posts-count") );
     getFollowers( username, profileModalContent.find(".followers-count") );
diff --git a/js/twister_io.js b/js/twister_io.js
index dfccaa6..34e6fee 100644
--- a/js/twister_io.js
+++ b/js/twister_io.js
@@ -219,6 +219,30 @@ function getBio( username, item ){
     getProfileResource( username, "bio", item);
 }
 
+// get tox address and store it in item.text
+function getTox( username, item ){
+    getProfileResource( username, "tox", false, function(item, text){
+        item.empty();
+        if(text) {
+            item.attr('href', 'tox:'+text);
+            item.next().attr('data', text);
+            item.parent().show().parent().show();
+        }
+    }, item);
+}
+
+// get bitmessage address and store it in item.text
+function getBitmessage( username, item ){
+    getProfileResource( username, "bitmessage", false, function(item, text){
+        item.empty();
+        if(text) {
+            item.attr('href', 'bitmsg:'+text+'?action=add&label='+username);
+            item.next().attr('data', text);
+            item.parent().show().parent().show();
+        }
+    }, item);
+}
+
 // get location and store it in item.text
 function getLocation( username, item ){
     getProfileResource( username, "location", item);
diff --git a/js/twister_user.js b/js/twister_user.js
index 6755a80..8acd60b 100644
--- a/js/twister_user.js
+++ b/js/twister_user.js
@@ -247,6 +247,10 @@ function loadProfileForEdit() {
                        $(".input-city").val(profile.location);
                    if( "url" in profile)
                        $(".input-website").val(profile.url);
+                   if( "tox" in profile)
+                       $(".input-tox").val(profile.tox);
+                   if( "bitmessage" in profile)
+                       $(".input-bitmessage").val(profile.bitmessage);
                }
            }, {} );
 }
@@ -258,6 +262,12 @@ function saveProfile(e)
     profile["bio"]      = $(".input-description").val();
     profile["location"] = $(".input-city").val();
     profile["url"]      = $(".input-website").val();
+    var tox = $(".input-tox").val();
+    if( tox.length )
+        profile["tox"]  = tox;
+    var bitmessage = $(".input-bitmessage").val();
+    if( bitmessage.length )
+        profile["bitmessage"] = bitmessage;
     dhtput( defaultScreenName, "profile", "s",
             profile, defaultScreenName, ++profileSeqNum );
     var avatarData = $(".profile-card-photo.forEdition").attr("src");
diff --git a/profile-edit.html b/profile-edit.html
index fce8f48..53c3e13 100644
--- a/profile-edit.html
+++ b/profile-edit.html
@@ -88,6 +88,8 @@
         <input type="text" class="input-description" placeholder="Describe yourself"/>
         <input type="text" class="input-city" placeholder="Location"/>
         <input type="text" class="input-website" placeholder="website"/>
+        <input type="text" class="input-tox" placeholder="Tox address"/>
+        <input type="text" class="input-bitmessage" placeholder="Bitmessage address"/>
       </div>
       <div class="profile-edition-buttons">
           <button class="toggle-priv-key" style="float: left" href="#">Secret Key</button>