diff --git a/include/socgraph.php b/include/socgraph.php index b2f545509..3f5194049 100755 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -237,12 +237,14 @@ function suggestion_query($uid, $start = 0, $limit = 80) { $r = q("SELECT count(glink.gcid) as `total`, gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d) + where uid = %d and not gcontact.nurl in ( select nurl from contact where uid = %d ) + and not gcontact.name in ( select name from contact where uid = %d ) and not gcontact.id in ( select gcid from gcign where uid = %d ) group by glink.gcid order by total desc limit %d, %d ", intval($uid), intval($uid), intval($uid), + intval($uid), intval($start), intval($limit) ); @@ -252,11 +254,13 @@ function suggestion_query($uid, $start = 0, $limit = 80) { $r2 = q("SELECT gcontact.* from gcontact left join glink on glink.gcid = gcontact.id - where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d) + where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d ) + and not gcontact.name in ( select name from contact where uid = %d ) and not gcontact.id in ( select gcid from gcign where uid = %d ) order by rand() limit %d, %d ", intval($uid), intval($uid), + intval($uid), intval($start), intval($limit) ); diff --git a/js/main.js b/js/main.js index 2b4b13791..0b5fb5cdc 100755 --- a/js/main.js +++ b/js/main.js @@ -588,3 +588,10 @@ Array.prototype.remove = function(item) { return this.push.apply(this, rest); }; +function previewTheme(elm) { + theme = $(elm).val(); + $.getJSON('pretheme?f=&theme=' + theme,function(data) { + $('#theme-preview').html('' + theme + ''); + }); + +} \ No newline at end of file diff --git a/mod/invite.php b/mod/invite.php index ff9f83e0d..2dbf93c59 100755 --- a/mod/invite.php +++ b/mod/invite.php @@ -56,7 +56,7 @@ function invite_post(&$a) { else $nmessage = $message; - $res = mail($recip, sprintf( t('Please join my close friends on Friendica'), $a->config['sitename']), + $res = mail($recip, sprintf( t('Please join us on Friendica'), $a->config['sitename']), $nmessage, "From: " . $a->user['email'] . "\n" . 'Content-type: text/plain; charset=UTF-8' . "\n" @@ -97,9 +97,10 @@ 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'); + $linktxt = sprintf( t('Visit %s for a list of public sites that 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'); + $linktxt = sprintf( t('To accept this invitation, please visit and register at %s or any other public Friendica website.'), $a->get_baseurl()) + . "\r\n" . "\r\n" . sprintf( t('Friendica sites 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 you can join.'),dirname($dirloc) . '/siteinfo'); } else { $o = t('Our apologies. This system is not currently configured to connect with other public sites or invite members.'); @@ -110,7 +111,7 @@ function invite_content(&$a) { '$invite' => t('Send invitations'), '$addr_text' => t('Enter email addresses, one per line:'), '$msg_text' => t('Your message:'), - '$default_message' => t('Please join my close friends on Friendica, and help us to build a better social web.') . "\r\n" . "\r\n" + '$default_message' => t('You are cordially invited to join me and other close friends on Friendica - and help us to create 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'] diff --git a/mod/pretheme.php b/mod/pretheme.php new file mode 100644 index 000000000..5a71bbe53 --- /dev/null +++ b/mod/pretheme.php @@ -0,0 +1,6 @@ + get_theme_screenshot($_REQUEST['theme']))); + killme(); +} diff --git a/view/field_themeselect.tpl b/view/field_themeselect.tpl new file mode 100755 index 000000000..f9f99492c --- /dev/null +++ b/view/field_themeselect.tpl @@ -0,0 +1,9 @@ + +
+ + + $field.3 +
+
diff --git a/view/settings.tpl b/view/settings.tpl index 2b739c968..75225a0f1 100755 --- a/view/settings.tpl +++ b/view/settings.tpl @@ -28,7 +28,7 @@ $nickname_block {{inc field_custom.tpl with $field=$timezone }}{{endinc}} {{inc field_input.tpl with $field=$defloc }}{{endinc}} {{inc field_checkbox.tpl with $field=$allowloc }}{{endinc}} -{{inc field_select.tpl with $field=$theme }}{{endinc}} +{{inc field_themeselect.tpl with $field=$theme }}{{endinc}} {{inc field_input.tpl with $field=$ajaxint }}{{endinc}} {{inc field_input.tpl with $field=$itemspage_network }}{{endinc}} {{inc field_checkbox.tpl with $field=$nosmile}}{{endinc}} diff --git a/view/theme/darkbubble/screenshot.jpg b/view/theme/darkbubble/screenshot.jpg new file mode 100644 index 000000000..0d9af2c04 Binary files /dev/null and b/view/theme/darkbubble/screenshot.jpg differ diff --git a/view/theme/darkzero/screenshot.jpg b/view/theme/darkzero/screenshot.jpg new file mode 100644 index 000000000..e91ae13f5 Binary files /dev/null and b/view/theme/darkzero/screenshot.jpg differ diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index 5b807c8ad..5bae06178 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -46,7 +46,7 @@ {{ endif }} -{{ if $lastusers_title }} +{{ if $page }}
$page
{{ endif }} diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 2c878e6f0..a5f4490ba 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -18,7 +18,7 @@ $cssFile = null; /** * prints last community activity */ -function diabook_community_info(){ +function diabook_blue_community_info(){ $a = get_app(); //right_aside at networkpages @@ -170,6 +170,7 @@ function diabook_community_info(){ if (sizeof($contacts) > 0) $aside['$page'] = $page; + //END Community Page @@ -214,7 +215,7 @@ if ($a->argv[0] === "network" && local_user()){ } // COMMUNITY - diabook_community_info(); + diabook_blue_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-network.css"; @@ -227,7 +228,7 @@ if ($a->argv[0] === "network" && local_user()){ if ($a->argv[0] === "profile"){ // COMMUNITY - diabook_community_info(); + diabook_blue_community_info(); // CUSTOM CSS $cssFile = $a->get_baseurl($ssl_state)."/view/theme/diabook-blue/style-profile.css"; diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index c1b395dbe..1ba9ad081 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -46,7 +46,7 @@ {{ endif }} -{{ if $lastusers_title }} +{{ if $page }}
$page
{{ endif }} diff --git a/view/theme/diabook/screenshot.jpg b/view/theme/diabook/screenshot.jpg new file mode 100644 index 000000000..abc31e329 Binary files /dev/null and b/view/theme/diabook/screenshot.jpg differ diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 5b87e3142..5bd206100 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -252,12 +252,7 @@ $a->page['htmlhead'] .= <<< EOT $('a.lightbox').fancybox(); // Select all links with lightbox class }); - $(document).ready(function () -$('iframe').each(function() -var url = $(this).attr("src"); -$(this).attr("src",url+"?wmode=transparent"); -); -); + EOT; diff --git a/view/theme/dispy/screenshot.jpg b/view/theme/dispy/screenshot.jpg new file mode 100644 index 000000000..81ee35afb Binary files /dev/null and b/view/theme/dispy/screenshot.jpg differ diff --git a/view/theme/duepuntozero/screenshot.jpg b/view/theme/duepuntozero/screenshot.jpg new file mode 100644 index 000000000..5f00ec39e Binary files /dev/null and b/view/theme/duepuntozero/screenshot.jpg differ diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css index b79b00ef4..b1c2fb77e 100755 --- a/view/theme/duepuntozero/style.css +++ b/view/theme/duepuntozero/style.css @@ -249,6 +249,10 @@ div.wall-item-content-wrapper.shiny { background: #FFFFC8; } +#theme-preview { + margin: 15px 0 15px 150px; +} + /* from default */ #jot-perms-icon, #profile-location, diff --git a/view/theme/easterbunny/screenshot.jpg b/view/theme/easterbunny/screenshot.jpg new file mode 100644 index 000000000..5ac613e78 Binary files /dev/null and b/view/theme/easterbunny/screenshot.jpg differ diff --git a/view/theme/greenzero/screenshot.jpg b/view/theme/greenzero/screenshot.jpg new file mode 100644 index 000000000..692ad354b Binary files /dev/null and b/view/theme/greenzero/screenshot.jpg differ diff --git a/view/theme/quattro-green/screenshot.png b/view/theme/quattro-green/screenshot.png new file mode 100644 index 000000000..a764f4f9a Binary files /dev/null and b/view/theme/quattro-green/screenshot.png differ diff --git a/view/theme/quattro/screenshot.jpg b/view/theme/quattro/screenshot.jpg new file mode 100644 index 000000000..7f50ec70e Binary files /dev/null and b/view/theme/quattro/screenshot.jpg differ diff --git a/view/theme/slackr/screenshot.jpg b/view/theme/slackr/screenshot.jpg new file mode 100644 index 000000000..eb1586d5d Binary files /dev/null and b/view/theme/slackr/screenshot.jpg differ diff --git a/view/theme/testbubble/screenshot.jpg b/view/theme/testbubble/screenshot.jpg new file mode 100644 index 000000000..ac9136a25 Binary files /dev/null and b/view/theme/testbubble/screenshot.jpg differ diff --git a/view/theme/vier/screenshot.jpg b/view/theme/vier/screenshot.jpg new file mode 100644 index 000000000..f8e0bf8e6 Binary files /dev/null and b/view/theme/vier/screenshot.jpg differ