harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge https://github.com/friendica/red into pending_merge

Browse Source
This commit is contained in:
friendica
2014-06-26 16:26:33 -07:00
parent 8b545d91db 0db4b55223
commit fea4eac17a
5 changed files with 15 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/invite.apd Normal file
View File

@@ -0,0 +1,4 @@
url: $baseurl/invite
requires: local_user
name: Invite
photo: $baseurl/app/invite.png

BIN
app/invite.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 5.0 KiB

10
library/jquery.divgrow/jquery.divgrow-1.3.1.js
View File

@@ -43,12 +43,12 @@
obj.css('height', options.initialHeight).css('overflow', 'hidden');
if (options.showBrackets) {
obj.after('<p class="divgrow-brackets">[&hellip;]</p><a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>');
obj.after('<p class="divgrow-brackets">[&hellip;]</p><div href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></div>');
}
else {
obj.after('<a href="#" class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></a>');
obj.after('<div class="divgrow-showmore' + " divgrow-obj-" + divgrowid + '"' + '></div>');
}
$("a.divgrow-showmore").html(options.moreText);
$("div.divgrow-showmore").html(options.moreText);
$("." + "divgrow-obj-" + divgrowid).toggle(function () {
//alert(obj.attr('class'));
@@ -61,7 +61,7 @@
if (options.showBrackets) {
$(this).nextAll("p.divgrow-brackets:first").fadeOut();
}
$(this).nextAll("a.divgrow-showmore:first").html(options.lessText);
$(this).nextAll("div.divgrow-showmore:first").html(options.lessText);
});
@@ -74,7 +74,7 @@
if (options.showBrackets) {
$(this).nextAll("p.divgrow-brackets:first").stop(true, false).fadeIn();
}
$(this).nextAll("a.divgrow-showmore:first").stop(true, false).html(options.moreText);
$(this).nextAll("div.divgrow-showmore:first").stop(true, false).html(options.moreText);
});
});

2
mod/home.php
View File

@@ -15,6 +15,8 @@ function home_init(&$a) {
$dest = $channel['channel_startpage'];
if(! $dest)
$dest = get_pconfig(local_user(),'system','startpage');
if(! $dest)
$dest = get_config('system','startpage');
if(! $dest)
$dest = z_root() . '/apps';

4
view/theme/redbasic/css/style.css
View File

@@ -2062,10 +2062,14 @@ img.mail-list-sender-photo {
border-bottom-right-radius: $radiuspx;
border-bottom-left-radius: $radiuspx;
text-align: center;
font-weight: bold;
color: $link_colour;
cursor: pointer;
}
.divgrow-showmore:hover {
border-top: 1px dashed #adadad;
text-decoration: underline;
}