From cbc60d525e9140169c3b2d03998c53907b2fa3a7 Mon Sep 17 00:00:00 2001 From: Fabio Comuni Date: Thu, 23 Feb 2012 11:22:32 +0100 Subject: [PATCH] quattro post preview, style contacts pages, style for "shiny" class, fix contacts list in profile aside. remove html from viewcontacts.php and contacts.php use contact_template.tpl to print contacts also in viewcontacts --- mod/contacts.php | 62 ++++++++++--------- mod/viewcontacts.php | 32 ++++++---- view/contact_template.tpl | 32 +++++----- ...contacts-top.tpl => contacts-template.tpl} | 10 ++- view/jot.tpl | 5 +- view/theme/dispy/contact_template.tpl | 25 ++++++++ view/theme/duepuntozero/contact_template.tpl | 25 ++++++++ view/theme/loozah/contact_template.tpl | 25 ++++++++ view/theme/quattro/colors.less | 4 +- view/theme/quattro/contact_template.tpl | 21 ------- view/theme/quattro/quattro.less | 35 ++++++++--- view/theme/quattro/style.css | 60 +++++++++++------- view/theme/testbubble/contact_template.tpl | 25 ++++++++ view/theme/vier/contact_template.tpl | 30 +++++---- view/viewcontact_template.tpl | 16 ++--- 15 files changed, 273 insertions(+), 134 deletions(-) rename view/{contacts-top.tpl => contacts-template.tpl} (71%) create mode 100755 view/theme/dispy/contact_template.tpl create mode 100755 view/theme/duepuntozero/contact_template.tpl create mode 100755 view/theme/loozah/contact_template.tpl delete mode 100755 view/theme/quattro/contact_template.tpl create mode 100755 view/theme/testbubble/contact_template.tpl mode change 100644 => 100755 view/theme/vier/contact_template.tpl diff --git a/mod/contacts.php b/mod/contacts.php index 418cddf17a..c8edea1518 100755 --- a/mod/contacts.php +++ b/mod/contacts.php @@ -451,29 +451,17 @@ 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) ? '

' . t('Finding: ') . "'" . $search . "'" . '

' : ""), - '$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']), intval($a->pager['start']), 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 .= '
'; + } - $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 cd8d100ed1..10c980d93b 100755 --- a/mod/viewcontacts.php +++ b/mod/viewcontacts.php @@ -1,4 +1,5 @@ ' . t('View Contacts') . ''; - $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 .= '
'; - $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 e1a080b675..d6f114d6eb 100755 --- a/view/contact_template.tpl +++ b/view/contact_template.tpl @@ -1,23 +1,25 @@ -
-
-
+
+
+
- $name - - menu -
-
    - $contact_photo_menu -
-
+ $contact.name + {{ if $contact.photo_menu }} + menu + + {{ endif }}
-
-
$name
+
$contact.name
+
$contact.item.url
+
$contact.item.network|network_to_name
+ -
+ diff --git a/view/contacts-top.tpl b/view/contacts-template.tpl similarity index 71% rename from view/contacts-top.tpl rename to view/contacts-template.tpl index fca3efd54b..ecb342bf44 100755 --- a/view/contacts-top.tpl +++ b/view/contacts-template.tpl @@ -1,6 +1,6 @@

$header{{ if $total }} ($total){{ endif }}

-$finding +{{ if $finding }}

$finding

{{ endif }}
@@ -14,5 +14,13 @@ $finding $tabs +{{ for $contacts as $contact }} + {{ inc contact_template.tpl }}{{ endinc }} +{{ endfor }} +
+ +$paginate + + diff --git a/view/jot.tpl b/view/jot.tpl index 1c19dd6fac..2c1ce5ae1f 100755 --- a/view/jot.tpl +++ b/view/jot.tpl @@ -1,4 +1,4 @@ - +
 
@@ -22,6 +22,7 @@
  • $shortaudio
  • $shortsetloc
  • $shortnoloc
    • +
  • $preview
    • $jotplugins
    • @@ -29,6 +30,8 @@
    + +
    diff --git a/view/theme/dispy/contact_template.tpl b/view/theme/dispy/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/dispy/contact_template.tpl @@ -0,0 +1,25 @@ + +
    +
    +
    + + $contact.name + + {{ if $contact.photo_menu }} + menu +
    +
      + $contact.photo_menu +
    +
    + {{ endif }} +
    + +
    +
    +
    $contact.name
    + +
    +
    diff --git a/view/theme/duepuntozero/contact_template.tpl b/view/theme/duepuntozero/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/duepuntozero/contact_template.tpl @@ -0,0 +1,25 @@ + +
    +
    +
    + + $contact.name + + {{ if $contact.photo_menu }} + menu +
    +
      + $contact.photo_menu +
    +
    + {{ endif }} +
    + +
    +
    +
    $contact.name
    + +
    +
    diff --git a/view/theme/loozah/contact_template.tpl b/view/theme/loozah/contact_template.tpl new file mode 100755 index 0000000000..48930b48ab --- /dev/null +++ b/view/theme/loozah/contact_template.tpl @@ -0,0 +1,25 @@ + +
    +
    +
    + + $contact.name + + {{ if $contact.photo_menu }} + menu +
    +
      + $contact.photo_menu +
    +
    + {{ endif }} +
    + +
    +
    +
    $contact.name
    + +
    +
    diff --git a/view/theme/quattro/colors.less b/view/theme/quattro/colors.less index 5314b52843..18d0fc620d 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 f2749656a2..0000000000 --- a/view/theme/quattro/contact_template.tpl +++ /dev/null @@ -1,21 +0,0 @@ - -
    -
    -
    - - $name - - menu - - -
    - -
    -
    $name
    - - -
    - diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index f834f2e777..1c14177c67 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 ed2baee7ad..2a912ccba9 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 0000000000..48930b48ab --- /dev/null +++ b/view/theme/testbubble/contact_template.tpl @@ -0,0 +1,25 @@ + +
    +
    +
    + + $contact.name + + {{ if $contact.photo_menu }} + menu +
    +
      + $contact.photo_menu +
    +
    + {{ endif }} +
    + +
    +
    +
    $contact.name
    + +
    +
    diff --git a/view/theme/vier/contact_template.tpl b/view/theme/vier/contact_template.tpl old mode 100644 new mode 100755 index f2749656a2..48930b48ab --- a/view/theme/vier/contact_template.tpl +++ b/view/theme/vier/contact_template.tpl @@ -1,21 +1,25 @@ -
    -
    -
    +
    +
    +
    - $name - - menu - + $contact.name + {{ if $contact.photo_menu }} + menu +
    +
      + $contact.photo_menu +
    +
    + {{ endif }}
    -
    $name
    - +
    +
    $contact.name
    +
    - diff --git a/view/viewcontact_template.tpl b/view/viewcontact_template.tpl index c61544f9f8..d6f01643ea 100755 --- a/view/viewcontact_template.tpl +++ b/view/viewcontact_template.tpl @@ -1,9 +1,9 @@ +

    $title

    -
    -
    -
    - $name -
    -
    -
    $name
    -
    +{{ for $contacts as $contact }} + {{ inc contact_template.tpl }}{{ endinc }} +{{ endfor }} + +
    + +$paginate