first cut at rating widget. The flaw is that it is limited because it requires local_channel() (formerly local_user()). We need to extend this to take you home like rpost does if you're logged in as remote_channel() - and/or we need zot to send the rating message to the source channel and target in addition to the directories.

This commit is contained in:
friendica 2015-02-04 15:48:39 -08:00
parent 1ceb0a7fba
commit 3988948516
8 changed files with 82 additions and 25 deletions

View File

@ -943,6 +943,11 @@ logger('online: ' . $profile['online']);
$tpl = get_markup_template('profile_vcard.tpl');
// This isn't ideal here because it requires local_channel().
// We need the rating widget to recognise and take you home if you're remote.
// require_once('include/widgets.php');
// $z = widget_rating(array('target' => $profile['channel_hash']));
$o .= replace_macros($tpl, array(
'$profile' => $profile,
'$connect' => $connect,
@ -954,6 +959,7 @@ logger('online: ' . $profile['online']);
'$homepage' => $homepage,
'$chanmenu' => $channel_menu,
'$diaspora' => $diaspora,
'$rating' => $z,
'$contact_block' => $contact_block,
));

View File

@ -903,3 +903,30 @@ function widget_random_block($arr) {
return $o;
}
function widget_rating($arr) {
$a = get_app();
if(! local_channel())
return;
$channel = $a->get_channel();
if($arr['target'])
$hash = $arr['target'];
else
$hash = $a->poi['xchan_hash'];
if(! $hash)
return;
if($hash == $channel['channel_hash'])
return;
head_add_js('ratings.js');
$o = '<div class="widget rateme">';
$o .= '<div class="rateme fakelink" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="icon-pencil"></i> ' . t('Rate Me') . '</div></div>';
return $o;
}

View File

@ -1 +1 @@
2015-02-01.934
2015-02-04.935

View File

@ -6,27 +6,6 @@
float: left;
width: 250px;
}
.directory-rating {
float: right;
margin-right: 5px;
}
.slider-container {
padding: 15px;
}
.rating-text-label {
margin-top: 30px;
}
.directory-rating-text {
width: 90%;
margin-left: 5%;
}
.directory-rating-submit {
margin-top: 15px;
}
.directory-photo {
margin-left: 25px;

View File

@ -104,3 +104,27 @@ li:hover .group-edit-icon {
.chatroomlist td {
padding: 0 5px 0;
}
/* ratings */
.directory-rating {
float: right;
margin-right: 5px;
}
.slider-container {
padding: 15px;
}
.rating-text-label {
margin-top: 30px;
}
.directory-rating-text {
width: 90%;
margin-left: 5%;
}
.directory-rating-submit {
margin-top: 15px;
}

View File

@ -1,5 +1,6 @@
[region=aside]
[widget=vcard][/widget]
[widget=rating][/widget]
[widget=suggestions][/widget]
[widget=findpeople][/widget]
[/region]

View File

@ -771,6 +771,19 @@ footer {
clear: both;
}
div.rateme {
display: block;
color: $nav_active_icon_colour;
background-color: $nav_bg;
-webkit-border-radius: $radiuspx ;
-moz-border-radius: $radiuspx;
border-radius: $radiuspx;
border: 1px solid $nav_bd;
padding: 5px;
font-weight: bold;
clear: both;
}
#pause {
position: fixed;
bottom: 5px;
@ -1442,16 +1455,22 @@ div.jGrowl div.jGrowl-notification {
width: 90%;
}
a.rconnect {
a.rconnect, div.rateme {
color: $nav_active_icon_colour;
text-decoration: none;
font-weight: normal;
outline: none;
}
a.rconnect:hover {
a.rconnect:hover, div.rateme:hover {
color: #0080FF;
text-decoration: none;
}
.widget.rateme {
margin-top: 15px;
padding: 0;
}
/* header */
header {

View File

@ -50,10 +50,11 @@
{{if $connect}}
<a href="{{$connect_url}}" class="rconnect"><i class="icon-plus connect-icon"></i> {{$connect}}</a>
{{/if}}
</div>
<div id="vcard-end"></div>
{{$chanmenu}}
{{$contact_block}}