quattro post preview, style contacts pages, style for "shiny" class, fix contacts...

remove html from viewcontacts.php and contacts.php
use contact_template.tpl to print contacts also in viewcontacts

diff --git a/mod/contacts.php b/mod/contacts.php
index 418cddf17a830018276702bed045ba05306b96f6..c8edea151866d91c2cd56e3b75d8f5a22526bac9 100755 (executable)
--- a/mod/contacts.php
+++ b/mod/contacts.php
@@ -451,19 +451,7 @@ function contacts_content(&$a) {
                $a->set_pager_total($r[0]['total']);
 
 
-       $tpl = get_markup_template("contacts-top.tpl");
-       $o .= replace_macros($tpl,array(
-               '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
-               '$tabs' => $t,
-               '$total' => $r[0]['total'],
-               '$search' => $search_hdr,
-               '$desc' => t('Search your contacts'),
-               '$finding' => (strlen($search) ? '<h4>' . t('Finding: ') . "'" . $search . "'" . '</h4>' : ""),
-               '$submit' => t('Find'),
-               '$cmd' => $a->cmd
-
 
-       )); 
 
        $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `pending` = 0 $sql_extra $sql_extra2 ORDER BY `name` ASC LIMIT %d , %d ",
                intval($_SESSION['uid']),
@@ -471,9 +459,9 @@ function contacts_content(&$a) {
                intval($a->pager['itemspage'])
        );
 
-       if(count($r)) {
+       $contacts = array();
 
-               $tpl = get_markup_template("contact_template.tpl");
+       if(count($r)) {
 
                foreach($r as $rr) {
                        if($rr['self'])
@@ -505,24 +493,40 @@ function contacts_content(&$a) {
                        }
 
 
-                       $o .= replace_macros($tpl, array(
-                               '$img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
-                               '$edit_hover' => t('Edit contact'),
-                               '$contact_photo_menu' => contact_photo_menu($rr),
-                               '$id' => $rr['id'],
-                               '$alt_text' => $alt_text,
-                               '$dir_icon' => $dir_icon,
-                               '$thumb' => $rr['thumb'], 
-                               '$name' => $rr['name'],
-                               '$username' => $rr['name'],
-                               '$sparkle' => $sparkle,
-                               '$url' => $url
-                       ));
+                       $contacts[] = array(
+                               'img_hover' => sprintf( t('Visit %s\'s profile [%s]'),$rr['name'],$rr['url']),
+                               'edit_hover' => t('Edit contact'),
+                               'photo_menu' => contact_photo_menu($rr),
+                               'id' => $rr['id'],
+                               'alt_text' => $alt_text,
+                               'dir_icon' => $dir_icon,
+                               'thumb' => $rr['thumb'], 
+                               'name' => $rr['name'],
+                               'username' => $rr['name'],
+                               'sparkle' => $sparkle,
+                               'url' => $url,
+                               'item' => $rr,
+                       );
                }
 
-               $o .= '<div id="contact-edit-end"></div>';
+               
 
        }
-       $o .= paginate($a);
+       
+       $tpl = get_markup_template("contacts-template.tpl");
+       $o .= replace_macros($tpl,array(
+               '$header' => t('Contacts') . (($nets) ? ' - ' . network_to_name($nets) : ''),
+               '$tabs' => $t,
+               '$total' => $r[0]['total'],
+               '$search' => $search_hdr,
+               '$desc' => t('Search your contacts'),
+               '$finding' => (strlen($search) ? t('Finding: ') . "'" . $search . "'" : ""),
+               '$submit' => t('Find'),
+               '$cmd' => $a->cmd,
+               '$contacts' => $contacts,
+               '$paginate' => paginate($a),
+
+       )); 
+       
        return $o;
 }

diff --git a/mod/viewcontacts.php b/mod/viewcontacts.php
index cd8d100ed186cca55e85918a50200482705a1565..10c980d93bfb2e814f58a51df617a96dd7f48a3e 100755 (executable)
--- a/mod/viewcontacts.php
+++ b/mod/viewcontacts.php
@@ -1,4 +1,5 @@
 <?php
+require_once('include/contact_selectors.php');
 
 function viewcontacts_init(&$a) {
 
@@ -22,8 +23,6 @@ function viewcontacts_content(&$a) {
                return;
        } 
 
-       $o .= '<h3>' . t('View Contacts') . '</h3>';
-
 
        $r = q("SELECT COUNT(*) as `total` FROM `contact` WHERE `uid` = %d AND `blocked` = 0 AND `pending` = 0 AND `hidden` = 0 ",
                intval($a->profile['uid'])
@@ -41,7 +40,7 @@ function viewcontacts_content(&$a) {
                return $o;
        }
 
-       $tpl = get_markup_template("viewcontact_template.tpl");
+       $contacts = array();
 
        foreach($r as $rr) {
                if($rr['self'])
@@ -56,19 +55,26 @@ function viewcontacts_content(&$a) {
                if($is_owner && ($rr['network'] === NETWORK_DFRN) && ($rr['rel']))
                        $url = 'redir/' . $rr['id'];
 
-               $o .= replace_macros($tpl, array(
-                       '$id' => $rr['id'],
-                       '$alt_text' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
-                       '$thumb' => $rr['thumb'], 
-                       '$name' => substr($rr['name'],0,20),
-                       '$username' => $rr['name'],
-                       '$url' => $url
-               ));
+               $contacts[] = array(
+                       'id' => $rr['id'],
+                       'img_hover' => sprintf( t('Visit %s\'s profile [%s]'), $rr['name'], $rr['url']),
+                       'thumb' => $rr['thumb'], 
+                       'name' => substr($rr['name'],0,20),
+                       'username' => $rr['name'],
+                       'url' => $url,
+                       'sparkle' => '',
+                       'item' => $rr,
+               );
        }
 
-       $o .= '<div id="view-contact-end"></div>';
 
-       $o .= paginate($a);
+       $tpl = get_markup_template("viewcontact_template.tpl");
+       $o .= replace_macros($tpl, array(
+               '$title' => t('View Contacts'),
+               '$contacts' => $contacts,
+               '$paginate' => paginate($a),
+       ));
+
 
        return $o;
 }

diff --git a/view/contact_template.tpl b/view/contact_template.tpl
index e1a080b67560cb772e03a8efe58d0a6c3b4c4f6e..d6f114d6ebab4e2d5e3946cbcb434e4bbf589a8b 100755 (executable)
--- a/view/contact_template.tpl
+++ b/view/contact_template.tpl
@@ -1,23 +1,25 @@
 
-<div class="contact-entry-wrapper" id="contact-entry-wrapper-$id" >
-       <div class="contact-entry-photo-wrapper" >
-               <div class="contact-entry-photo mframe" id="contact-entry-photo-$id"
-               onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
+<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
+       <div class="contact-photo-wrapper" >
+               <div class="contact-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
 
-                       <a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
-
-                       <span onclick="openClose('contact-photo-menu-$id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$id">menu</span>
-                <div class="contact-photo-menu" id="contact-photo-menu-$id">
-                    <ul>
-                        $contact_photo_menu
-                    </ul>
-                </div>
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
 
+                       {{ if $contact.photo_menu }}
+                       <a href="#" rel="#contact-photo-menu-$contact.id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$contact.id">menu</a>
+                       <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$contact.id">
+                               $contact.photo_menu
+                       </ul>
+                       {{ endif }}
                </div>
                        
        </div>
-       <div class="contact-entry-photo-end" ></div>
-               <div class="contact-entry-name" id="contact-entry-name-$id" >$name</div>
+       <div class="contact-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+       <div class="contact-details" id="contact-entry-url-$contact.id" >$contact.item.url</div>
+       <div class="contact-details" id="contact-entry-network-$contact.id" >$contact.item.network|network_to_name</div>
+
 
-       <div class="contact-entry-end" ></div>
 </div>
+

diff --git a/view/contacts-template.tpl b/view/contacts-template.tpl
new file mode 100755 (executable)
index 0000000..ecb342b
--- /dev/null
+++ b/view/contacts-template.tpl
@@ -0,0 +1,26 @@
+<h1>$header{{ if $total }} ($total){{ endif }}</h1>
+
+{{ if $finding }}<h4>$finding</h4>{{ endif }}
+
+<div id="contacts-search-wrapper">
+<form id="contacts-search-form" action="$cmd" method="get" >
+<span class="contacts-search-desc">$desc</span>
+<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
+<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
+</form>
+</div>
+<div id="contacts-search-end"></div>
+
+$tabs
+
+
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
+
+

diff --git a/view/contacts-top.tpl b/view/contacts-top.tpl
deleted file mode 100755 (executable)
index fca3efd..0000000
--- a/view/contacts-top.tpl
+++ /dev/null
@@ -1,18 +0,0 @@
-<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-
-$finding
-
-<div id="contacts-search-wrapper">
-<form id="contacts-search-form" action="$cmd" method="get" >
-<span class="contacts-search-desc">$desc</span>
-<input type="text" name="search" id="contacts-search" class="search-input" onfocus="this.select();" value="$search" />
-<input type="submit" name="submit" id="contacts-search-submit" value="$submit" />
-</form>
-</div>
-<div id="contacts-search-end"></div>
-
-$tabs
-
-
-
-

diff --git a/view/jot.tpl b/view/jot.tpl
index 1c19dd6fac0a8891c5e93a9a68f926ceb5f3ab6b..2c1ce5ae1fdcf4ac54897c994766efb9a0e90d30 100755 (executable)
--- a/view/jot.tpl
+++ b/view/jot.tpl
@@ -1,4 +1,4 @@
-<form action="$action" method="post">
+<form id="profile-jot-form" action="$action" method="post">
        <div id="jot">
                <div id="profile-jot-desc" class="jothidden" >&nbsp;</div>
                <input name="title" id="jot-title" type="text" placeholder="$placeholdertitle" value="$title" class="jothidden" style="display:none">
@@ -22,6 +22,7 @@
                        <li><a id="profile-audio" onclick="jotAudioURL();return false;" title="$audio">$shortaudio</a></li>
                        <li><a id="profile-location" onclick="jotGetLocation();return false;" title="$setloc">$shortsetloc</a></li>
                        <li><a id="profile-nolocation" onclick="jotClearLocation();return false;" title="$noloc">$shortnoloc</a></li>
+                       <li><a id="jot-preview-link" onclick="preview_post(); return false;" title="$preview">$preview</a></li>
                        $jotplugins
 
                        <li class="perms"><a id="jot-perms-icon" href="#profile-jot-acl-wrapper" class="icon s22 $lockstate $bang"  title="$permset" ></a></li>
@@ -29,6 +30,8 @@
                        <li id="profile-rotator" class="loading" style="display: none"><img src="images/rotator.gif" alt="$wait" title="$wait"  /></li>
                </ul>
        </div>
+       
+       <div id="jot-preview-content" style="display:none;"></div>
 
        <div style="display: none;">
                <div id="profile-jot-acl-wrapper" style="width:auto;height:auto;overflow:auto;">

diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl
new file mode 100755 (executable)
index 0000000..48930b4
--- /dev/null
+++ b/view/theme/dispy/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+       <div class="contact-entry-photo-wrapper" >
+               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+                       {{ if $contact.photo_menu }}
+                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+                       {{ endif }}
+               </div>
+                       
+       </div>
+       <div class="contact-entry-photo-end" ></div>
+               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+       <div class="contact-entry-end" ></div>
+</div>

diff --git a/view/theme/duepuntozero/contact_template.tpl b/view/theme/duepuntozero/contact_template.tpl
new file mode 100755 (executable)
index 0000000..48930b4
--- /dev/null
+++ b/view/theme/duepuntozero/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+       <div class="contact-entry-photo-wrapper" >
+               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+                       {{ if $contact.photo_menu }}
+                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+                       {{ endif }}
+               </div>
+                       
+       </div>
+       <div class="contact-entry-photo-end" ></div>
+               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+       <div class="contact-entry-end" ></div>
+</div>

diff --git a/view/theme/loozah/contact_template.tpl b/view/theme/loozah/contact_template.tpl
new file mode 100755 (executable)
index 0000000..48930b4
--- /dev/null
+++ b/view/theme/loozah/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+       <div class="contact-entry-photo-wrapper" >
+               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+                       {{ if $contact.photo_menu }}
+                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+                       {{ endif }}
+               </div>
+                       
+       </div>
+       <div class="contact-entry-photo-end" ></div>
+               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+       <div class="contact-entry-end" ></div>
+</div>

diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less
index 5314b52843021c67988bcfd31f5a175f86904dc2..18d0fc620d45b3c582d46688a0c26648ded3e357 100755 (executable)
--- a/view/theme/quattro/colors.less
+++ b/view/theme/quattro/colors.less
@@ -1,6 +1,7 @@
 // Quattro Theme LESS file
 
 // "Echo" palette from Inkscape
+@Yellow1 : #fce94f;
 @Blue1:rgb(25,174,255);
 @Blue2:rgb(0,132,200);
 @Blue3:rgb(0,92,148);
@@ -71,6 +72,7 @@
 @NoticeBackgroundColor: #511919;
 
 @ThreadBackgroundColor: #f6f7f8;
+@ShinyBorderColor: @Yellow1;
 
 @CommentBoxEmptyColor: @Grey3;
 @CommentBoxEmptyBorderColor: @Grey3;
@@ -91,4 +93,4 @@
 @JotPermissionUnlockBackgroundColor: @Grey2;
 @JotPermissionLockBackgroundColor: @Grey4;
 @JotLoadingBackgroundColor: @Grey1;
-
+@JotPreviewBackgroundColor: @Yellow1;

diff --git a/view/theme/quattro/contact_template.tpl b/view/theme/quattro/contact_template.tpl
deleted file mode 100755 (executable)
index f274965..0000000
--- a/view/theme/quattro/contact_template.tpl
+++ /dev/null
@@ -1,21 +0,0 @@
-
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-       <div class="contact-photo-wrapper" >
-               <div class="contact-photo mframe" id="contact-entry-photo-$id"
-               onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
-
-                       <a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
-
-                       <a href="#" rel="#contact-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$id">menu</a>
-                       <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$id">
-                               $contact_photo_menu
-                       </ul>
-
-               </div>
-                       
-       </div>
-       <div class="contact-name" id="contact-entry-name-$id" >$name</div>
-
-
-</div>
-

diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index f834f2e777d77046e60b832df3ab842922f742ff..1c14177c67b9c5bd8b7fbccfc702f78659029ea1 100755 (executable)
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -309,12 +309,13 @@ aside {
        .allcontact-link { float: right; margin: 5px 0px; }
        .contact-block-content {
                clear: both;
-               overflow: auto; height: auto;
+               overflow: idden;        height: auto;
        }
+       /*.contact-block-div { width:60px; height: 60px; }*/
        .contact-block-link {
                float: left;
                margin: 0px 2px 2px 0px;
-               img { widht: 48px; height: 58px; }
+               img { widht: 48px; height: 48px; }
        }
 }
 /* mail view */
@@ -373,6 +374,7 @@ aside {
             top: -50px;
         }
 }
+/*
 #group-members {
        margin-top: 20px;
        padding: 10px;
@@ -395,9 +397,10 @@ aside {
 }
 .contact-block-div {
        float: left;
-       width: 52px;
-       height: 52px;
-}
+       width: 60px;
+       height: 60px;
+}*/
+ 
 /* widget */
 .widget {
        margin-bottom: 2em;
@@ -551,6 +554,8 @@ section {
 
 }
 
+.shiny { border-right:10px solid @ShinyBorderColor; }
+#jot-preview-content .tread-wrapper { background-color: @JotPreviewBackgroundColor; }
 
 
 .wall-item-tags { padding-top: 5px; }
@@ -589,7 +594,7 @@ section {
  right: 5px;
 }
 
-/* contacts menu */
+
 .contact-photo-wrapper { position: relative; }
 .contact-photo { 
        width: 48px; height: 48px;
@@ -606,9 +611,14 @@ section {
 
 .contact-wrapper {
        float: left;
-       width: 90px;
+       width: 300px;
        height: 90px;
-        margin-bottom: 15px;
+       padding-right: 10px;
+       margin: 0 10px 10px 0px;
+       .contact-photo-wrapper { 
+               float: left; 
+               margin-right: 10px;
+       }
        .contact-photo { 
                width: 80px; height: 80px;
                img { width: 80px; height: 80px; }
@@ -627,8 +637,13 @@ section {
                img { width: 175px; height: 175px; }
        }
 }
-.contact-name { text-align: center; font-weight: bold; }
-.contact-details { color: @Grey3;}
+.contact-name { font-weight: bold; padding-top: 15px; }
+.contact-details { 
+       color: @Grey3; white-space: nowrap;
+       overflow: hidden;
+       text-overflow: ellipsis;
+}
+
 /* editor */
 .jothidden { display: none; }
 #jot {

diff --git a/view/theme/quattro/style.css b/view/theme/quattro/style.css
index ed2baee7adfd0df4042aa6d825ef7680d90c5acd..2a912ccba9e2bc24057b4dfa12fc31d903fee0c3 100755 (executable)
--- a/view/theme/quattro/style.css
+++ b/view/theme/quattro/style.css
@@ -602,6 +602,8 @@ aside #profiles-menu {
 #contact-block {
   overflow: auto;
   height: auto;
+  /*.contact-block-div { width:60px; height: 60px; }*/
+
 }
 #contact-block .contact-block-h4 {
   float: left;
@@ -613,7 +615,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-content {
   clear: both;
-  overflow: auto;
+  overflow: idden;
   height: auto;
 }
 #contact-block .contact-block-link {
@@ -622,7 +624,7 @@ aside #profiles-menu {
 }
 #contact-block .contact-block-link img {
   widht: 48px;
-  height: 58px;
+  height: 48px;
 }
 /* mail view */
 .mail-conv-sender, .mail-conv-detail {
@@ -675,31 +677,32 @@ aside #profiles-menu {
   position: relative;
   top: -50px;
 }
+/*
 #group-members {
-  margin-top: 20px;
-  padding: 10px;
-  height: 250px;
-  overflow: auto;
-  border: 1px solid #ddd;
+       margin-top: 20px;
+       padding: 10px;
+       height: 250px;
+       overflow: auto;
+       border: 1px solid #ddd;
 }
 #group-members-end {
-  clear: both;
+       clear: both;
 }
 #group-all-contacts {
-  padding: 10px;
-  height: 450px;
-  overflow: auto;
-  border: 1px solid #ddd;
+       padding: 10px;
+       height: 450px;
+       overflow: auto;
+       border: 1px solid #ddd;
 }
 #group-all-contacts-end {
-  clear: both;
-  margin-bottom: 10px;
+       clear: both;
+       margin-bottom: 10px;
 }
 .contact-block-div {
-  float: left;
-  width: 52px;
-  height: 52px;
-}
+       float: left;
+       width: 60px;
+       height: 60px;
+}*/
 /* widget */
 .widget {
   margin-bottom: 2em;
@@ -946,6 +949,12 @@ section {
   padding: 0;
   margin: 10px 0;
 }
+.shiny {
+  border-right: 10px solid #fce94f;
+}
+#jot-preview-content .tread-wrapper {
+  background-color: #fce94f;
+}
 .wall-item-tags {
   padding-top: 5px;
 }
@@ -985,7 +994,6 @@ section {
   bottom: 5px;
   right: 5px;
 }
-/* contacts menu */
 .contact-photo-wrapper {
   position: relative;
 }
@@ -1007,9 +1015,14 @@ section {
 }
 .contact-wrapper {
   float: left;
-  width: 90px;
+  width: 300px;
   height: 90px;
-  margin-bottom: 15px;
+  padding-right: 10px;
+  margin: 0 10px 10px 0px;
+}
+.contact-wrapper .contact-photo-wrapper {
+  float: left;
+  margin-right: 10px;
 }
 .contact-wrapper .contact-photo {
   width: 80px;
@@ -1037,11 +1050,14 @@ section {
   height: 175px;
 }
 .contact-name {
-  text-align: center;
   font-weight: bold;
+  padding-top: 15px;
 }
 .contact-details {
   color: #999999;
+  white-space: nowrap;
+  overflow: hidden;
+  text-overflow: ellipsis;
 }
 /* editor */
 .jothidden {

diff --git a/view/theme/testbubble/contact_template.tpl b/view/theme/testbubble/contact_template.tpl
new file mode 100755 (executable)
index 0000000..48930b4
--- /dev/null
+++ b/view/theme/testbubble/contact_template.tpl
@@ -0,0 +1,25 @@
+
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+       <div class="contact-entry-photo-wrapper" >
+               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
+
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
+
+                       {{ if $contact.photo_menu }}
+                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+                       {{ endif }}
+               </div>
+                       
+       </div>
+       <div class="contact-entry-photo-end" ></div>
+               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
+
+       <div class="contact-entry-end" ></div>
+</div>

diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl
old mode 100644 (file)
new mode 100755 (executable)
index f274965..48930b4
--- a/view/theme/vier/contact_template.tpl
+++ b/view/theme/vier/contact_template.tpl
@@ -1,21 +1,25 @@
 
-<div class="contact-wrapper" id="contact-entry-wrapper-$id" >
-       <div class="contact-photo-wrapper" >
-               <div class="contact-photo mframe" id="contact-entry-photo-$id"
-               onmouseover="if (typeof t$id != 'undefined') clearTimeout(t$id); openMenu('contact-photo-menu-button-$id')" onmouseout="t$id=setTimeout('closeMenu(\'contact-photo-menu-button-$id\'); closeMenu(\'contact-photo-menu-$id\');',200)" >
+<div class="contact-entry-wrapper" id="contact-entry-wrapper-$contact.id" >
+       <div class="contact-entry-photo-wrapper" >
+               <div class="contact-entry-photo mframe" id="contact-entry-photo-$contact.id"
+               onmouseover="if (typeof t$contact.id != 'undefined') clearTimeout(t$contact.id); openMenu('contact-photo-menu-button-$contact.id')" 
+               onmouseout="t$contact.id=setTimeout('closeMenu(\'contact-photo-menu-button-$contact.id\'); closeMenu(\'contact-photo-menu-$contact.id\');',200)" >
 
-                       <a href="$url" title="$img_hover" /><img src="$thumb" $sparkle alt="$name" /></a>
-
-                       <a href="#" rel="#contact-photo-menu-$id" class="contact-photo-menu-button icon s16 menu" id="contact-photo-menu-button-$id">menu</a>
-                       <ul class="contact-photo-menu menu-popup" id="contact-photo-menu-$id">
-                               $contact_photo_menu
-                       </ul>
+                       <a href="$contact.url" title="$contact.img_hover" /><img src="$contact.thumb" $contact.sparkle alt="$contact.name" /></a>
 
+                       {{ if $contact.photo_menu }}
+                       <span onclick="openClose('contact-photo-menu-$contact.id');" class="fakelink contact-photo-menu-button" id="contact-photo-menu-button-$contact.id">menu</span>
+                <div class="contact-photo-menu" id="contact-photo-menu-$contact.id">
+                    <ul>
+                        $contact.photo_menu
+                    </ul>
+                </div>
+                       {{ endif }}
                </div>
                        
        </div>
-       <div class="contact-name" id="contact-entry-name-$id" >$name</div>
-
+       <div class="contact-entry-photo-end" ></div>
+               <div class="contact-entry-name" id="contact-entry-name-$contact.id" >$contact.name</div>
 
+       <div class="contact-entry-end" ></div>
 </div>
-

diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl
index c61544f9f899368413c3763dcbe2c98e8ab43d6e..d6f01643ea6893dbc88150e7d11e2febcdbe8a29 100755 (executable)
--- a/view/viewcontact_template.tpl
+++ b/view/viewcontact_template.tpl
@@ -1,9 +1,9 @@
+<h3>$title</h3>
 
-<div class="contact-wrapper" id="view-contact-wrapper-$id" >
-       <div class="contact-photo-wrapper" >
-               <div class="mframe contact-photo" id="view-contact-photo-$id" >
-                       <a href="$url" title="$alt_text" /><img src="$thumb" alt="$name" /></a>
-               </div>
-       </div>
-       <div class="contact-name" id="view-contact-name-$id" >$name</div>
-</div>
+{{ for $contacts as $contact }}
+       {{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+
+<div id="view-contact-end"></div>
+
+$paginate