summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEvan Prodromou <evan@status.net>2009-11-02 11:23:41 -0500
committerEvan Prodromou <evan@status.net>2009-11-02 11:23:41 -0500
commitc991047fc4d3a1a231311e26519803f9bb2111dc (patch)
treed799a2548b5034d877b547422a5139f1e48c4983
parent3c4ac05cde5a97594d3b0fa7e3f5dbbaf45e4c64 (diff)
parentb22fc5b74aecd505d4e2df01258171fc65d312cf (diff)
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
-rw-r--r--js/util.js8
-rw-r--r--lib/common.php3
-rw-r--r--theme/base/css/display.css2
-rw-r--r--theme/base/images/icons/icons-01.pngbin3260 -> 3422 bytes
-rw-r--r--theme/base/images/icons/twotone/green/x.gifbin0 -> 79 bytes
-rw-r--r--theme/default/css/display.css8
-rw-r--r--theme/identica/css/display.css8
7 files changed, 13 insertions, 16 deletions
diff --git a/js/util.js b/js/util.js
index 210459844..b572846b7 100644
--- 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 2c2f6869e..68bdbf229 100644
--- 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 fb630d58a..878662c56 100644
--- 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 c4e371330..f83c30177 100644
--- a/theme/base/images/icons/icons-01.png
+++ b/theme/base/images/icons/icons-01.png
Binary files 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
index 000000000..ffb2efea0
--- /dev/null
+++ b/theme/base/images/icons/twotone/green/x.gif
Binary files differ
diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 40fdb255b..910f915a8 100644
--- 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 3b59652c4..2aa087331 100644
--- 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 {