GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2009-11-02 11:23:41 -05:00
commit c991047fc4
7 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
js/util.js
View File

@ -287,10 +287,10 @@ var SN = { // StatusNet
replyto = '@' + nick + ' '; replyto = '@' + nick + ' ';
text.val(replyto + text.val().replace(RegExp(replyto, 'i'), '')); text.val(replyto + text.val().replace(RegExp(replyto, 'i'), ''));
$('#'+SN.C.S.FormNotice+' input#'+SN.C.S.NoticeInReplyTo).val(id); $('#'+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; var len = text.val().length;
text.get(0).setSelectionRange(len,len); text[0].setSelectionRange(len,len);
text.get(0).focus(); text[0].focus();
} }
return false; return false;
} }
@ -369,7 +369,7 @@ var SN = { // StatusNet
var NDMF = $('.entity_send-a-message form'); var NDMF = $('.entity_send-a-message form');
if (NDMF.length == 0) { if (NDMF.length == 0) {
$.get(NDM.attr('href'), null, function(data) { $.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'); NDMF = $('.entity_send-a-message .form_notice');
SN.U.FormNoticeEnhancements(NDMF); SN.U.FormNoticeEnhancements(NDMF);
NDMF.append('<button class="close">&#215;</button>'); NDMF.append('<button class="close">&#215;</button>');

3
lib/common.php
View File

@ -169,6 +169,7 @@ if (isset($conffile)) {
$_config_files[] = INSTALLDIR.'/config.php'; $_config_files[] = INSTALLDIR.'/config.php';
} }
global $_have_a_config;
$_have_a_config = false; $_have_a_config = false;
foreach ($_config_files as $_config_file) { foreach ($_config_files as $_config_file) {
@ -187,7 +188,7 @@ function _have_config()
// XXX: Throw a conniption if database not installed // XXX: Throw a conniption if database not installed
// XXX: Find a way to use htmlwriter for this instead of handcoded markup // XXX: Find a way to use htmlwriter for this instead of handcoded markup
if (!_have_config()) { 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>'. _('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 '<p>'. _('You may wish to run the installer to fix this.') .'</p>';
echo '<a href="install.php">'. _('Go to the installer.') .'</a>'; echo '<a href="install.php">'. _('Go to the installer.') .'</a>';

2
theme/base/css/display.css
View File

@ -693,7 +693,7 @@ top:34px;
right:-1px; right:-1px;
padding:1.795%; padding:1.795%;
width:65%; width:65%;
z-index:1; z-index:2;
border-radius:7px; border-radius:7px;
-moz-border-radius:7px; -moz-border-radius:7px;
-webkit-radius-border:7px; -webkit-radius-border:7px;

BIN
theme/base/images/icons/icons-01.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 3.2 KiB

After

Width:  |  Height:  |  Size: 3.3 KiB

BIN
theme/base/images/icons/twotone/green/x.gif Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 79 B

8
theme/default/css/display.css
View File

@ -115,7 +115,8 @@ opacity:0;
.notice-options .notice_delete, .notice-options .notice_delete,
#new_group a, #new_group a,
.pagination .nav_prev 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-image:url(../../base/images/icons/icons-01.png);
background-repeat:no-repeat; background-repeat:no-repeat;
background-color:transparent; background-color:transparent;
@ -167,10 +168,7 @@ background-color:#EFF3DC;
} }
button.close { button.close {
background-image:url(../../base/images/icons/twotone/green/x.gif); background-position:0 -1120px;
background-repeat:no-repeat;
background-position:0 47%;
background-color:transparent;
} }
#anon_notice { #anon_notice {

8
theme/identica/css/display.css
View File

@ -115,7 +115,8 @@ opacity:0;
.notice-options .notice_delete, .notice-options .notice_delete,
#new_group a, #new_group a,
.pagination .nav_prev 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-image:url(../../base/images/icons/icons-01.png);
background-repeat:no-repeat; background-repeat:no-repeat;
background-color:transparent; background-color:transparent;
@ -167,10 +168,7 @@ background-color:#EFF3DC;
} }
button.close { button.close {
background-image:url(../../base/images/icons/twotone/green/x.gif); background-position:0 -1120px;
background-repeat:no-repeat;
background-position:0 47%;
background-color:transparent;
} }
#anon_notice { #anon_notice {