mexon/friendica
1
0
Fork 0
Code Pull requests Activity

redesign the network page header when cid selected

Browse source
This commit is contained in:
rabuzarus 2015-11-29 04:57:42 +01:00
parent 6e957c6c91
commit 1a0cb99d56
2 changed files with 35 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
mod/network.php
View file

@ -152,14 +152,14 @@ function network_init(&$a) {
$a->page['aside'] .= saved_searches($search); $a->page['aside'] .= saved_searches($search);
$a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : '')); $a->page['aside'] .= fileas_widget($a->get_baseurl(true) . '/network',(x($_GET, 'file') ? $_GET['file'] : ''));
if(x($_GET['cid']) && intval($_GET['cid']) != 0) { // if(x($_GET['cid']) && intval($_GET['cid']) != 0) {
$r = q("SELECT `url` FROM `contact` WHERE `id` = %d", // $r = q("SELECT `url` FROM `contact` WHERE `id` = %d",
intval($_GET['cid'])); // intval($_GET['cid']));
if ($r) { // if ($r) {
$a->page['aside'] = ""; // $a->page['aside'] = "";
profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"])); // profile_load($a, "", 0, get_contact_details_by_url($r[0]["url"]));
} // }
} // }
} }
function saved_searches($search) { function saved_searches($search) {
@ -583,7 +583,7 @@ function network_content(&$a, $update = 0) {
} }
elseif($cid) { 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", AND `blocked` = 0 AND `pending` = 0 LIMIT 1",
intval($cid) intval($cid)
); );
@ -594,8 +594,17 @@ function network_content(&$a, $update = 0) {
ON $sql_table.$sql_parent = `temp1`.`parent` "; ON $sql_table.$sql_parent = `temp1`.`parent` ";
$sql_extra = ""; $sql_extra = "";
$o = replace_macros(get_markup_template("section_title.tpl"),array( $entries[0] = array(
'$title' => sprintf( t('Contact: %s'), htmlentities($r[0]['name'])) '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,
)) . $o; )) . $o;
if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) { if($r[0]['network'] === NETWORK_OSTATUS && $r[0]['writable'] && (! get_pconfig(local_user(),'system','nowarn_insecure'))) {

15
view/theme/vier/style.css
View file

@ -1199,6 +1199,21 @@ section.minimal {
height: 100%; height: 100%;
} }
#contact-entry-wrapper-network {
float: none;
width: 100%;
background-color: #FAFAFA;
box-shadow: 1px 2px 0px 0px #D8D8D8;
border-bottom: 1px solid #D2D2D2;
padding: 10px 10px 0 10px;
width: 745px;
}
#contact-entry-accounttype-network {
font-size: 20px;
}
#contact-entry-name-network {
font-size: 24.5px;
}
/* wall item */ /* wall item */
.tread-wrapper { .tread-wrapper {
/* border-bottom: 1px solid #BDCDD4; */ /* border-bottom: 1px solid #BDCDD4; */