Merge branch '0.9.x' into pluginize-twitter-bridge

Conflicts:
	plugins/TwitterBridge/twitterauthorization.php

5 files changed, 22 insertions, 21 deletions

diff --git a/js/facebookapp.js b/js/facebookapp.js
index f0696c19e..5deb6e42b 100644
--- a/js/facebookapp.js
+++ b/js/facebookapp.js
@@ -1,6 +1,6 @@
 /*
-* Laconica - a distributed open-source microblogging tool
-* Copyright (C) 2008, Controlez-Vous, Inc.
+* StatusNet - a distributed open-source microblogging tool
+* Copyright (C) 2008, StatusNet, Inc.
 *
 * This program is free software: you can redistribute it and/or modify
 * it under the terms of the GNU Affero General Public License as published by
diff --git a/js/identica-badge.js b/js/identica-badge.js
index ffa55ae93..49c42b70c 100644
--- a/js/identica-badge.js
+++ b/js/identica-badge.js
@@ -119,7 +119,7 @@
             $.s.className = trueName;         
             $.s.h = document.createElement('H3');
             $.s.h.a = document.createElement('A');
-            $.s.h.a.target = '_laconica';
+            $.s.h.a.target = '_statusnet';
             $.s.h.appendChild($.s.h.a);
             $.s.appendChild($.s.h);
             $.s.r = document.createElement('UL');
@@ -184,11 +184,11 @@
                var icon = document.createElement('A');
                if (r[i] && r[i].url) {
                   icon.href = r[i].url;
-                  icon.target = '_laconica'; 
+                  icon.target = '_statusnet'; 
                   icon.title = 'Visit ' + r[i].screen_name + ' at ' + r[i].url;
                } else {
                   icon.href = 'http://' + $.a.server + '/' + r[i].screen_name;
-                  icon.target = '_laconica'; 
+                  icon.target = '_statusnet'; 
                   icon.title = 'Visit ' + r[i].screen_name + ' at http://' + $.a.server + '/' + r[i].screen_name;
                }
 
@@ -215,14 +215,14 @@
                   var date_link = document.createElement('A');
                   date_link.innerHTML = r[i].status.created_at.split(/\+/)[0];
                   date_link.href = 'http://' + $.a.server + '/notice/' + r[i].status.id;
-                  date_link.target = '_laconica';
+                  date_link.target = '_statusnet';
                   updated.appendChild(date_link);
                   if (r[i].status.in_reply_to_status_id) {
                      updated.appendChild(document.createTextNode(' in reply to '));
                      var in_reply_to = document.createElement('A');
                      in_reply_to.innerHTML = r[i].status.in_reply_to_status_id;
                      in_reply_to.href = 'http://' + $.a.server + '/notice/' + r[i].status.in_reply_to_status_id;
-                     in_reply_to.target = '_laconica';
+                     in_reply_to.target = '_statusnet';
                      updated.appendChild(in_reply_to);
                   }
                } else {
@@ -233,9 +233,9 @@
                if (r[i].status && r[i].status.text) {
                   var raw = r[i].status.text;
                   var cooked = raw;
-                  cooked = cooked.replace(/http:\/\/([^ ]+)/g, "<a href=\"http://$1\" target=\"_laconica\">http://$1</a>");
-                  cooked = cooked.replace(/@([\w*]+)/g, '@<a href="http://' + $.a.server + '/$1" target=\"_laconica\">$1</a>');
-                  cooked = cooked.replace(/#([\w*]+)/g, '#<a href="http://' + $.a.server + '/tag/$1" target="_laconica">$1</a>');
+                  cooked = cooked.replace(/http:\/\/([^ ]+)/g, "<a href=\"http://$1\" target=\"_statusnet\">http://$1</a>");
+                  cooked = cooked.replace(/@([\w*]+)/g, '@<a href="http://' + $.a.server + '/$1" target=\"_statusnet\">$1</a>');
+                  cooked = cooked.replace(/#([\w*]+)/g, '#<a href="http://' + $.a.server + '/tag/$1" target="_statusnet">$1</a>');
                   p.innerHTML = cooked;
                }
                li.appendChild(p);
diff --git a/js/jcrop/jquery.Jcrop.go.js b/js/jcrop/jquery.Jcrop.go.js
index 4e1cbfd1e..5739f676d 100644
--- a/js/jcrop/jquery.Jcrop.go.js
+++ b/js/jcrop/jquery.Jcrop.go.js
@@ -1,10 +1,10 @@
 /** Init for Jcrop library and page setup
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 
 $(function(){
diff --git a/js/userdesign.go.js b/js/userdesign.go.js
index c53569bea..eb4dece09 100644
--- a/js/userdesign.go.js
+++ b/js/userdesign.go.js
@@ -1,10 +1,10 @@
 /** Init for Farbtastic library and page setup
  *
- * @package   Laconica
- * @author Sarven Capadisli <csarven@controlyourself.ca>
- * @copyright 2009 Control Yourself, Inc.
+ * @package   StatusNet
+ * @author Sarven Capadisli <csarven@status.net>
+ * @copyright 2009 StatusNet, Inc.
  * @license   http://www.fsf.org/licensing/licenses/agpl-3.0.html GNU Affero General Public License version 3.0
- * @link      http://laconi.ca/
+ * @link      http://status.net/
  */
 $(document).ready(function() {
     function InitColors(i, E) {
@@ -27,11 +27,12 @@ $(document).ready(function() {
         }
     }
 
-    /* rgb2hex written by R0bb13 <robertorebollo@gmail.com> */
     function rgb2hex(rgb) {
+        if (rgb.slice(0,1) == '#') { return rgb; }
         rgb = rgb.match(/^rgb\((\d+),\s*(\d+),\s*(\d+)\)$/);
         return '#' + dec2hex(rgb[1]) + dec2hex(rgb[2]) + dec2hex(rgb[3]);
     }
+    /* dec2hex written by R0bb13 <robertorebollo@gmail.com> */
     function dec2hex(x) {
         hexDigits = new Array('0','1','2','3','4','5','6','7','8','9','A','B','C','D','E','F');
         return isNaN(x) ? '00' : hexDigits[(x - x % 16) / 16] + hexDigits[x % 16];
diff --git a/js/util.js b/js/util.js
index 4f731f30a..0a943512f 100644
--- a/js/util.js
+++ b/js/util.js
@@ -1,6 +1,6 @@
 /*
- * Laconica - a distributed open-source microblogging tool
- * Copyright (C) 2008, Controlez-Vous, Inc.
+ * StatusNet - a distributed open-source microblogging tool
+ * Copyright (C) 2008, StatusNet, Inc.
  *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Affero General Public License as published by