From a6aac8f950cd7a5d73ce32ee079156f14b8990ec Mon Sep 17 00:00:00 2001 From: rabuzarus <> Date: Mon, 30 Nov 2015 01:24:22 +0100 Subject: [PATCH] networkheader: do css work the other supported themes --- mod/network.php | 9 +------ view/templates/viewcontact_template.tpl | 2 ++ view/theme/duepuntozero/deriv/darkzero.css | 3 +++ view/theme/duepuntozero/deriv/easterbunny.css | 4 ++- view/theme/duepuntozero/deriv/greenzero.css | 1 + view/theme/duepuntozero/deriv/purplezero.css | 3 ++- view/theme/duepuntozero/style.css | 25 +++++++++++++++++++ view/theme/frost-mobile/style.css | 21 ++++++++++++++++ view/theme/frost/style.css | 21 ++++++++++++++++ view/theme/quattro/dark/style.css | 23 +++++++++++++++++ view/theme/quattro/green/style.css | 23 +++++++++++++++++ view/theme/quattro/lilac/style.css | 23 +++++++++++++++++ view/theme/quattro/quattro.less | 17 ++++++++++++- view/theme/smoothly/style.css | 24 ++++++++++++++++++ view/theme/vier/breathe.css | 4 +++ view/theme/vier/dark.css | 6 ++++- view/theme/vier/flat.css | 5 ++++ view/theme/vier/style.css | 18 ++++++++++--- 18 files changed, 216 insertions(+), 16 deletions(-) diff --git a/mod/network.php b/mod/network.php index 3e841d2759..fb48bba738 100644 --- a/mod/network.php +++ b/mod/network.php @@ -152,14 +152,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) { @@ -605,6 +597,7 @@ function network_content(&$a, $update = 0) { $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 455551c680..205ad736d5 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 fe2ad73cf2..908574f706 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 0619644eaf..34bf58f460 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 0f6f7881ed..d446a61611 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 d59cf5dcab..2971857683 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 255a1d089a..83f131af60 100644 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -277,6 +277,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 4485c056ff..c41c2aa27c 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 24fe47559a..3bfca31ee4 100644 --- a/view/theme/frost/style.css +++ b/view/theme/frost/style.css @@ -383,6 +383,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 25102ba31d..5792c09e6d 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 78de886542..1aafb26710 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 1ca27b895c..089dd227ce 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 db1f42d769..3fa74de36e 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 3b6b73dc6e..f68fd45f96 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 049c1bf4b6..5a36de03e0 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 01045b6ff4..8e128ae27f 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 a00d19c39c..03e18f1070 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 d4da5e2d6c..a62f9e80c6 100644 --- a/view/theme/vier/style.css +++ b/view/theme/vier/style.css @@ -1199,14 +1199,20 @@ section.minimal { height: 100%; } -#contact-entry-wrapper-network { - float: none; +/* 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; - padding: 10px 10px 0 10px; - width: 745px; +} +#contact-entry-wrapper-network { + float: none; + width: auto; + height: auto; + padding: 10px; + margin: 0; } #contact-entry-accounttype-network { font-size: 20px; @@ -1214,6 +1220,10 @@ section.minimal { #contact-entry-name-network { font-size: 24.5px; } +.contact-entry-photo img { + border-radius: 4px; +} + /* wall item */ .tread-wrapper { /* border-bottom: 1px solid #BDCDD4; */ -- 2.39.5