Merge pull request #1981 from rabuzarus/poke
some work on poke template
This commit is contained in:
Michael Vogel
commit
78a8db55c6
9 changed files with 130 additions and 54 deletions
49
mod/poke.php
49
mod/poke.php
|
|
@ -1,4 +1,18 @@
|
|||
<?php
|
||||
<?php /** @file */
|
||||
|
||||
/**
|
||||
*
|
||||
* Poke, prod, finger, or otherwise do unspeakable things to somebody - who must be a connection in your address book
|
||||
* This function can be invoked with the required arguments (verb and cid and private and possibly parent) silently via ajax or
|
||||
* other web request. You must be logged in and connected to a profile.
|
||||
* If the required arguments aren't present, we'll display a simple form to choose a recipient and a verb.
|
||||
* parent is a special argument which let's you attach this activity as a comment to an existing conversation, which
|
||||
* may have started with somebody else poking (etc.) somebody, but this isn't necessary. This can be used in the more pokes
|
||||
* plugin version to have entire conversations where Alice poked Bob, Bob fingered Alice, Alice hugged Bob, etc.
|
||||
*
|
||||
* private creates a private conversation with the recipient. Otherwise your profile's default post privacy is used.
|
||||
*
|
||||
*/
|
||||
|
||||
require_once('include/security.php');
|
||||
require_once('include/bbcode.php');
|
||||
|
|
@ -33,7 +47,7 @@ function poke_init(&$a) {
|
|||
logger('poke: verb ' . $verb . ' contact ' . $contact_id, LOGGER_DEBUG);
|
||||
|
||||
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d and `uid` = %d LIMIT 1",
|
||||
$r = q("SELECT * FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($contact_id),
|
||||
intval($uid)
|
||||
);
|
||||
|
|
@ -46,8 +60,8 @@ 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",
|
||||
$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)
|
||||
|
|
@ -140,7 +154,7 @@ function poke_content(&$a) {
|
|||
$id = '';
|
||||
|
||||
if(intval($_GET['c'])) {
|
||||
$r = q("select id,name from contact where id = %d and uid = %d limit 1",
|
||||
$r = q("SELECT `id`,`name` FROM `contact` WHERE `id` = %d AND `uid` = %d LIMIT 1",
|
||||
intval($_GET['c']),
|
||||
intval(local_user())
|
||||
);
|
||||
|
|
@ -153,31 +167,16 @@ function poke_content(&$a) {
|
|||
|
||||
$base = $a->get_baseurl();
|
||||
|
||||
$a->page['htmlhead'] .= '<script src="' . $a->get_baseurl(true) . '/library/jquery_ac/friendica.complete.js" ></script>';
|
||||
$a->page['htmlhead'] .= <<< EOT
|
||||
$head_tpl = get_markup_template('poke_head.tpl');
|
||||
$a->page['htmlhead'] .= replace_macros($head_tpl,array(
|
||||
'$baseurl' => $a->get_baseurl(true),
|
||||
'$base' => $base
|
||||
));
|
||||
|
||||
<script>$(document).ready(function() {
|
||||
var a;
|
||||
a = $("#poke-recip").autocomplete({
|
||||
serviceUrl: '$base/acl',
|
||||
minChars: 2,
|
||||
width: 350,
|
||||
onSelect: function(value,data) {
|
||||
$("#poke-recip-complete").val(data);
|
||||
}
|
||||
});
|
||||
a.setOptions({ params: { type: 'a' }});
|
||||
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
EOT;
|
||||
|
||||
$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
|
||||
|
||||
|
||||
|
||||
$verbs = get_poke_verbs();
|
||||
|
||||
$shortlist = array();
|
||||
|
|
|
|||
|
|
@ -212,3 +212,20 @@ a {
|
|||
clip: rect(0,0,0,0);
|
||||
border: 0;
|
||||
}
|
||||
|
||||
/* poke */
|
||||
#poke-desc {
|
||||
margin: 5px 0 10px;
|
||||
}
|
||||
|
||||
#poke-wrapper {
|
||||
padding: 10px 0 0px;
|
||||
}
|
||||
|
||||
#poke-recipient, #poke-action, #poke-privacy-settings {
|
||||
margin: 10px 0 30px;
|
||||
}
|
||||
|
||||
#poke-recip-label, #poke-action-label, #prvmail-message-label {
|
||||
margin: 10px 0 10px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -3,31 +3,33 @@
|
|||
|
||||
<div id="poke-desc">{{$desc}}</div>
|
||||
|
||||
<form action="poke" method="get">
|
||||
<br />
|
||||
<br />
|
||||
|
||||
<div id="poke-recip-label">{{$clabel}}</div>
|
||||
<br />
|
||||
<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" 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>
|
||||
<br />
|
||||
<br />
|
||||
<select name="verb" id="poke-verb-select" >
|
||||
{{foreach $verbs as $v}}
|
||||
<option value="{{$v.0}}">{{$v.1}}</option>
|
||||
{{/foreach}}
|
||||
</select>
|
||||
<br />
|
||||
<br />
|
||||
<div id="poke-private-desc">{{$prv_desc}}</div>
|
||||
<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
|
||||
<br />
|
||||
<br />
|
||||
<input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
|
||||
</form>
|
||||
<div id="poke-wrapper">
|
||||
<form action="poke" method="get">
|
||||
|
||||
<div id="poke-recipient">
|
||||
<div id="poke-recip-label">{{$clabel}}</div>
|
||||
<input id="poke-recip" type="text" size="64" maxlength="255" value="{{$name|escape:'html'}}" 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" />
|
||||
</div>
|
||||
|
||||
<div id="poke-action">
|
||||
<div id="poke-action-label">{{$choice}}</div>
|
||||
<select name="verb" id="poke-verb-select" >
|
||||
{{foreach $verbs as $v}}
|
||||
<option value="{{$v.0}}">{{$v.1}}</option>
|
||||
{{/foreach}}
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<div id="poke-privacy-settings">
|
||||
<div id="poke-private-desc">{{$prv_desc}}</div>
|
||||
<input type="checkbox" name="private" {{if $parent}}disabled="disabled"{{/if}} value="1" />
|
||||
</div>
|
||||
|
||||
<input type="submit" name="submit" value="{{$submit|escape:'html'}}" />
|
||||
|
||||
</form>
|
||||
</div>
|
||||
|
||||
|
|
|
|||
18
view/templates/poke_head.tpl
Normal file
18
view/templates/poke_head.tpl
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
<script src="{{$baseurl}}/library/jquery_ac/friendica.complete.js" ></script>
|
||||
|
||||
<script>$(document).ready(function() {
|
||||
var a;
|
||||
a = $("#poke-recip").autocomplete({
|
||||
serviceUrl: '{{$base}}/acl',
|
||||
minChars: 2,
|
||||
width: 350,
|
||||
onSelect: function(value,data) {
|
||||
$("#poke-recip-complete").val(data);
|
||||
}
|
||||
});
|
||||
a.setOptions({ params: { type: 'a' }});
|
||||
|
||||
|
||||
});
|
||||
|
||||
</script>
|
||||
|
|
@ -959,7 +959,7 @@ input#dfrn-url {
|
|||
}
|
||||
|
||||
.wall-item-content-wrapper.comment {
|
||||
# margin-left: 50px;
|
||||
/*margin-left: 50px;*/
|
||||
background: #EEEEEE;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -2500,6 +2500,22 @@ a.mail-list-link {
|
|||
clear: both;
|
||||
}
|
||||
|
||||
#poke-desc {
|
||||
margin: 5px 0 10px;
|
||||
}
|
||||
|
||||
#poke-wrapper {
|
||||
padding: 10px 0 0px;
|
||||
}
|
||||
|
||||
#poke-recipient, #poke-action, #poke-privacy-settings {
|
||||
margin: 10px 0 30px;
|
||||
}
|
||||
|
||||
#poke-recip-label, #poke-action-label, #prvmail-message-label {
|
||||
margin: 10px 0 10px;
|
||||
}
|
||||
|
||||
#sidebar-group-list ul {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
|
@ -4217,7 +4233,7 @@ ul.notifications-menu-popup {
|
|||
#recip {
|
||||
|
||||
}
|
||||
.autocomplete-w1 { background: #ffffff; no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
|
||||
.autocomplete-w1 { background: #ffffff no-repeat bottom right; position:absolute; top:0px; left:0px; margin:6px 0 0 6px; /* IE6 fix: */ _background:none; _margin:1px 0 0 0; }
|
||||
.autocomplete { color:#000; border:1px solid #999; background:#FFF; cursor:default; text-align:left; max-height:350px; overflow:auto; margin:-6px 6px 6px -6px; /* IE6 specific: */ _height:350px; _margin:0; _overflow-x:hidden; }
|
||||
.autocomplete .selected { background:#F0F0F0; }
|
||||
.autocomplete div { padding:2px 5px; white-space:nowrap; overflow:hidden; }
|
||||
|
|
|
|||
|
|
@ -2315,6 +2315,22 @@ a.mail-list-link {
|
|||
clear: both;
|
||||
}
|
||||
|
||||
#poke-desc {
|
||||
margin: 5px 0 10px;
|
||||
}
|
||||
|
||||
#poke-wrapper {
|
||||
padding: 10px 0 20px;
|
||||
}
|
||||
|
||||
#poke-recipient, #poke-action, #poke-privacy-settings {
|
||||
margin: 10px 0 30px;
|
||||
}
|
||||
|
||||
#poke-recip-label, #poke-action-label, #prvmail-message-label {
|
||||
margin: 10px 0 10px;
|
||||
}
|
||||
|
||||
#sidebar-group-list ul {
|
||||
list-style-type: none;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -291,7 +291,7 @@ section {
|
|||
margin: 10px 0 0 230px;
|
||||
}
|
||||
|
||||
.login-form,
|
||||
.login-form {
|
||||
margin-top: 10px;
|
||||
}
|
||||
|
||||
|
|
@ -2693,6 +2693,13 @@ margin-left: 0px;
|
|||
border: 1px solid #7C7D7B;
|
||||
}
|
||||
|
||||
/* ========== */
|
||||
/* = Poke = */
|
||||
/* ========== */
|
||||
#poke-recip {
|
||||
float: none;
|
||||
}
|
||||
|
||||
/* ================= */
|
||||
/* = Notifications = */
|
||||
/* ================= */
|
||||
|
|
|
|||
|
|
@ -2496,6 +2496,7 @@ a.mail-list-link {
|
|||
border: none;
|
||||
}
|
||||
|
||||
|
||||
/* ========== */
|
||||
/* = Events = */
|
||||
/* ========== */
|
||||
|
|
|
|||
Loading…
Reference in a new issue