aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfabrixxm <fabrix.xm@gmail.com>2012-02-23 02:52:04 -0800
committerfabrixxm <fabrix.xm@gmail.com>2012-02-23 02:52:04 -0800
commitd5adb67ef480bd24bcca4d384eba72e51ae27446 (patch)
tree6e7daff5fffd3adf40b30db3b66221543c3d1ec4
parent85d09f48d0bdddd43c8dd13c618cc714a679d141 (diff)
parentcbc60d525e9140169c3b2d03998c53907b2fa3a7 (diff)
downloadvolse-hubzilla-d5adb67ef480bd24bcca4d384eba72e51ae27446.tar.gz
volse-hubzilla-d5adb67ef480bd24bcca4d384eba72e51ae27446.tar.bz2
volse-hubzilla-d5adb67ef480bd24bcca4d384eba72e51ae27446.zip
Merge pull request #46 from fabrixxm/master
more work on quattro theme and less html in php
-rwxr-xr-xmod/contacts.php62
-rwxr-xr-xmod/viewcontacts.php32
-rwxr-xr-xview/contact_template.tpl32
-rwxr-xr-xview/contacts-template.tpl (renamed from view/contacts-top.tpl)10
-rwxr-xr-xview/jot.tpl5
-rwxr-xr-xview/theme/dispy/contact_template.tpl25
-rwxr-xr-xview/theme/duepuntozero/contact_template.tpl25
-rwxr-xr-xview/theme/loozah/contact_template.tpl25
-rwxr-xr-xview/theme/quattro/colors.less4
-rwxr-xr-xview/theme/quattro/contact_template.tpl21
-rwxr-xr-xview/theme/quattro/quattro.less35
-rwxr-xr-xview/theme/quattro/style.css60
-rwxr-xr-xview/theme/testbubble/contact_template.tpl25
-rwxr-xr-x[-rw-r--r--]view/theme/vier/contact_template.tpl30
-rwxr-xr-xview/viewcontact_template.tpl16
15 files changed, 273 insertions, 134 deletions
diff --git a/mod/contacts.php b/mod/contacts.php
index 418cddf17..c8edea151 100755
--- 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 cd8d100ed..10c980d93 100755
--- 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 e1a080b67..d6f114d6e 100755
--- 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-top.tpl b/view/contacts-template.tpl
index fca3efd54..ecb342bf4 100755
--- a/view/contacts-top.tpl
+++ b/view/contacts-template.tpl
@@ -1,6 +1,6 @@
<h1>$header{{ if $total }} ($total){{ endif }}</h1>
-$finding
+{{ if $finding }}<h4>$finding</h4>{{ endif }}
<div id="contacts-search-wrapper">
<form id="contacts-search-form" action="$cmd" method="get" >
@@ -14,5 +14,13 @@ $finding
$tabs
+{{ for $contacts as $contact }}
+ {{ inc contact_template.tpl }}{{ endinc }}
+{{ endfor }}
+<div id="contact-edit-end"></div>
+
+$paginate
+
+
diff --git a/view/jot.tpl b/view/jot.tpl
index 1c19dd6fa..2c1ce5ae1 100755
--- 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
index 000000000..48930b48a
--- /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
index 000000000..48930b48a
--- /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
index 000000000..48930b48a
--- /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 5314b5284..18d0fc620 100755
--- 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
index f2749656a..000000000
--- 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 f834f2e77..1c14177c6 100755
--- 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 ed2baee7a..2a912ccba 100755
--- 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
index 000000000..48930b48a
--- /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
index f2749656a..48930b48a 100644..100755
--- 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 c61544f9f..d6f01643e 100755
--- 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