--- a/views/index.jade	Fri Jun 06 14:42:28 2014 +0200
+++ b/views/index.jade	Sat Jun 07 10:22:12 2014 +0200
@@ -18,11 +18,11 @@
        var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(po, s);
       })();
 
-    
+
     // load googleplus api sign in
 
     script(type='text/javascript').
-    
+
 
      (function() {
      var po = document.createElement('script');
@@ -37,12 +37,12 @@
 
      gapi.signin.render('gp-root', {
       'callback': 'signinCallback',
-      'clientid': '460404084439-rgb5r2vh7hh8hvf2na65c7n1ofhmomek.apps.googleusercontent.com',
+      'clientid': 'GOOOGLEPLUSCLIENTID',
       'redirecturi': 'postmessage',
       'response_type' : 'code',
       'accesstype': 'offline',
       'approvalprompt': 'force',
-      'cookiepolicy': "https://do.blessuren.de:3000",
+      'cookiepolicy': "https://yourserver.org",
       'requestvisibleactions': 'http://schemas.google.com/AddActivity',
       'scope': 'https://www.googleapis.com/auth/plus.login https://www.googleapis.com/auth/userinfo.email'
      });
@@ -57,22 +57,22 @@
        // Hide the sign-in button now that the user is authorized, for example:
        //document.getElementById('signinButton').setAttribute('style', 'display: none');
        //alert('googleplus is ready for bridging');
-       
+
        gapi.client.load('plus', 'v1', function() {
           var request = gapi.client.plus.people.get({
             'userId': 'me'
           });
-          request.execute(function(resp) { 
-                                          //alert(JSON.stringify(resp)); 
+          request.execute(function(resp) {
+                                          //alert(JSON.stringify(resp));
                                           $('#gpstatus').html('<a href=' + resp.url + '> ' + resp.displayName + '</a>');
                                           var token = gapi.auth.getToken();
-                                          //alert(JSON.stringify(resp.id)); 
+                                          //alert(JSON.stringify(resp.id));
                                           $('#gpid').val(resp.id+'@google');
                                           $('#gptoken').val(token.access_token + ';' + token.code);
-                                         }); 
-       }); 
+                                         });
+       });
 
- 
+
      } else {
        // Update the app to reflect a signed out user
        // Possible error values:
@@ -83,7 +83,7 @@
       }
      }
 
-    script. 
+    script.
      // twitter stuff
      function getCookie(cname) {
        var name = cname + "=";
@@ -94,22 +94,23 @@
        }
        return "";
      }
-     
- 
+
+
 
     // load facebook api
     script.
      $(document).ready(function () {
-     
-         $('#twstatus').html('<a href=https://twitter.com/account/redirect_by_id/' + getCookie('twitterid') + '> ' + getCookie('twitteruser') + '</a>');
-       
+
+         var twstatus = getCookie('twitterid')
+         if (twstatus != "") $('#twstatus').html('<a href=https://twitter.com/account/redirect_by_id/' + twstatus + '> ' + getCookie('twitteruser') + '</a>');
+
          $.ajaxSetup({
              cache: true
          });
 
          $.getScript('//connect.facebook.net/en_UK/all.js', function () {
              FB.init({
-                 appId: '771281529571170',
+                 appId: 'FACEBOOKID',
                  status     : true
              });
 
@@ -118,7 +119,7 @@
                // the user is logged in and has authenticated your
                // app, and response.authResponse supplies
                // the user's ID, a valid access token, a signed
-               // request, and the time the access token 
+               // request, and the time the access token
                //  and signed request each expire
                var uid = response.authResponse.userID;
                var accessToken = response.authResponse.accessToken;
@@ -128,7 +129,7 @@
                  $('#fbid').val(response.id+'@facebook');
                 });
             } else if (response.status === 'not_authorized') {
-               // the user is logged in to Facebook, 
+               // the user is logged in to Facebook,
                // but has not authenticated your app
                $('#fbstatus').html('not authorized');
             } else {
@@ -136,10 +137,10 @@
                $('#fbstatus').html('not logged in');
             }
            });
- 
+
 
          });
-   
+
 
         $('.fbloginbutton').on('click', function(e){
            FB.login(function(response) {
@@ -157,12 +158,12 @@
         //$('.logoutbutton').on('click', function(e){
         //   FB.logout();
         // })
-        $('#pumpobj').val(JSON.stringify(!{JSON.stringify(user)})); 
+        $('#pumpobj').val(JSON.stringify(!{JSON.stringify(user)}));
            });
 
   body
    block content
-  .main 
+  .main
       h1(class='headline') pumpbridge.<br>connecting social networks
       #fb-root.fb-root
          input(id='fbloginbutton',type='image',class='fbloginbutton',value='fbLogin',src='images/fb.svg',width='100px',height='100px')
@@ -171,13 +172,20 @@
          //span.g-signin(data-scope='https://www.googleapis.com/auth/plus.login', data-clientid='460404084439-rgb5r2vh7hh8hvf2na65c7n1ofhmomek.apps.googleusercontent.com', data-redirecturi='postmessage', data-accesstype='offline', data-cookiepolicy='single_host_origin', data-callback='signInCallback', approval_prompt='force')
       #tw-root.tw-root
          a(href='/add-account'): input(id='twloginbutton',type='image',class='twloginbutton',value='twLogin',src='images/twitter.svg',width='100px',height='100px')
-      #pump-root.pump-root
-         a(href='/login')         
-          input(id='pumploginbutton',type='image',class='pumploginbutton',value='pumpLogin',src='images/pumpiologo.svg',width='100px',height='100px')
+      //#pump-root.pump-root
+      //   a(href='/login')
+      //   input(id='pumploginbutton',type='image',class='pumploginbutton',value='pumpLogin',src='images/pumpiologo.svg',width='100px',height='100px')
       br
      form(class='',action='/bridge',method='post')
       #connect.connect
       ul
+       li pump.io:
+         a(id='pumpstatus',class='pumpstatus',href=user.homepage)= user.id
+         br
+         input(id='pumpid',name='pumpid',hidden='true',value=user.id)
+         input(id='pumptoken',name='pumptoken',hidden='true', value=user.token)
+         input(id='pumpsecret',name='pumpsecret',hidden='true', value=user.secret)
+         input(id='pumpobj',name='pumpobj', hidden='true' value='')
        li Facebook:
          i(id='fbstatus') &nbsp; not logged in
          br
@@ -193,13 +201,6 @@
          br
          input(id='twid',name='twid',hidden='true')
          input(id='twtoken',name='twtoken',hidden='true',size=100)
-       li pump.io:  
-         a(id='pumpstatus',class='pumpstatus',href=user.homepage)= user.id 
-         br
-         input(id='pumpid',name='pumpid',hidden='true',value=user.id)
-         input(id='pumptoken',name='pumptoken',hidden='true', value=user.token)
-         input(id='pumpsecret',name='pumpsecret',hidden='true', value=user.secret)
-         input(id='pumpobj',name='pumpobj', hidden='true' value='')
       br
       input(type='submit',class='btn btn-default',value='save tokens')
    .footer