Fixes for testbubble

diff --git a/include/conversation.php b/include/conversation.php
index 10d9bad2cd34fdd8d51b6b3046efdd865227ded4..acbbc9bd5ee040176ab61f3486f4e18180f83aa3 100644 (file)
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -437,11 +437,12 @@ function conversation(&$a, $items, $mode, $update) {
                        $star = false;
 
                        if ($profile_owner == local_user() && $toplevelpost) {
-                               $isstarred = (($item['starred']) ? "starred" : "hidden");
+                               $isstarred = (($item['starred']) ? "starred" : "unstarred");
 
                                $star = array(
                                        'do' => t("add star"),
                                        'undo' => t("remove star"),
+                                       'toggle' => t("toggle star status"),
                                        'classdo' => (($item['starred']) ? "hidden" : ""),
                                        'classundo' => (($item['starred']) ? "" : "hidden"),
                                        'starred' =>  t('starred'),

diff --git a/js/main.js b/js/main.js
index f08b669e3d35f72ef18d4f1a2e0e0c4b4e8da88b..896cbeb569937c6aa9f022d296ece85744d1df29 100644 (file)
--- a/js/main.js
+++ b/js/main.js
@@ -267,12 +267,12 @@
                $.get('starred/' + ident, function(data) {
                        if(data.match(/1/)) {
                                $('#starred-' + ident).addClass('starred');
-                               $('#starred-' + ident).removeClass('hidden');
+                               $('#starred-' + ident).removeClass('unstarred');
                                $('#star-' + ident).addClass('hidden');
                                $('#unstar-' + ident).removeClass('hidden');
                        }
                        else {                  
-                               $('#starred-' + ident).addClass('hidden');
+                               $('#starred-' + ident).addClass('unstarred');
                                $('#starred-' + ident).removeClass('starred');
                                $('#star-' + ident).removeClass('hidden');
                                $('#unstar-' + ident).addClass('hidden');

diff --git a/view/theme/testbubble/nav.tpl b/view/theme/testbubble/nav.tpl
index f20683366945536119a1c780a6e4b89576b7955d..359d01bc1f93c8d5b90e30eb2e0b722c3ecd8317 100644 (file)
--- a/view/theme/testbubble/nav.tpl
+++ b/view/theme/testbubble/nav.tpl
@@ -1,54 +1,55 @@
-$langselector
-
-<span id="banner">$banner</span>
-
-<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.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.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
-</div>
-
-<div id="user-menu" >
-       <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 }}
-           {{ 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 }}
+<nav>
+       $langselector
+
+       <span id="banner">$banner</span>
+
+       <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.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.messages }}<a id="mail-update" class="nav-ajax-update" href="$nav.messages.0" title="$nav.messages.1"></a>{{ endif }}
+       </div>
+
+       <div id="user-menu" >
+               <a id="user-menu-label" onclick="openClose('user-menu-popup'); return false" href="$nav.home.0">$sitelocation</a>
                
-               <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>
+               <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.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.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 }}
+                       {{ 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>
 

diff --git a/view/theme/testbubble/profile_vcard.tpl b/view/theme/testbubble/profile_vcard.tpl
new file mode 100644 (file)
index 0000000..0ee6919
--- /dev/null
+++ b/view/theme/testbubble/profile_vcard.tpl
@@ -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">&hearts;</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
+
+

diff --git a/view/theme/testbubble/wall_item.tpl b/view/theme/testbubble/wall_item.tpl
index b8af3685fc24bfb11cf17dc3412cd29a55f8df01..47f062affb04808a65a211745055bd2524634236 100644 (file)
--- a/view/theme/testbubble/wall_item.tpl
+++ b/view/theme/testbubble/wall_item.tpl
@@ -27,9 +27,14 @@
 
                <div class="wall-item-tools" id="wall-item-tools-$id">
                        $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
-                       $star
+                        
+                       {{ if $star }}
+                       <a href="#" id="starred-$id" onclick="dostar($id); return false;" class="star-item icon $isstarred" title="$star.toggle"></a>
+                       {{ endif }}
                        $drop
                </div>