Fixes for testbubble
This commit is contained in:
Fabio Comuni
parent
5792b3d358
commit
968e7bb3b1
5 changed files with 101 additions and 49 deletions
|
|
@ -437,11 +437,12 @@ function conversation(&$a, $items, $mode, $update) {
|
||||||
$star = false;
|
$star = false;
|
||||||
|
|
||||||
if ($profile_owner == local_user() && $toplevelpost) {
|
if ($profile_owner == local_user() && $toplevelpost) {
|
||||||
$isstarred = (($item['starred']) ? "starred" : "hidden");
|
$isstarred = (($item['starred']) ? "starred" : "unstarred");
|
||||||
|
|
||||||
$star = array(
|
$star = array(
|
||||||
'do' => t("add star"),
|
'do' => t("add star"),
|
||||||
'undo' => t("remove star"),
|
'undo' => t("remove star"),
|
||||||
|
'toggle' => t("toggle star status"),
|
||||||
'classdo' => (($item['starred']) ? "hidden" : ""),
|
'classdo' => (($item['starred']) ? "hidden" : ""),
|
||||||
'classundo' => (($item['starred']) ? "" : "hidden"),
|
'classundo' => (($item['starred']) ? "" : "hidden"),
|
||||||
'starred' => t('starred'),
|
'starred' => t('starred'),
|
||||||
|
|
|
||||||
|
|
@ -267,12 +267,12 @@
|
||||||
$.get('starred/' + ident, function(data) {
|
$.get('starred/' + ident, function(data) {
|
||||||
if(data.match(/1/)) {
|
if(data.match(/1/)) {
|
||||||
$('#starred-' + ident).addClass('starred');
|
$('#starred-' + ident).addClass('starred');
|
||||||
$('#starred-' + ident).removeClass('hidden');
|
$('#starred-' + ident).removeClass('unstarred');
|
||||||
$('#star-' + ident).addClass('hidden');
|
$('#star-' + ident).addClass('hidden');
|
||||||
$('#unstar-' + ident).removeClass('hidden');
|
$('#unstar-' + ident).removeClass('hidden');
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
$('#starred-' + ident).addClass('hidden');
|
$('#starred-' + ident).addClass('unstarred');
|
||||||
$('#starred-' + ident).removeClass('starred');
|
$('#starred-' + ident).removeClass('starred');
|
||||||
$('#star-' + ident).removeClass('hidden');
|
$('#star-' + ident).removeClass('hidden');
|
||||||
$('#unstar-' + ident).addClass('hidden');
|
$('#unstar-' + ident).addClass('hidden');
|
||||||
|
|
|
||||||
|
|
@ -1,54 +1,55 @@
|
||||||
$langselector
|
<nav>
|
||||||
|
$langselector
|
||||||
|
|
||||||
<span id="banner">$banner</span>
|
<span id="banner">$banner</span>
|
||||||
|
|
||||||
<div id="notifications">
|
<div id="notifications">
|
||||||
{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
|
{{ if $nav.network }}<a id="net-update" class="nav-ajax-update" href="$nav.network.0" title="$nav.network.1"></a>{{ endif }}
|
||||||
{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
|
{{ if $nav.home }}<a id="home-update" class="nav-ajax-update" href="$nav.home.0" title="$nav.home.1"></a>{{ endif }}
|
||||||
{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
|
{{ if $nav.notifications }}<a id="notify-update" class="nav-ajax-update" href="$nav.notifications.0" title="$nav.notifications.1"></a>{{ endif }}
|
||||||
{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
|
{{ if $nav.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<div id="user-menu" >
|
<div id="user-menu" >
|
||||||
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
|
<a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
|
||||||
|
|
||||||
<ul id="user-menu-popup"
|
|
||||||
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
|
||||||
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
|
|
||||||
|
|
||||||
{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
|
|
||||||
|
|
||||||
{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
|
|
||||||
|
|
||||||
{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
|
|
||||||
|
|
||||||
{{ if $nav.community }}
|
|
||||||
<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
|
|
||||||
{{ endif }}
|
|
||||||
|
|
||||||
<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
|
|
||||||
<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
|
|
||||||
|
|
||||||
{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
|
<ul id="user-menu-popup"
|
||||||
{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
|
onmouseover="if (typeof tmenu != 'undefined') clearTimeout(tmenu); openMenu('user-menu-popup')"
|
||||||
{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
|
onmouseout="tmenu=setTimeout('closeMenu(\'user-menu-popup\');',200)">
|
||||||
|
|
||||||
{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
|
{{ if $nav.register }}<li><a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.1">$nav.register.1</a></li>{{ endif }}
|
||||||
{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
|
|
||||||
|
{{ if $nav.home }}<li><a id="nav-home-link" class="nav-commlink $nav.home.2" href="$nav.home.0">$nav.home.1</a></li>{{ endif }}
|
||||||
{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
|
|
||||||
|
|
||||||
{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
|
|
||||||
|
|
||||||
<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
|
{{ if $nav.network }}<li><a id="nav-network-link" class="nav-commlink $nav.network.2" href="$nav.network.0">$nav.network.1</a></li>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $nav.community }}
|
||||||
|
<li><a id="nav-community-link" class="nav-commlink $nav.community.2" href="$nav.community.0" title="$nav.community.3" >$nav.community.1</a></li>
|
||||||
|
{{ endif }}
|
||||||
|
|
||||||
{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
|
<li><a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.1">$nav.search.1</a></li>
|
||||||
{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
|
<li><a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.1">$nav.directory.1</a></li>
|
||||||
</ul>
|
|
||||||
</div>
|
{{ if $nav.notifications }}<li><a id="nav-notify-link" class="nav-commlink nav-sep $nav.notifications.2" href="$nav.notifications.0">$nav.notifications.1</a></li>{{ endif }}
|
||||||
|
{{ if $nav.messages }}<li><a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0">$nav.messages.1</a></li>{{ endif }}
|
||||||
|
{{ if $nav.contacts }}<li><a id="nav-contacts-link" class="nav-commlink $nav.contacts.2" href="$nav.contacts.0">$nav.contacts.1</a></li>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $nav.profiles }}<li><a id="nav-profiles-link" class="nav-commlink nav-sep $nav.profiles.2" href="$nav.profiles.0">$nav.profiles.1</a></li>{{ endif }}
|
||||||
|
{{ if $nav.settings }}<li><a id="nav-settings-link" class="nav-commlink $nav.settings.2" href="$nav.settings.0">$nav.settings.1</a></li>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $nav.manage }}<li><a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0">$nav.manage.1</a></li>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $nav.admin }}<li><a id="nav-admin-link" class="nav-commlink $nav.admin.2" href="$nav.admin.0">$nav.admin.1</a></li>{{ endif }}
|
||||||
|
|
||||||
|
<li><a id="nav-help-link" class="nav-link $nav.help.2" href="$nav.help.0" title="$nav.help.1">$nav.help.1</a></li>
|
||||||
|
|
||||||
|
{{ if $nav.login }}<li><a id="nav-login-link" class="nav-link $nav.login.2" href="$nav.login.0" title="$nav.login.1">$nav.login.1</a></li> {{ endif }}
|
||||||
|
{{ if $nav.logout }}<li><a id="nav-logout-link" class="nav-commlink nav-sep $nav.logout.2" href="$nav.logout.0">$nav.logout.1</a></li> {{ endif }}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
|
||||||
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
|
{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.1">$nav.apps.1</a>{{ endif }}
|
||||||
|
|
||||||
|
|
||||||
|
</nav>
|
||||||
|
|
||||||
|
|
|
||||||
45
view/theme/testbubble/profile_vcard.tpl
Normal file
45
view/theme/testbubble/profile_vcard.tpl
Normal file
|
|
@ -0,0 +1,45 @@
|
||||||
|
<div class="vcard">
|
||||||
|
<div class="fn label">$profile.name</div>
|
||||||
|
|
||||||
|
|
||||||
|
{{ if $pdesc }}<div class="title">$profile.pdesc</div>{{ endif }}
|
||||||
|
<div id="profile-photo-wrapper"><img class="photo" width="175" height="175" src="$profile.photo" alt="$profile.name"></div>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
{{ if $location }}
|
||||||
|
<dl class="location"><dt class="location-label">$location</dt>
|
||||||
|
<dd class="adr">
|
||||||
|
{{ if $profile.address }}<div class="street-address">$profile.address</div>{{ endif }}
|
||||||
|
<span class="city-state-zip">
|
||||||
|
<span class="locality">$profile.locality</span>{{ if $profile.locality }}, {{ endif }}
|
||||||
|
<span class="region">$profile.region</span>
|
||||||
|
<span class="postal-code">$profile.postal-code</span>
|
||||||
|
</span>
|
||||||
|
{{ if $profile.country-name }}<span class="country-name">$profile.country-name</span>{{ endif }}
|
||||||
|
</dd>
|
||||||
|
</dl>
|
||||||
|
{{ endif }}
|
||||||
|
|
||||||
|
{{ if $gender }}<dl class="mf"><dt class="gender-label">$gender</dt> <dd class="x-gender">$profile.gender</dd></dl>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $profile.pubkey }}<div class="key" style="display:none;">$profile.pubkey</div>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $marital }}<dl class="marital"><dt class="marital-label"><span class="heart">♥</span>$marital</dt><dd class="marital-text">$profile.marital</dd></dl>{{ endif }}
|
||||||
|
|
||||||
|
{{ if $homepage }}<dl class="homepage"><dt class="homepage-label">$homepage</dt><dd class="homepage-url"><a href="$profile.homepage" target="external-link">$profile.homepage</a></dd></dl>{{ endif }}
|
||||||
|
|
||||||
|
{{ inc diaspora_vcard.tpl }}{{ endinc }}
|
||||||
|
|
||||||
|
<div id="profile-extra-links">
|
||||||
|
<ul>
|
||||||
|
{{ if $connect }}
|
||||||
|
<li><a id="dfrn-request-link" href="dfrn_request/$profile.nickname">$connect</a></li>
|
||||||
|
{{ endif }}
|
||||||
|
</ul>
|
||||||
|
</div>
|
||||||
|
</div>
|
||||||
|
|
||||||
|
$contact_block
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -27,9 +27,14 @@
|
||||||
|
|
||||||
<div class="wall-item-tools" id="wall-item-tools-$id">
|
<div class="wall-item-tools" id="wall-item-tools-$id">
|
||||||
$vote
|
$vote
|
||||||
$plink
|
{{ if $plink }}
|
||||||
|
<div class="wall-item-links-wrapper"><a href="$plink.href" title="$plink.title" target="external-link" class="icon remote-link"></a></div>
|
||||||
|
{{ endif }}
|
||||||
$edpost
|
$edpost
|
||||||
$star
|
|
||||||
|
{{ if $star }}
|
||||||
|
<a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
|
||||||
|
{{ endif }}
|
||||||
$drop
|
$drop
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue