MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

Browse source 
* remotes/upstream/master:
  move community_pages to right_aside, fixes in css
  improved the inivitations and added a bit of sales pitch.

* master:
This commit is contained in:
Simon L'nu 2012-03-25 03:18:21 -04:00
parent 1d56224b08 1b8ac30fae
commit 84686a2698
12 changed files with 152 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
include/contact_widgets.php
View file

@ -15,8 +15,6 @@ function findpeople_widget() {
$a = get_app();
$inv = (($a->config['register_policy'] != REGISTER_CLOSED) ? t('Invite Friends') : '');
if(get_config('system','invitation_only')) {
$x = get_pconfig(local_user(),'system','invites_remaining');
if($x || is_site_admin()) {
@ -34,7 +32,7 @@ function findpeople_widget() {
'$findthem' => t('Find'),
'$suggest' => t('Friend Suggestions'),
'$similar' => t('Similar Interests'),
'$inv' => $inv
'$inv' => t('Invite Friends')
));
}

20
mod/invite.php
View file

@ -56,7 +56,7 @@ function invite_post(&$a) {
else
$nmessage = $message;
$res = mail($recip, sprintf( t('Please join my network on %s'), $a->config['sitename']),
$res = mail($recip, sprintf( t('Please join my close friends on Friendica'), $a->config['sitename']),
$nmessage,
"From: " . $a->user['email'] . "\n"
. 'Content-type: text/plain; charset=UTF-8' . "\n"
@ -94,15 +94,27 @@ function invite_content(&$a) {
}
}
$dirloc = get_config('system','directory_submit_url');
if(strlen($dirloc)) {
if($a->config['register_policy'] == REGISTER_CLOSED)
$linktxt = sprintf( t('Visit %s for a list of public sites you can join. Friendica members on other sites can all connect with each other, as well as with members of many other social networks.'), dirname($dirloc) . '/siteinfo');
elseif($a->config['register_policy'] != REGISTER_CLOSED)
$linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website. They all inter-connect to create a huge privacy-enhanced social web that is owned and controlled by its members. They can also connect with many traditional social networks. See %s for a list of alternate Friendica sites.'),$a->get_baseurl(),dirname($dirloc) . '/siteinfo');
}
else {
$o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.');
return $o;
}
$o = replace_macros($tpl, array(
'$invite' => t('Send invitations'),
'$addr_text' => t('Enter email addresses, one per line:'),
'$msg_text' => t('Your message:'),
'$default_message' => sprintf(t('Please join my social network on %s'), $a->config['sitename']) . "\r\n" . "\r\n"
. t('To accept this invitation, please visit:') . "\r\n" . "\r\n" . $a->get_baseurl()
'$default_message' => t('Please join my close friends on Friendica, and help us to build a better social web.') . "\r\n" . "\r\n"
. $linktxt
. "\r\n" . "\r\n" . (($invonly) ? t('You will need to supply this invitation code: $invite_code') . "\r\n" . "\r\n" : '') .t('Once you have registered, please connect with me via my profile page at:')
. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname'] ,
. "\r\n" . "\r\n" . $a->get_baseurl() . '/profile/' . $a->user['nickname']
. "\r\n" . "\r\n" . t('For more information about the Friendica project and why we feel it is important, please visit http://friendica.com') . "\r\n" . "\r\n" ,
'$submit' => t('Submit')
));

8
view/theme/diabook-blue/communityhome.tpl
View file

@ -1,5 +1,5 @@
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or #NewHere ?</h3>
<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://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
@ -46,9 +46,13 @@
</div>
{{ endif }}
{{ if $lastusers_title }}
<div>$page</div>
{{ endif }}
{{ if $lastusers_title }}
<h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
<div style="padding-left: 8px;"><span ><a href="$fostitJS" title="PostIt">Post to Friendica</a> from anywhere by bookmarking the Link.</span></div>
{{ endif }}
{{ if $like_title }}

14
view/theme/diabook-blue/style-network.css
View file

@ -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;
@ -888,6 +888,8 @@ ul.menu-popup .empty {
position: absolute;
padding-top: 4px;
padding-left: 5px;
word-wrap: break-word;
width: 130px;
}
#ps-username:hover{
text-decoration: none;
@ -945,7 +947,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
font-weight: bold;
@ -1187,7 +1189,8 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
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: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
@ -1216,6 +1219,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-bottom {
font-size: 13px;
}
@ -1260,10 +1264,10 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
}
.wall-item-container .wall-item-content {
font-size: 13px;
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 {

15
view/theme/diabook-blue/style-profile.css
View file

@ -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;
@ -888,6 +888,8 @@ ul.menu-popup .empty {
position: absolute;
padding-top: 4px;
padding-left: 5px;
word-wrap: break-word;
width: 130px;
}
#ps-username:hover{
text-decoration: none;
@ -1117,7 +1119,7 @@ list-style-type: disc;
section {
display: table-cell;
vertical-align: top;
width: auto;
width: 611px;
padding: 0px 0px 0px 12px;
}
@ -1177,6 +1179,7 @@ right_aside {
/* background: #F1F1F1; */
}
right_aside a{color: #1872A2;}
right_aside h3 {border-bottom: 1px solid #D2D2D2; padding-top: 5px; padding-bottom: 0px; padding-left: 5px; margin-bottom: 0px;
margin-top:30px;}
right_aside .directory-item { width: 50px; height: 50px; vertical-align: center; text-align: center; }
@ -1186,7 +1189,8 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
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: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
@ -1215,6 +1219,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-bottom {
font-size: 13px;
}
@ -1259,10 +1264,10 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
}
.wall-item-container .wall-item-content {
font-size: 13px;
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 {

8
view/theme/diabook-blue/style.css
View file

@ -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;
@ -887,6 +887,8 @@ ul.menu-popup .empty {
position: absolute;
padding-top: 4px;
padding-left: 5px;
word-wrap: break-word;
width: 130px;
}
#ps-username:hover{
text-decoration: none;
@ -1235,10 +1237,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 {

35
view/theme/diabook-blue/theme.php
View file

@ -139,6 +139,41 @@ function diabook_community_info(){
$aside['$fostitJS'] = $fostitJS;
//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;

8
view/theme/diabook/communityhome.tpl
View file

@ -1,5 +1,5 @@
{{ if $lastusers_title }}
<h3 style="margin-top:0px;">Help or #NewHere ?</h3>
<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://kakste.com/profile/newhere" title="#NewHere" style="margin-left: 10px; " target="blank">NewHere</a>
@ -46,9 +46,13 @@
</div>
{{ endif }}
{{ if $lastusers_title }}
<div>$page</div>
{{ endif }}
{{ if $lastusers_title }}
<h3>PostIt to Friendica</h3>
<div style="padding-left: 8px;"><span >Post to Friendica from anywhere by bookmarking this <a href="$fostitJS" title="PostIt">Link</a>.</span></div>
<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 $like_title }}

13
view/theme/diabook/style-network.css
View file

@ -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;
@ -934,6 +936,7 @@ aside {
float: left;
/* background: #F1F1F1; */
}
aside #page-sidebar{display: none;}
aside .vcard .fn {
font-size: 18px;
@ -1164,7 +1167,8 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
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: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
@ -1189,6 +1193,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-bottom {
font-size: 13px;
}
@ -1233,10 +1238,10 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
}
.wall-item-container .wall-item-content {
font-size: 13px;
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 {

13
view/theme/diabook/style-profile.css
View file

@ -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;
@ -1096,7 +1098,7 @@ aside #side-peoplefind-url {
section {
display: table-cell;
vertical-align: top;
width: auto;
width: 610px;
padding: 0px 0px 0px 12px;
}
@ -1164,6 +1166,8 @@ right_aside #likes { margin: 0px; padding: 0px; list-style: none; }
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: 30px;}
#page-sidebar-right_aside ul {margin-top: 0px;}
/* wall item */
.tread-wrapper {
border-bottom: 1px solid #D2D2D2;
@ -1188,6 +1192,7 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
.wall-item-container .wall-item-item, .wall-item-container .wall-item-bottom {
display: table-row;
}
.wall-item-bottom {
font-size: 13px;
}
@ -1232,10 +1237,10 @@ right_aside #ra-photos-wrapper { padding-left: 5px; padding-top: 3px; overflow:
}
.wall-item-container .wall-item-content {
font-size: 13px;
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 {

8
view/theme/diabook/style.css
View file

@ -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 {

42
view/theme/diabook/theme.php
View file

@ -18,6 +18,9 @@ $cssFile = null;
/**
* prints last community activity
*/
function diabook_community_info(){
$a = get_app();
//right_aside at networkpages
@ -139,12 +142,49 @@ function diabook_community_info(){
$aside['$fostitJS'] = $fostitJS;
//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);
}
@ -167,7 +207,7 @@ if ($a->argv[0] === "network"){
$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');