Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

diff --git a/js/util.js b/js/util.js
index 210459844511cb6ec41c592abd3af59fac4b8680..b572846b7c915cd859ea3a94eb78b05161929378 100644 (file)
--- a/js/util.js
+++ b/js/util.js
@@ -287,10 +287,10 @@ var SN = { // StatusNet
                     replyto = '@' + nick + ' ';
                     text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
                     $('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id);
-                    if (text.get(0).setSelectionRange) {
+                    if (text[0].setSelectionRange) {
                         var len = text.val().length;
-                        text.get(0).setSelectionRange(len,len);
-                        text.get(0).focus();
+                        text[0].setSelectionRange(len,len);
+                        text[0].focus();
                     }
                     return false;
                 }
@@ -369,7 +369,7 @@ var SN = { // StatusNet
                 var NDMF = $('.entity_send-a-message form');
                 if (NDMF.length == 0) {
                     $.get(NDM.attr('href'), null, function(data) {
-                        $('.entity_send-a-message').append(document._importNode($('form', data).get(0), true));
+                        $('.entity_send-a-message').append(document._importNode($('form', data)[0], true));
                         NDMF = $('.entity_send-a-message .form_notice');
                         SN.U.FormNoticeEnhancements(NDMF);
                         NDMF.append('<button class="close">&#215;</button>');

diff --git a/lib/common.php b/lib/common.php
index 2c2f6869eefc3d26bcaee413a7d1405a8055b591..68bdbf22934bc596b612a08386ad8903e7c2b310 100644 (file)
--- a/lib/common.php
+++ b/lib/common.php
@@ -169,6 +169,7 @@ if (isset($conffile)) {
     $_config_files[] = INSTALLDIR.'/config.php';
 }
 
+global $_have_a_config;
 $_have_a_config = false;
 
 foreach ($_config_files as $_config_file) {
@@ -187,7 +188,7 @@ function _have_config()
 // XXX: Throw a conniption if database not installed
 // XXX: Find a way to use htmlwriter for this instead of handcoded markup
 if (!_have_config()) {
-  echo '<p>'. _('No configuation file found. ') .'</p>';
+  echo '<p>'. _('No configuration file found. ') .'</p>';
   echo '<p>'. _('I looked for configuration files in the following places: ') .'<br/> '. implode($_config_files, '<br/>');
   echo '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
   echo '<a href="install.php">'. _('Go to the installer.') .'</a>';

diff --git a/theme/base/css/display.css b/theme/base/css/display.css
index fb630d58a6e26cd44e1afbb4c9502f91cd668eb5..878662c5620e330e3200564642cd0e14c4e27073 100644 (file)
--- a/theme/base/css/display.css
+++ b/theme/base/css/display.css
@@ -693,7 +693,7 @@ top:34px;
 right:-1px;
 padding:1.795%;
 width:65%;
-z-index:1;
+z-index:2;
  border-radius:7px;
 -moz-border-radius:7px;
 -webkit-radius-border:7px;

diff --git a/theme/base/images/icons/icons-01.png b/theme/base/images/icons/icons-01.png
index c4e3713302fe9bea6d32d83bb2449a4c5107a6f3..f83c30177c6a5aa8c13cc8bbaae41e7819c93ddf 100644 (file)
Binary files a/theme/base/images/icons/icons-01.png and b/theme/base/images/icons/icons-01.png differ

diff --git a/theme/base/images/icons/twotone/green/x.gif b/theme/base/images/icons/twotone/green/x.gif
new file mode 100644 (file)
index 0000000..ffb2efe
Binary files /dev/null and b/theme/base/images/icons/twotone/green/x.gif differ

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 40fdb255b92db46135de21114216f54ded7776b3..910f915a867fda3747128d53e631f16a6c4e9c30 100644 (file)
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -115,7 +115,8 @@ opacity:0;
 .notice-options .notice_delete,
 #new_group a,
 .pagination .nav_prev a,
-.pagination .nav_next a {
+.pagination .nav_next a,
+button.close {
 background-image:url(../../base/images/icons/icons-01.png);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -167,10 +168,7 @@ background-color:#EFF3DC;
 }
 
 button.close {
-background-image:url(../../base/images/icons/twotone/green/x.gif);
-background-repeat:no-repeat;
-background-position:0 47%;
-background-color:transparent;
+background-position:0 -1120px;
 }
 
 #anon_notice {

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 3b59652c41696bbf4c21f23737fa22a8d72cc90e..2aa087331e89215eea97e36e7f8d37d137aaa451 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -115,7 +115,8 @@ opacity:0;
 .notice-options .notice_delete,
 #new_group a,
 .pagination .nav_prev a,
-.pagination .nav_next a {
+.pagination .nav_next a,
+button.close {
 background-image:url(../../base/images/icons/icons-01.png);
 background-repeat:no-repeat;
 background-color:transparent;
@@ -167,10 +168,7 @@ background-color:#EFF3DC;
 }
 
 button.close {
-background-image:url(../../base/images/icons/twotone/green/x.gif);
-background-repeat:no-repeat;
-background-position:0 47%;
-background-color:transparent;
+background-position:0 -1120px;
 }
 
 #anon_notice {