diff options
Diffstat (limited to 'view/theme/diabook')
24 files changed, 304 insertions, 39 deletions
diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 944aec2dd..7e50423ce 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -1,13 +1,45 @@ +{{ if $page }} +<div>$page</div> +{{ endif }} + +{{ if $lastusers_title }} +<h3 style="margin-top:0px;">Help or @NewHere ?</h3> +<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; " title="Friendica Support" target="blank">Friendica Support</a><br> +<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; " title="Let's talk" target="blank">Let's talk</a><br> +<a href="http://newzot.hydra.uberspace.de/profile/newzot" title="Local Friendica" style="margin-left: 10px; " target="blank">Local Friendica</a> +<a href="http://kakste.com/profile/newhere" title="@NewHere" style="margin-left: 10px; " target="blank">NewHere</a> +{{ endif }} + +{{ if $lastusers_title }} +<h3>Connectable Services</h3> +<div id="right_service_icons" style="margin-left: 11px; margin-top: 5px;"> +<a href="$url/facebook"><img alt="Facebook" src="view/theme/diabook/icons/facebook.png" title="Facebook"></a> +<a href="$url/settings/connectors"><img alt="StatusNet" src="view/theme/diabook/icons/StatusNet.png?" title="StatusNet"></a> +<a href="$url/settings/connectors"><img alt="LiveJournal" src="view/theme/diabook/icons/livejournal.png?" title="LiveJournal"></a> +<a href="$url/settings/connectors"><img alt="Posterous" src="view/theme/diabook/icons/posterous.png?" title="Posterous"></a> +<a href="$url/settings/connectors"><img alt="Tumblr" src="view/theme/diabook/icons/tumblr.png?" title="Tumblr"></a> +<a href="$url/settings/connectors"><img alt="Twitter" src="view/theme/diabook/icons/twitter.png?" title="Twitter"></a> +<a href="$url/settings/connectors"><img alt="WordPress" src="view/theme/diabook/icons/wordpress.png?" title="WordPress"></a> +<a href="$url/settings/connectors"><img alt="E-Mail" src="view/theme/diabook/icons/email.png?" title="E-Mail"></a> +</div> +{{ endif }} + +{{ if $nv }} +<h3>Find Friends</h3> +<a class="$nv.directory.2" href="$nv.directory.0" style="margin-left: 10px; " title="$nv.directory.3" >$nv.directory.1</a><br> +<a class="$nv.match.2" href="$nv.match.0" style="margin-left: 10px; " title="$nv.match.3" >$nv.match.1</a><br> +<a class="$nv.suggest.2" href="$nv.suggest.0" style="margin-left: 10px; " title="$nv.suggest.3" >$nv.suggest.1</a> +<a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nav.invite.3" >$nv.invite.1</a> +{{ endif }} + {{ if $lastusers_title }} -<h3 style="margin-top:0px;">Help or #NewHere?</h3> -<a href="https://helpers.pyxis.uberspace.de/profile/helpers" style="margin-left: 10px; color:#000;" title="Friendica Support" target="blank">Friendica Support</a><br> -<a href="https://letstalk.pyxis.uberspace.de/profile/letstalk" style="margin-left: 10px; color:#000;" title="Let's talk" target="blank">Let's talk</a><br> -<a href="http://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; color:#000;" target="blank">NewHere</a> +<h3>PostIt to Friendica</h3> +<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking this Link.</span></div> {{ endif }} {{ if $lastusers_title }} <h3>$lastusers_title</h3> -<div class='items-wrapper'> +<div id='lastusers-wrapper' class='items-wrapper'> {{ for $lastusers_items as $i }} $i {{ endfor }} @@ -25,19 +57,18 @@ {{ if $photos_title }} <h3>$photos_title</h3> -<div class='items-wrapper'> +<div id='ra-photos-wrapper' class='items-wrapper'> {{ for $photos_items as $i }} $i {{ endfor }} </div> {{ endif }} - {{ if $like_title }} <h3>$like_title</h3> <ul id='likes'> {{ for $like_items as $i }} - <li>$i</li> + <li id='ra-photos-wrapper'>$i</li> {{ endfor }} </ul> {{ endif }} diff --git a/view/theme/diabook/fpostit/README b/view/theme/diabook/fpostit/README new file mode 100644 index 000000000..39b7c5761 --- /dev/null +++ b/view/theme/diabook/fpostit/README @@ -0,0 +1,8 @@ +fpostit + +original author: Devlon Duthied + +see his blog posting: +http://blog.duthied.com/2011/09/13/node-agnostic-friendika-bookmarklet/ + +original published at github https://github.com/duthied/Friendika-Bookmarklet diff --git a/view/theme/diabook/fpostit/fpostit.js b/view/theme/diabook/fpostit/fpostit.js new file mode 100755 index 000000000..d183c7573 --- /dev/null +++ b/view/theme/diabook/fpostit/fpostit.js @@ -0,0 +1,6 @@ +javascript: (function() { + the_url = 'localhost/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} + else {a_funct()}})()"
\ No newline at end of file diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php new file mode 100644 index 000000000..65c43a2b9 --- /dev/null +++ b/view/theme/diabook/fpostit/fpostit.php @@ -0,0 +1,135 @@ +<?php +if (!isset($_POST["friendika_acct_name"])) $_POST["friendika_acct_name"] = ''; +if (!isset($_COOKIE['username'])) $_COOKIE['username'] = ''; +if (!isset($_COOKIE['password'])) $_COOKIE['password'] = ''; +if (!isset($hostname)) $hostname = ''; +if (!isset($username)) $username = ''; + + +if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) { + setcookie("username", $_POST["friendika_acct_name"], time()+60*60*24*300); + setcookie("password", $_POST["friendika_password"], time()+60*60*24*300); +} + +?> +<html> +<head> + <style> + body { + font-family: arial, Helvetica,sans-serif; + margin: 0px; + } + .wrap1 { + padding: 2px 5px; + background-color: #000; + margin-bottom: 10px; + } + .wrap2 { + margin-left: 10px; + font-size: 12px; + } + .logo { + margin-left: 3px; + margin-right: 5px; + float: left; + } + h2 { + color: #ffffff; + } + .error { + background-color: #FFFF66; + font-size: 12px; + margin-left: 10px; + } + </style> +</head> + +<body> +<?php + +if (isset($_GET['title'])) { + $title = $_GET['title']; +} +if (isset($_GET['text'])) { + $text = $_GET['text']; +} +if (isset($_GET['url'])) { + $url = $_GET['url']; +} + +if ((isset($title)) && (isset($text)) && (isset($url))) { + $content = "$title\nsource:$url\n\n$text"; +} else { + $content = $_POST['content']; +} + +if (isset($_POST['submit'])) { + + if (($_POST["friendika_acct_name"] != '') && ($_POST["friendika_password"] != '')) { + $acctname = $_POST["friendika_acct_name"]; + $tmp_account_array = explode("@", $acctname); + if (isset($tmp_account_array[1])) { + $username = $tmp_account_array[0]; + $hostname = $tmp_account_array[1]; + } + $password = $_POST["friendika_password"]; + $content = $_POST["content"]; + + $url = "http://" . $hostname . '/api/statuses/update'; + $data = array('status' => $content); + + // echo "posting to: $url<br/>"; + + $c = curl_init(); + curl_setopt($c, CURLOPT_URL, $url); + curl_setopt($c, CURLOPT_USERPWD, "$username:$password"); + curl_setopt($c, CURLOPT_POSTFIELDS, $data); + curl_setopt($c, CURLOPT_RETURNTRANSFER, true); + curl_setopt($c, CURLOPT_FOLLOWLOCATION, true); + $c_result = curl_exec($c); + if(curl_errno($c)){ + $error = curl_error($c); + showForm($error, $content); + } + + curl_close($c); + if (!isset($error)) { + echo '<script language="javascript" type="text/javascript">window.close();</script>'; + } + + } else { + $error = "Missing account name and/or password...try again please"; + showForm($error, $content); + } + +} else { + showForm(null, $content); +} + +function showForm($error, $content) { + $username_cookie = $_COOKIE['username']; + $password_cookie = $_COOKIE['password']; + + echo <<<EOF + <div class='wrap1'> + <h2><img class='logo' src='friendika-32.png' align='middle';/> + Friendika Bookmarklet</h2> + </div> + + <div class="wrap2"> + <form method="post" action="{$_SERVER['PHP_SELF']}"> + Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)<br /><br /> + Account ID: <input type="text" name="friendika_acct_name" value="{$username_cookie}" size="50"/><br /> + Password: <input type="password" name="friendika_password" value="{$password_cookie}" size="50"/><br /> + <textarea name="content" id="content" rows="6" cols="70">{$content}</textarea><br /> + <input type="submit" value="PostIt!" name="submit" /> <span class='error'>$error</span> + </form> + <p></p> + </div> +EOF; + +} +?> + +</body> +</html>
\ No newline at end of file diff --git a/view/theme/diabook/fpostit/friendika-32.png b/view/theme/diabook/fpostit/friendika-32.png Binary files differnew file mode 100644 index 000000000..61764bf20 --- /dev/null +++ b/view/theme/diabook/fpostit/friendika-32.png diff --git a/view/theme/diabook/icons/StatusNet.png b/view/theme/diabook/icons/StatusNet.png Binary files differnew file mode 100644 index 000000000..398bca716 --- /dev/null +++ b/view/theme/diabook/icons/StatusNet.png diff --git a/view/theme/diabook/icons/email.png b/view/theme/diabook/icons/email.png Binary files differnew file mode 100644 index 000000000..240cef2c3 --- /dev/null +++ b/view/theme/diabook/icons/email.png diff --git a/view/theme/diabook/icons/expand.png b/view/theme/diabook/icons/expand.png Binary files differnew file mode 100755 index 000000000..a46e88ea5 --- /dev/null +++ b/view/theme/diabook/icons/expand.png diff --git a/view/theme/diabook/icons/facebook.png b/view/theme/diabook/icons/facebook.png Binary files differnew file mode 100644 index 000000000..3e5dd39c3 --- /dev/null +++ b/view/theme/diabook/icons/facebook.png diff --git a/view/theme/diabook/icons/livejournal.png b/view/theme/diabook/icons/livejournal.png Binary files differnew file mode 100644 index 000000000..6d27d265e --- /dev/null +++ b/view/theme/diabook/icons/livejournal.png diff --git a/view/theme/diabook/icons/posterous.png b/view/theme/diabook/icons/posterous.png Binary files differnew file mode 100644 index 000000000..c8e86078e --- /dev/null +++ b/view/theme/diabook/icons/posterous.png diff --git a/view/theme/diabook/icons/pscontacts.png b/view/theme/diabook/icons/pscontacts.png Binary files differnew file mode 100644 index 000000000..acf857f32 --- /dev/null +++ b/view/theme/diabook/icons/pscontacts.png diff --git a/view/theme/diabook/icons/pubgroups.png b/view/theme/diabook/icons/pubgroups.png Binary files differindex acf857f32..6d9539610 100644 --- a/view/theme/diabook/icons/pubgroups.png +++ b/view/theme/diabook/icons/pubgroups.png diff --git a/view/theme/diabook/icons/tumblr.png b/view/theme/diabook/icons/tumblr.png Binary files differnew file mode 100644 index 000000000..1dc7fa072 --- /dev/null +++ b/view/theme/diabook/icons/tumblr.png diff --git a/view/theme/diabook/icons/twitter.png b/view/theme/diabook/icons/twitter.png Binary files differnew file mode 100644 index 000000000..b7a687b9f --- /dev/null +++ b/view/theme/diabook/icons/twitter.png diff --git a/view/theme/diabook/icons/wordpress.png b/view/theme/diabook/icons/wordpress.png Binary files differnew file mode 100644 index 000000000..f564c4300 --- /dev/null +++ b/view/theme/diabook/icons/wordpress.png diff --git a/view/theme/diabook/profile_side.tpl b/view/theme/diabook/profile_side.tpl index 0fa8a27fd..fc949639e 100644 --- a/view/theme/diabook/profile_side.tpl +++ b/view/theme/diabook/profile_side.tpl @@ -9,6 +9,7 @@ <ul id="profile-side-menu" class="menu-profile-side"> <li id="profile-side-status" class="menu-profile-list home"><a class="menu-profile-list-item" href="$ps.usermenu.status.0">$ps.usermenu.status.1</a></li> <li id="profile-side-photos" class="menu-profile-list photos"><a class="menu-profile-list-item" href="$ps.usermenu.photos.0">$ps.usermenu.photos.1</a></li> + <li id="profile-side-photos" class="menu-profile-list pscontacts"><a class="menu-profile-list-item" href="$ps.usermenu.contacts.0">$ps.usermenu.contacts.1</a></li> <li id="profile-side-events" class="menu-profile-list events"><a class="menu-profile-list-item" href="$ps.usermenu.events.0">$ps.usermenu.events.1</a></li> <li id="profile-side-notes" class="menu-profile-list notes"><a class="menu-profile-list-item" href="$ps.usermenu.notes.0">$ps.usermenu.notes.1</a></li> <li id="profile-side-foren" class="menu-profile-list foren"><a class="menu-profile-list-item" href="$ps.usermenu.pgroups.0" target="blanc">$ps.usermenu.pgroups.1</a></li> diff --git a/view/theme/diabook/screenshot.png b/view/theme/diabook/screenshot.png Binary files differnew file mode 100644 index 000000000..2826f4261 --- /dev/null +++ b/view/theme/diabook/screenshot.png diff --git a/view/theme/diabook/style-network.css b/view/theme/diabook/style-network.css index f0cf04d65..20c273ec3 100644 --- a/view/theme/diabook/style-network.css +++ b/view/theme/diabook/style-network.css @@ -111,6 +111,7 @@ .icon.language { background-image: url("../../../view/theme/diabook/icons/language.png");} + .camera { background-image: url("../../../view/theme/diabook/icons/camera.png"); display: block; width: 28px; height: 28px; background-repeat: no-repeat; } @@ -395,7 +396,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 12.5px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -877,6 +878,8 @@ ul.menu-popup .empty { padding-top: 4px; padding-left: 5px; color: #2D2D2D; + word-wrap: break-word; + width: 130px; } #ps-username:hover{ text-decoration: none; @@ -923,6 +926,9 @@ ul.menu-popup .empty { .menu-profile-list.com_side{ background: url("../../../view/theme/diabook-blue/icons/com_side.png") no-repeat; } +.menu-profile-list.pscontacts{ + background: url("../../../view/theme/diabook-blue/icons/pscontacts.png") no-repeat; + } /* aside */ aside { @@ -934,6 +940,7 @@ aside { float: left; /* background: #F1F1F1; */ } +aside #page-sidebar{display: none;} aside .vcard .fn { font-size: 18px; @@ -1161,7 +1168,16 @@ right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; right_aside .directory-photo { margin: 0px; } right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } right_aside #likes { margin: 0px; padding: 0px; list-style: none; } -right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px solid #D2D2D2;} +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} +.icon.expand { + background-image: url("../../../view/theme/diabook/icons/expand.png"); + float: right; + cursor: pointer; + } /* wall item */ .tread-wrapper { @@ -1187,6 +1203,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; } + .wall-item-bottom { font-size: 13px; } @@ -1231,14 +1248,14 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli } .wall-item-container .wall-item-content { - font-size: 13px; - max-width: 720px; + font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.4; + line-height: 1.2; } .wall-item-container .wall-item-content img { - max-width: 700px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; diff --git a/view/theme/diabook/style-profile.css b/view/theme/diabook/style-profile.css index f0cf04d65..0f05bf6c1 100644 --- a/view/theme/diabook/style-profile.css +++ b/view/theme/diabook/style-profile.css @@ -395,7 +395,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 12.5px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -877,6 +877,8 @@ ul.menu-popup .empty { padding-top: 4px; padding-left: 5px; color: #2D2D2D; + word-wrap: break-word; + width: 130px; } #ps-username:hover{ text-decoration: none; @@ -1018,8 +1020,8 @@ aside #side-peoplefind-url { margin: 0px 2px 2px 0px; } #contact-block .contact-block-link img { - widht: 55px; - height: 55px; + widht: 48px; + height: 48px; } #lost-password-link { float: left; @@ -1096,7 +1098,7 @@ aside #side-peoplefind-url { section { display: table-cell; vertical-align: top; - width: auto; + width: 610px; padding: 0px 0px 0px 12px; } @@ -1161,8 +1163,11 @@ right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; right_aside .directory-photo { margin: 0px; } right_aside .directory-photo-img { max-width: 45px; max-height: 45px; } right_aside #likes { margin: 0px; padding: 0px; list-style: none; } -right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px solid #D2D2D2;} - +right_aside .items-wrapper{ overflow: auto; width: 100%; } +right_aside #lastusers-wrapper { padding-left: 6px; padding-top: 3px; overflow: auto; width: 100%; } +right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow: auto; width: 100%; } +#page-sidebar-right_aside{margin-top: 0px; margin-bottom: 30px;} +#page-sidebar-right_aside ul {margin-top: 0px;} /* wall item */ .tread-wrapper { border-bottom: 1px solid #D2D2D2; @@ -1187,6 +1192,7 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli .wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom { display: table-row; } + .wall-item-bottom { font-size: 13px; } @@ -1231,14 +1237,14 @@ right_aside .items-wrapper{ overflow: auto; width: 100%; border-bottom: 1px soli } .wall-item-container .wall-item-content { - font-size: 13px; - max-width: 720px; + font-size: 12.5px; + max-width: 420px; word-wrap: break-word; - line-height: 1.4; + line-height: 1.2; } .wall-item-container .wall-item-content img { - max-width: 700px; + max-width: 400px; } .wall-item-container .wall-item-links, .wall-item-container .wall-item-actions { display: table-cell; @@ -2026,8 +2032,8 @@ box-shadow: 1px 1px 5px 0; /* ================== */ .contact-block-img { - width: 55px; - height: 55px; + width: 48px; + height: 48px; padding-right: 3px; } .contact-block-div { diff --git a/view/theme/diabook/style.css b/view/theme/diabook/style.css index ffab5b4c4..5154459d3 100644 --- a/view/theme/diabook/style.css +++ b/view/theme/diabook/style.css @@ -394,7 +394,7 @@ /* global */ body { font-family: 'Lato', "Helvetica Neue", Helvetica, Arial, sans-serif; - font-size: 13px; + font-size: 12.5px; background-color: #ffffff; color: #2d2d2d; margin: 50px auto auto; @@ -876,6 +876,8 @@ ul.menu-popup .empty { padding-top: 4px; padding-left: 5px; color: #2D2D2D; + word-wrap: break-word; + width: 130px; } #ps-username:hover{ text-decoration: none; @@ -1212,10 +1214,10 @@ body .pageheader{ } .wall-item-container .wall-item-content { - font-size: 13px; + font-size: 12.5px; max-width: 720px; word-wrap: break-word; - line-height: 1.4; + line-height: 1.2; } .wall-item-container .wall-item-content img { diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index b487b8f88..6eb623d95 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -7,9 +7,6 @@ * Author: */ -$a->theme_info = array( - 'extends' => 'diabook', -); //change css on network and profilepages $cssFile = null; @@ -18,6 +15,9 @@ $cssFile = null; /** * prints last community activity */ + + + function diabook_community_info(){ $a = get_app(); //right_aside at networkpages @@ -33,7 +33,7 @@ function diabook_community_info(){ FROM `profile` LEFT JOIN `user` ON `user`.`uid` = `profile`.`uid` WHERE `is-default` = 1 $publish AND `user`.`blocked` = 0 $sql_extra $order LIMIT %d , %d ", 0, - 12 + 9 ); $tpl = file_get_contents( dirname(__file__).'/directory_item.tpl'); if(count($r)) { @@ -61,7 +61,7 @@ function diabook_community_info(){ WHERE `T1`.`liker-link` LIKE '%s%%' OR `item`.`author-link` LIKE '%s%%' GROUP BY `uri` ORDER BY `T1`.`created` DESC - LIMIT 0,10", + LIMIT 0,5", $a->get_baseurl(),$a->get_baseurl() ); @@ -109,7 +109,7 @@ function diabook_community_info(){ AND `user`.`blockwall`=0 AND `user`.`hidewall`=0 ORDER BY `photo`.`edited` DESC - LIMIT 0, 12", + LIMIT 0, 9", dbesc(t('Contact Photos')), dbesc(t('Profile Photos')) ); @@ -130,15 +130,74 @@ function diabook_community_info(){ } } + $fostitJS = "javascript: (function() { + the_url = '".$a->get_baseurl($ssl_state)."/view/theme/diabook/fpostit/fpostit.php?url=' + encodeURIComponent(window.location.href) + '&title=' + encodeURIComponent(document.title) + '&text=' + encodeURIComponent(''+(window.getSelection ? window.getSelection() : document.getSelection ? document.getSelection() : document.selection.createRange().text)); + a_funct = function() { + if (!window.open(the_url, 'fpostit', 'location=yes,links=no,scrollbars=no,toolbar=no,width=600,height=300')) location.href = the_url}; + if (/Firefox/.test(navigator.userAgent)) {setTimeout(a_funct, 0)} + else {a_funct()}})()" ; + + $aside['$fostitJS'] = $fostitJS; + + //right_aside FIND FRIENDS + if(local_user()) { + $nv = array(); + $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['match'] = Array('match', t('Similar Interests'), "", ""); + $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); + $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); + + $aside['$nv'] = $nv; + }; + + //Community Page + $page = '<div id="page-sidebar-right_aside" class="widget"> + <div class="title tool"> + <h3>'.t("Community Pages").'</h3></div> + <div id="sidebar-page-list"><ul>'; + + $pagelist = array(); + + $contacts = q("SELECT `id`, `url`, `name`, `micro`FROM `contact` + WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d", + intval($a->user['uid']) + ); + + $pageD = array(); + + // Look if the profile is a community page + foreach($contacts as $contact) { + $pageD[] = array("url"=>$contact["url"], "name"=>$contact["name"], "id"=>$contact["id"], "micro"=>$contact['micro']); + }; + + + $contacts = $pageD; + + foreach($contacts as $contact) { + $page .= '<li style="list-style-type: none;" class="tool"><img height="20" width="20" style="float: left; margin-right: 3px;" src="' . $contact['micro'] .'" alt="' . $contact['url'] . '" /> <a href="'.$a->get_baseurl().'/redir/'.$contact["id"].'" style="margin-top: 2px;" title="' . $contact['url'] . '" class="label" target="external-link">'. + $contact["name"]."</a></li>"; + } + $page .= '</ul></div></div>'; + if (sizeof($contacts) > 0) + + $aside['$page'] = $page; + //END Community Page + + + $url = $a->get_baseurl($ssl_state); + $aside['$url'] = $url; $tpl = file_get_contents(dirname(__file__).'/communityhome.tpl'); $a->page['right_aside'] = replace_macros($tpl, $aside); + + + } //profile_side at networkpages -if ($a->argv[0] === "network"){ +if ($a->argv[0] === "network" && local_user()){ // USER MENU if(local_user()) { @@ -152,11 +211,12 @@ if ($a->argv[0] === "network"){ $ps = array('usermenu'=>array()); $ps['usermenu']['status'] = Array('profile/' . $a->user['nickname'], t('Home'), "", t('Your posts and conversations')); $ps['usermenu']['profile'] = Array('profile/' . $a->user['nickname']. '?tab=profile', t('Profile'), "", t('Your profile page')); + $ps['usermenu']['contacts'] = Array('contacts' , t('Contacts'), "", t('Your contacts')); $ps['usermenu']['photos'] = Array('photos/' . $a->user['nickname'], t('Photos'), "", t('Your photos')); $ps['usermenu']['events'] = Array('events/', t('Events'), "", t('Your events')); $ps['usermenu']['notes'] = Array('notes/', t('Personal notes'), "", t('Your personal photos')); $ps['usermenu']['community'] = Array('community/', t('Community'), "", ""); - $ps['usermenu']['pgroups'] = Array('http://dir.friendika.com/directory/forum', t('Public Groups'), "", ""); + $ps['usermenu']['pgroups'] = Array('http://dir.friendica.com/directory/forum', t('Public Groups'), "", ""); $tpl = get_markup_template('profile_side.tpl'); @@ -200,6 +260,7 @@ $a->page['htmlhead'] .= <<< EOT $(function() { $('a.lightbox').fancybox(); // Select all links with lightbox class }); + </script> EOT; diff --git a/view/theme/diabook/wall_item.tpl b/view/theme/diabook/wall_item.tpl index 20d24702b..123834064 100644 --- a/view/theme/diabook/wall_item.tpl +++ b/view/theme/diabook/wall_item.tpl @@ -1,6 +1,5 @@ {{ if $item.indent }}{{ else }} <div class="wall-item-decor"> - {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} diff --git a/view/theme/diabook/wallwall_item.tpl b/view/theme/diabook/wallwall_item.tpl index e02e5a8be..c5b6b36b5 100644 --- a/view/theme/diabook/wallwall_item.tpl +++ b/view/theme/diabook/wallwall_item.tpl @@ -1,6 +1,5 @@ {{ if $item.indent }}{{ else }} <div class="wall-item-decor"> - {{ if $item.lock }}<span class="icon lock fakelink" onclick="lockview(event,$item.id);" title="$item.lock">$item.lock</span>{{ endif }} <img id="like-rotator-$item.id" class="like-rotator" src="images/rotator.gif" alt="$item.wait" title="$item.wait" style="display: none;" /> </div> {{ endif }} |
