networkheader: do css work the other supported themes

diff --git a/mod/network.php b/mod/network.php
index 3e841d27593b5297e87b1a531390fd5c129cd7d5..fb48bba73811e5fa050ce59fa52cc1f6b66f79aa 100644 (file)
--- 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 455551c680acff6b2de283e32f4b42cb276ce127..205ad736d5c5065568977c8a244d139bc8c6fd86 100644 (file)
--- a/view/templates/viewcontact_template.tpl
+++ b/view/templates/viewcontact_template.tpl
@@ -1,9 +1,11 @@
 
 {{include file="section_title.tpl"}}
 
+<div id="viewcontact_wrapper-{{$id}}">
 {{foreach $contacts as $contact}}
        {{include file="contact_template.tpl"}}
 {{/foreach}}
+</div>
 
 <div id="view-contact-end"></div>
 

diff --git a/view/theme/duepuntozero/deriv/darkzero.css b/view/theme/duepuntozero/deriv/darkzero.css
index fe2ad73cf2e84f8dac86a197bf50bb7434a1012d..908574f7064565105179372217e93e3bce7dc3ee 100644 (file)
--- 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 0619644eaf0323c16152fb8e8d32baab8d284081..34bf58f46055d73cce868b300f82dd5337a97e33 100644 (file)
--- 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 0f6f7881edc26265930b60addddd82d29dd3c250..d446a616111490c9c8633f22636db7206aaaffa4 100644 (file)
--- 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 d59cf5dcabc4d13cea70d79d1b2419ef4704868b..29718576830f88094a2aaebc5d6055192e4e090d 100644 (file)
--- 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 255a1d089ab606e56eb37e63e08b713c0cbac2f0..83f131af6030f23c1abd0cd1f98619af40544d83 100644 (file)
--- 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 4485c056ffedea5c70dc09acf25bdfb19799d38e..c41c2aa27c2c4ffb54b5ddc77287a19b96e199cf 100644 (file)
--- a/view/theme/frost-mobile/style.css
+++ b/view/theme/frost-mobile/style.css
@@ -421,6 +421,27 @@ section {
        clear: both;\r
 }\r
 \r
+/* Contact-Header for the Network Stream */\r
+#viewcontact_wrapper-network {\r
+       width: 100%;\r
+       min-height: 100px;\r
+       background-color: #FAFAFA;\r
+       border: 1px solid #DDDDDD;\r
+       border-radius: 5px;\r
+}\r
+#contact-entry-wrapper-network {\r
+       float: none;\r
+       width: auto;\r
+       height: auto;\r
+       padding: 10px;\r
+       margin: 0;\r
+}\r
+#contact-entry-accounttype-network {\r
+       font-size: 0.9em;\r
+}\r
+#contact-entry-name-network {\r
+       font-size: 1.5em;\r
+}\r
 \r
 /* footer */\r
 footer {\r

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index 24fe47559a47acb804cc53eea92fc39fb884ffa6..3bfca31ee46b4e6192983f6a85a5b0117f44886d 100644 (file)
--- 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 25102ba31d900ef499670e440f49d268123a920d..5792c09e6dd047010dca15ac8592e8f476f01b50 100644 (file)
--- 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 78de88654292add54764fa4d1c2de792de74cf80..1aafb26710c6775bad4fceedd9243086eb17f4df 100644 (file)
--- 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 1ca27b895c058a3b527ee732039270b5bb4bd2fc..089dd227ce5a79c313487928321b3d6b130552fc 100644 (file)
--- 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 db1f42d769b12690943dabde461562ab558a5f1a..3fa74de36e81fd7345663706a81ae1acbc52f321 100644 (file)
--- 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 3b6b73dc6e39eb6b63719ebee41d25c7b69ab9f9..f68fd45f9644976b505ea65fef3af346551a4cda 100644 (file)
--- 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 049c1bf4b6189eddbc3c9fce7981bbff5b43e48c..5a36de03e02418526e8f374e8e7d1fdadd671fbd 100644 (file)
--- 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 01045b6ff4a3cb519a8091c688b14babda91b7d3..8e128ae27fb5fd21288010266925824b135912a4 100644 (file)
--- 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 a00d19c39c767eb6ab6869885e5793206576b78b..03e18f1070f81c822860214f8a11b533192ddcf8 100644 (file)
--- 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 d4da5e2d6c1b1cb600294aa1ed4cfe042099da04..a62f9e80c6fbaa0140da43cf50581519fbf5853a 100644 (file)
--- 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; */