diff --git a/mod/network.php b/mod/network.php index f18e3001d..8e7a2b8e1 100644 --- a/mod/network.php +++ b/mod/network.php @@ -154,14 +154,6 @@ function network_init(&$a) { $a->page['aside'] .= saved_searches($search); $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); - if(x($_GET['cid']) && intval($_GET['cid']) != 0) { - $r = q("SELECT `url` FROM `contact` WHERE `id` = %d", - intval($_GET['cid'])); - if ($r) { - $a->page['aside'] = ""; - profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"])); - } - } } function saved_searches($search) { @@ -585,7 +577,7 @@ function network_content(&$a, $update = 0) { } elseif($cid) { - $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl` FROM `contact` WHERE `id` = %d + $r = q("SELECT `id`,`name`,`network`,`writable`,`nurl`, `forum`, `prv`, `addr`, `thumb`, `location` FROM `contact` WHERE `id` = %d AND `blocked` = 0 AND `pending` = 0 LIMIT 1", intval($cid) ); @@ -596,8 +588,18 @@ function network_content(&$a, $update = 0) { ON $sql_table.$sql_parent = `temp1`.`parent` "; $sql_extra = ""; - $o = replace_macros(get_markup_template("section_title.tpl"),array( - '$title' => sprintf( t('Contact: %s'), htmlentities($r[0]['name'])) + $entries[0] = array( + 'id' => 'network', + 'name' => htmlentities($r[0]['name']), + 'itemurl' => (($r[0]['addr']) ? ($r[0]['addr']) : ($r[0]['nurl'])), + 'thumb' => proxy_url($r[0]['thumb'], false, PROXY_SIZE_THUMB), + 'account_type' => (($r[0]['forum']) || ($r[0]['prv']) ? t('Forum') : ''), + 'details' => $r[0]['location'], + ); + + $o = replace_macros(get_markup_template("viewcontact_template.tpl"),array( + 'contacts' => $entries, + 'id' => 'network', )) . $o; if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { diff --git a/view/templates/viewcontact_template.tpl b/view/templates/viewcontact_template.tpl index 455551c68..205ad736d 100644 --- a/view/templates/viewcontact_template.tpl +++ b/view/templates/viewcontact_template.tpl @@ -1,9 +1,11 @@ {{include file="section_title.tpl"}} +
{{foreach $contacts as $contact}} {{include file="contact_template.tpl"}} {{/foreach}} +
diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css index fe2ad73cf..908574f70 100644 --- a/view/theme/duepuntozero/deriv/darkzero.css +++ b/view/theme/duepuntozero/deriv/darkzero.css @@ -20,6 +20,9 @@ div.wall-item-content-wrapper.shiny { background-image: url('ingdarkzero/shiny. nav #banner #logo-text a { color: #ffffff; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network {background-image: url('imgdarkzero/head.jpg');} + .wall-item-content-wrapper { border: 1px solid #444444; background: #444444; diff --git a/view/theme/duepuntozero/deriv/easterbunny.css b/view/theme/duepuntozero/deriv/easterbunny.css index 0619644ea..34bf58f46 100644 --- a/view/theme/duepuntozero/deriv/easterbunny.css +++ b/view/theme/duepuntozero/deriv/easterbunny.css @@ -25,8 +25,10 @@ section { background: #EEFFFF; } a, a:visited { color: #0000FF; text-decoration: none; } a:hover {text-decoration: underline; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { background: #FFDDFF; } -aside( background-image: url('imgeasterbunny/border.jpg'); } +aside { background-image: url('imgeasterbunny/border.jpg'); } .tabs { background-image: url('imgeasterbunny/head.jpg'); } div.wall-item-content-wrapper.shiny { background-image: url('imgeasterbunny/shiny.png'); } diff --git a/view/theme/duepuntozero/deriv/greenzero.css b/view/theme/duepuntozero/deriv/greenzero.css index 0f6f7881e..d446a6161 100644 --- a/view/theme/duepuntozero/deriv/greenzero.css +++ b/view/theme/duepuntozero/deriv/greenzero.css @@ -21,6 +21,7 @@ body { background-image: url('imggreenzero/head.jpg'); } aside { background-image: url('imggreenzero/border.jpg'); } section { background-image: url('imggreenzero/border.jpg'); } .tabs { background-image: url('imggreenzero/head.jpg'); } +#viewcontact_wrapper-network { background: #DBEAD7; } div.wall-item-content-wrapper.shiny { background-image: url('imggreenzero/shiny.png'); } .fakelink, .fakelink:visited, .fakelink:hover, .fakelink:link { diff --git a/view/theme/duepuntozero/deriv/purplezero.css b/view/theme/duepuntozero/deriv/purplezero.css index d59cf5dca..297185768 100644 --- a/view/theme/duepuntozero/deriv/purplezero.css +++ b/view/theme/duepuntozero/deriv/purplezero.css @@ -3,8 +3,9 @@ a:hover {text-decoration: underline; } body { background-image: url('imgpurplezero/head.jpg'); } -aside( background-image: url('imgpurplezero/border.jpg'); } +aside { background-image: url('imgpurplezero/border.jpg'); } section { background-image: url('imgpurplezero/border.jpg'); } +#viewcontact_wrapper-network { background: #ECCAEB; } .tabs { background-image: url('imgpurplezero/head.jpg'); } div.wall-item-content-wrapper.shiny { background-image: url('imgpurplezero/shiny.png'); } diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index bffc8c057..598d121ad 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -278,6 +278,31 @@ div.wall-item-content-wrapper.shiny { margin: 15px 0 15px 150px; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #DBE6F1; + border-bottom: 1px solid #babdb6; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0px +} +#contact-entry-accounttype-network { + font-size: 20px; +} +#contact-entry-name-network { + font-size: 24.5px; +} +/*#contact-entry-name-network>.contact-entry-details, #contact-entry-url-network, +#contact-entry-details-network, contact-entry-network-network { + color: #000; +}*/ + /* from default */ #jot-perms-icon, #profile-location, diff --git a/view/theme/frost-mobile/style.css b/view/theme/frost-mobile/style.css index 9a0c50e1e..a4af7f907 100644 --- a/view/theme/frost-mobile/style.css +++ b/view/theme/frost-mobile/style.css @@ -421,6 +421,27 @@ section { clear: both; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #FAFAFA; + border: 1px solid #DDDDDD; + border-radius: 5px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 0.9em; +} +#contact-entry-name-network { + font-size: 1.5em; +} /* footer */ footer { diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css index 1f0a90938..fc1553e27 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -384,6 +384,27 @@ section { padding-top: 3em; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #FAFAFA; + border: 1px solid #DDDDDD; + border-radius: 5px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 0.9em; +} +#contact-entry-name-network { + font-size: 1.5em; +} /* footer */ footer { diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css index 7b20b4797..1ff2de700 100644 --- a/view/theme/quattro/dark/style.css +++ b/view/theme/quattro/dark/style.css @@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network { + font-size: 22px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network { + font-size: 24.5px; + font-weight: normal; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details { + font-size: 12px; +} /* aside 230px*/ aside { display: table-cell; diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css index c29e9bfbc..2b05335e0 100644 --- a/view/theme/quattro/green/style.css +++ b/view/theme/quattro/green/style.css @@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network { + font-size: 22px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network { + font-size: 24.5px; + font-weight: normal; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details { + font-size: 12px; +} /* aside 230px*/ aside { display: table-cell; diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css index b672edaa9..ec0982a75 100644 --- a/view/theme/quattro/lilac/style.css +++ b/view/theme/quattro/lilac/style.css @@ -791,6 +791,29 @@ ul.menu-popup .toolbar a:hover { color: #9eabb0; display: block; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-accounttype-network { + font-size: 22px; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network #contact-entry-name-network { + font-size: 24.5px; + font-weight: normal; +} +#viewcontact_wrapper-network #contact-entry-wrapper-network .contact-details { + font-size: 12px; +} /* aside 230px*/ aside { display: table-cell; diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less index c2410244f..b6bed2c9c 100644 --- a/view/theme/quattro/quattro.less +++ b/view/theme/quattro/quattro.less @@ -301,7 +301,22 @@ ul.menu-popup { .notif-when { font-size: 10px; color: @MenuItemDetail; display: block; } } - +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #eff0f1; + border-bottom: 1px solid #cccccc; + #contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + #contact-entry-accounttype-network { font-size: 22px; } + #contact-entry-name-network { font-size: 24.5px; font-weight: normal; } + .contact-details { font-size: 12px; } + } +} /* aside 230px*/ diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css index 510b7d9c6..cf2e0a8e4 100644 --- a/view/theme/smoothly/style.css +++ b/view/theme/smoothly/style.css @@ -149,6 +149,30 @@ section { padding-bottom: 2em; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 110px; + background-color: #FAFAFA; + box-shadow: 0 0 8px #BDBDBD; + border-bottom: 1px solid #dedede; + border: 1px solid #7C7D7B; + border-radius: 5px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 20px; +} +#contact-entry-name-network { + font-size: 24.5px; +} + .lframe { border: 1px solid #7C7D7B; box-shadow: 3px 3px 6px #959494; diff --git a/view/theme/vier/breathe.css b/view/theme/vier/breathe.css index 049c1bf4b..5a36de03e 100644 --- a/view/theme/vier/breathe.css +++ b/view/theme/vier/breathe.css @@ -122,3 +122,7 @@ div.pager, ul.tabs { .mail-list-wrapper { border-radius: 5px; } + +#viewcontact_wrapper-network { + border-radius: 5px; +} diff --git a/view/theme/vier/dark.css b/view/theme/vier/dark.css index 01045b6ff..8e128ae27 100644 --- a/view/theme/vier/dark.css +++ b/view/theme/vier/dark.css @@ -57,5 +57,9 @@ input#side-peoplefind-submit, input#side-follow-submit { } li :hover { - color: #767676 !important; + color: #767676 !important; +} + +#viewcontact_wrapper-network { + background-color: #343434; } diff --git a/view/theme/vier/flat.css b/view/theme/vier/flat.css index a00d19c39..03e18f107 100644 --- a/view/theme/vier/flat.css +++ b/view/theme/vier/flat.css @@ -16,3 +16,8 @@ aside { right_aside { border-left: 1px solid #D2D2D2; } + +#viewcontact_wrapper-network { + background-color: #FFF; + border-bottom: 1px solid #D2D2D2; +} \ No newline at end of file diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css index 868d4a507..35e958c45 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1202,6 +1202,31 @@ section.minimal { height: 100%; } +/* Contact-Header for the Network Stream */ +#viewcontact_wrapper-network { + width: 100%; + min-height: 100px; + background-color: #FAFAFA; + box-shadow: 1px 2px 0px 0px #D8D8D8; + border-bottom: 1px solid #D2D2D2; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; +} +#contact-entry-accounttype-network { + font-size: 20px; +} +#contact-entry-name-network { + font-size: 24.5px; +} +.contact-entry-photo img { + border-radius: 4px; +} + /* wall item */ .tread-wrapper { /* border-bottom: 1px solid #BDCDD4; */