Merge remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master: ugly fix to make editplain work quattro: readd sparkle cursor quattro: style for "show more" addon tinymce linebreaks, I fix it, somebody breaks it, I fix it, somebody breaks it. Repeat. logic was reversed - should work now fix almost all errant divs in view/ and frost folders Provide backend ability to poke as a comment rather than top-level post rev update
This commit is contained in:
Simon L'nu
commit
31eff37693
2
boot.php
2
boot.php
|
|
@ -11,7 +11,7 @@ require_once('include/cache.php');
|
|||
require_once('library/Mobile_Detect/Mobile_Detect.php');
|
||||
|
||||
define ( 'FRIENDICA_PLATFORM', 'Friendica');
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1420' );
|
||||
define ( 'FRIENDICA_VERSION', '3.0.1421' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.23' );
|
||||
define ( 'DB_UPDATE_VERSION', 1154 );
|
||||
|
||||
|
|
|
|||
|
|
@ -1578,7 +1578,7 @@ function undo_post_tagging($s) {
|
|||
|
||||
function fix_mce_lf($s) {
|
||||
$s = str_replace("\r\n","\n",$s);
|
||||
$s = str_replace("\n\n","\n",$s);
|
||||
// $s = str_replace("\n\n","\n",$s);
|
||||
return $s;
|
||||
}
|
||||
|
||||
|
|
|
|||
46
mod/poke.php
46
mod/poke.php
|
|
@ -27,8 +27,8 @@ function poke_init(&$a) {
|
|||
if(! $contact_id)
|
||||
return;
|
||||
|
||||
$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : 0);
|
||||
|
||||
$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
|
||||
|
||||
logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
|
||||
|
||||
|
|
@ -45,6 +45,32 @@ function poke_init(&$a) {
|
|||
|
||||
$target = $r[0];
|
||||
|
||||
if($parent) {
|
||||
$r = q("select uri, private, allow_cid, allow_gid, deny_cid, deny_gid
|
||||
from item where id = %d and parent = %d and uid = %d limit 1",
|
||||
intval($parent),
|
||||
intval($parent),
|
||||
intval($uid)
|
||||
);
|
||||
if(count($r)) {
|
||||
$parent_uri = $r[0]['uri'];
|
||||
$private = $r[0]['private'];
|
||||
$allow_cid = $r[0]['allow_cid'];
|
||||
$allow_gid = $r[0]['allow_gid'];
|
||||
$deny_cid = $r[0]['deny_cid'];
|
||||
$deny_gid = $r[0]['deny_gid'];
|
||||
}
|
||||
}
|
||||
else {
|
||||
|
||||
$private = ((x($_GET,'private')) ? intval($_GET['private']) : 0);
|
||||
|
||||
$allow_cid = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
|
||||
$allow_gid = (($private) ? '' : $a->user['allow_gid']);
|
||||
$deny_cid = (($private) ? '' : $a->user['deny_cid']);
|
||||
$deny_gid = (($private) ? '' : $a->user['deny_gid']);
|
||||
}
|
||||
|
||||
$poster = $a->contact;
|
||||
|
||||
$uri = item_new_uri($a->get_hostname(),$owner_uid);
|
||||
|
|
@ -53,7 +79,7 @@ function poke_init(&$a) {
|
|||
|
||||
$arr['uid'] = $uid;
|
||||
$arr['uri'] = $uri;
|
||||
$arr['parent-uri'] = $uri;
|
||||
$arr['parent-uri'] = (($parent_uri) ? $parent_uri : $uri);
|
||||
$arr['type'] = 'activity';
|
||||
$arr['wall'] = 1;
|
||||
$arr['contact-id'] = $poster['id'];
|
||||
|
|
@ -64,10 +90,10 @@ function poke_init(&$a) {
|
|||
$arr['author-link'] = $poster['url'];
|
||||
$arr['author-avatar'] = $poster['thumb'];
|
||||
$arr['title'] = '';
|
||||
$arr['allow_cid'] = (($private) ? '<' . $target['id']. '>' : $a->user['allow_cid']);
|
||||
$arr['allow_gid'] = (($private) ? '' : $a->user['allow_gid']);
|
||||
$arr['deny_cid'] = (($private) ? '' : $a->user['deny_cid']);
|
||||
$arr['deny_gid'] = (($private) ? '' : $a->user['deny_gid']);
|
||||
$arr['allow_cid'] = $allow_cid;
|
||||
$arr['allow_gid'] = $allow_gid;
|
||||
$arr['deny_cid'] = $deny_cid;
|
||||
$arr['deny_gid'] = $deny_gid;
|
||||
$arr['last-child'] = 1;
|
||||
$arr['visible'] = 1;
|
||||
$arr['verb'] = $activity;
|
||||
|
|
@ -132,12 +158,12 @@ function poke_content(&$a) {
|
|||
|
||||
<script>$(document).ready(function() {
|
||||
var a;
|
||||
a = $("#recip").autocomplete({
|
||||
a = $("#poke-recip").autocomplete({
|
||||
serviceUrl: '$base/acl',
|
||||
minChars: 2,
|
||||
width: 350,
|
||||
onSelect: function(value,data) {
|
||||
$("#recip-complete").val(data);
|
||||
$("#poke-recip-complete").val(data);
|
||||
}
|
||||
});
|
||||
a.setOptions({ params: { type: 'a' }});
|
||||
|
|
@ -148,6 +174,9 @@ function poke_content(&$a) {
|
|||
</script>
|
||||
EOT;
|
||||
|
||||
$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
|
||||
|
||||
|
||||
|
||||
$verbs = get_poke_verbs();
|
||||
|
||||
|
|
@ -165,6 +194,7 @@ EOT;
|
|||
'$clabel' => t('Recipient'),
|
||||
'$choice' => t('Choose what you wish to do to recipient'),
|
||||
'$verbs' => $shortlist,
|
||||
'$parent' => $parent,
|
||||
'$prv_desc' => t('Make this post private'),
|
||||
'$submit' => t('Submit'),
|
||||
'$name' => $name,
|
||||
|
|
|
|||
|
|
@ -6,9 +6,9 @@
|
|||
#, fuzzy
|
||||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: 3.0.1420\n"
|
||||
"Project-Id-Version: 3.0.1421\n"
|
||||
"Report-Msgid-Bugs-To: \n"
|
||||
"POT-Creation-Date: 2012-07-30 10:00-0700\n"
|
||||
"POT-Creation-Date: 2012-07-31 10:00-0700\n"
|
||||
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
|
||||
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
|
||||
"Language-Team: LANGUAGE <LL@li.org>\n"
|
||||
|
|
|
|||
|
|
@ -5,6 +5,6 @@
|
|||
{{ for $events as $event }}
|
||||
<div class="birthday-list" id="birthday-$event.id"></a> <a href="$event.link">$event.title</a> $event.date </div>
|
||||
{{ endfor }}
|
||||
</div></div>
|
||||
</div>
|
||||
{{ endif }}
|
||||
|
||||
|
|
|
|||
|
|
@ -23,4 +23,5 @@ $msg_text
|
|||
<input type="submit" name="submit" value="$submit" />
|
||||
</div>
|
||||
|
||||
</form>
|
||||
</div>
|
||||
</form>
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
|
||||
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
||||
</a>
|
||||
</div>
|
||||
<div id="photos-upload-perms-end"></div>
|
||||
|
||||
<div style="display: none;">
|
||||
|
|
|
|||
|
|
@ -8,9 +8,9 @@
|
|||
|
||||
<div id="poke-recip-label">$clabel</div>
|
||||
<br />
|
||||
<input id="recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off">
|
||||
<input id="recip-complete" type="hidden" value="$id" name="cid">
|
||||
|
||||
<input id="poke-recip" type="text" size="64" maxlength="255" value="$name" name="pokename" autocomplete="off" />
|
||||
<input id="poke-recip-complete" type="hidden" value="$id" name="cid" />
|
||||
<input id="poke-parent" type="hidden" value="$parent" name="parent" />
|
||||
<br />
|
||||
<br />
|
||||
<div id="poke-action-label">$choice</div>
|
||||
|
|
@ -24,7 +24,7 @@
|
|||
<br />
|
||||
<br />
|
||||
<div id="poke-private-desc">$prv_desc</div>
|
||||
<input type="checkbox" name="private" value="1" />
|
||||
<input type="checkbox" name="private" {{ if $parent }}disabled="disabled"{{ endif }} value="1" />
|
||||
<br />
|
||||
<br />
|
||||
<input type="submit" name="submit" value="$submit" />
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
<script>
|
||||
var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
|
||||
window.editSelect = $editselect;
|
||||
window.isPublic = "$ispublic";
|
||||
window.nickname = "$nickname";
|
||||
|
|
|
|||
|
|
@ -28,6 +28,7 @@
|
|||
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="button popupbox" />
|
||||
<span id="jot-perms-icon" class="icon $lockstate" ></span>$permissions
|
||||
</a>
|
||||
</div>
|
||||
<div id="photos-upload-perms-end"></div>
|
||||
|
||||
<div style="display: none;">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Name: Frost--mobile version
|
||||
* Description: Like frosted glass
|
||||
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
||||
* Version: Version 0.2
|
||||
* Version: Version 0.2.2
|
||||
* Author: Zach P <windforest@f.shmuz.in>
|
||||
* Maintainer: Zach P <windforest@f.shmuz.in>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -1,5 +1,6 @@
|
|||
|
||||
<script>
|
||||
var none = "none"; // ugly hack: $editselect shouldn't be a string if TinyMCE is enabled, but should if it isn't
|
||||
window.editSelect = $editselect;
|
||||
window.isPublic = "$ispublic";
|
||||
window.nickname = "$nickname";
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@
|
|||
<a href="#photos-upload-permissions-wrapper" id="photos-upload-perms-menu" class="popupbox button" />
|
||||
<span id="jot-perms-icon" class="icon $lockstate photo-perms-icon" ></span><div class="photo-jot-perms-text">$permissions</div>
|
||||
</a>
|
||||
</div>
|
||||
<div id="photos-upload-perms-end"></div>
|
||||
|
||||
<div style="display: none;">
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@
|
|||
* Name: Frost
|
||||
* Description: Like frosted glass
|
||||
* Credits: Navigation icons taken from http://iconza.com. Other icons taken from http://thenounproject.com, including: Like, Dislike, Black Lock, Unlock, Pencil, Tag, Camera, Paperclip (Marie Coons), Folder (Sergio Calcara), Chain-link (Andrew Fortnum), Speaker (Harold Kim), Quotes (Henry Ryder), Video Camera (Anas Ramadan), and Left Arrow, Right Arrow, and Delete X (all three P.J. Onori). All under Attribution (CC BY 3.0). Others from The Noun Project are public domain or No Rights Reserved (CC0).
|
||||
* Version: Version 0.2
|
||||
* Version: Version 0.2.2
|
||||
* Author: Zach P <windforest@f.shmuz.in>
|
||||
* Maintainer: Zach P <windforest@f.shmuz.in>
|
||||
*/
|
||||
|
|
|
|||
|
|
@ -341,11 +341,6 @@
|
|||
height: 16px;
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
|
||||
/* global */
|
||||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
|
|
@ -904,6 +899,9 @@ section {
|
|||
width: 770px;
|
||||
padding: 0px 20px 0px 10px;
|
||||
}
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
background-color: #eff0f1;
|
||||
|
|
@ -1141,6 +1139,16 @@ section {
|
|||
width: 25px;
|
||||
height: 25px;
|
||||
}
|
||||
span[id^="showmore-teaser"] {
|
||||
background: url("showmore-bg.jpg") no-repeat center bottom;
|
||||
}
|
||||
span[id^="showmore-wrap"] {
|
||||
border-top: 1px solid #999999;
|
||||
color: #999999;
|
||||
display: block;
|
||||
text-align: center;
|
||||
background-color: #eff0f1;
|
||||
}
|
||||
#pause {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
|
|
|
|||
|
|
@ -341,11 +341,6 @@
|
|||
height: 16px;
|
||||
background-position: 0px 0px;
|
||||
}
|
||||
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
|
||||
/* global */
|
||||
body {
|
||||
font-family: Liberation Sans, helvetica, arial, clean, sans-serif;
|
||||
|
|
@ -904,6 +899,9 @@ section {
|
|||
width: 770px;
|
||||
padding: 0px 20px 0px 10px;
|
||||
}
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
background-color: #eff0f1;
|
||||
|
|
@ -1141,6 +1139,16 @@ section {
|
|||
width: 25px;
|
||||
height: 25px;
|
||||
}
|
||||
span[id^="showmore-teaser"] {
|
||||
background: url("showmore-bg.jpg") no-repeat center bottom;
|
||||
}
|
||||
span[id^="showmore-wrap"] {
|
||||
border-top: 1px solid #999999;
|
||||
color: #999999;
|
||||
display: block;
|
||||
text-align: center;
|
||||
background-color: #eff0f1;
|
||||
}
|
||||
#pause {
|
||||
position: fixed;
|
||||
bottom: 5px;
|
||||
|
|
|
|||
|
|
@ -422,6 +422,10 @@ section {
|
|||
padding:0px 20px 0px 10px;
|
||||
}
|
||||
|
||||
.sparkle {
|
||||
cursor: url('icons/lock.cur'), pointer;
|
||||
}
|
||||
|
||||
/* wall item */
|
||||
.tread-wrapper {
|
||||
background-color: @ThreadBackgroundColor;
|
||||
|
|
@ -590,6 +594,17 @@ section {
|
|||
}
|
||||
.wwto .contact-photo { width: 25px; height: 25px; }
|
||||
|
||||
span[id^="showmore-teaser"]{
|
||||
background: url("showmore-bg.jpg") no-repeat center bottom;
|
||||
}
|
||||
span[id^="showmore-wrap"] {
|
||||
border-top: 1px solid #999999;
|
||||
color: #999999;
|
||||
display: block;
|
||||
text-align: center;
|
||||
background-color: @ThreadBackgroundColor;
|
||||
}
|
||||
|
||||
|
||||
#pause {
|
||||
position: fixed;
|
||||
|
|
|
|||
Binary file not shown.
|
After Width: | Height: | Size: 1.9 KiB |
Loading…
Reference in New Issue
Block a user