From d0ddd380e7e65cd20e6a85c32085258e1ab69339 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 00:18:03 +0100 Subject: [PATCH 1/8] Moved Diaspora notes away from top, per user request --- mod/dfrn_request.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/mod/dfrn_request.php b/mod/dfrn_request.php index c2d37dac7e..5881b7b51b 100755 --- a/mod/dfrn_request.php +++ b/mod/dfrn_request.php @@ -664,8 +664,8 @@ function dfrn_request_content(&$a) { else $tpl = get_markup_template('auto_request.tpl'); - $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), - $target_addr) . EOL . EOL; + # $page_desc = sprintf( t('Diaspora members: Please do not use this form. Instead, enter "%s" into your Diaspora search bar.'), + # $target_addr) . EOL . EOL; $page_desc .= t("Please enter your 'Identity Address' from one of the following supported communications networks:"); @@ -699,7 +699,7 @@ function dfrn_request_content(&$a) { '$friendica' => t('Friendica'), '$statusnet' => t('StatusNet/Federated Social Web'), '$diaspora' => t('Diaspora'), - '$diasnote' => t('- please share from your own site as noted above'), + '$diasnote' => sprintf (t(' - please do not use this form. Instead, enter %s into your Diaspora search bar.'),$target_addr), '$your_address' => t('Your Identity Address:'), '$invite_desc' => $invite_desc, '$emailnet' => $emailnet, From f95db4382eb92f0e29ab3cef2f285ea6c20b2912 Mon Sep 17 00:00:00 2001 From: friendica Date: Sun, 1 Apr 2012 16:21:55 -0700 Subject: [PATCH 2/8] check for style.php existence before inclusion --- mod/view.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/mod/view.php b/mod/view.php index 33aa23f447..15b3733b3f 100644 --- a/mod/view.php +++ b/mod/view.php @@ -9,7 +9,8 @@ function view_init($a){ if ($a->argc == 4){ $theme = $a->argv[2]; $THEMEPATH = "view/theme/$theme"; - require_once("view/theme/$theme/style.php"); + if(file_exists("view/theme/$theme/style.php")) + require_once("view/theme/$theme/style.php"); } killme(); From 8c9c561f6ca506e8063e438d58853a0ba0ae65e8 Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 00:23:58 +0100 Subject: [PATCH 3/8] New user quick start. --- doc/Home.md | 1 + doc/andfinally.md | 24 ++++++++++++++++++++++++ doc/groupsandpages.md | 11 +++++++++++ doc/guide.md | 13 +++++++++++++ doc/makingnewfriends.md | 11 +++++++++++ doc/network.md | 9 +++++++++ doc/peopleyouknow.md | 11 +++++++++++ 7 files changed, 80 insertions(+) create mode 100644 doc/andfinally.md create mode 100644 doc/groupsandpages.md create mode 100644 doc/guide.md create mode 100644 doc/makingnewfriends.md create mode 100644 doc/network.md create mode 100644 doc/peopleyouknow.md diff --git a/doc/Home.md b/doc/Home.md index 56abe8075c..30efc93f7d 100755 --- a/doc/Home.md +++ b/doc/Home.md @@ -5,6 +5,7 @@ Friendica Documentation and Resources **Contents** * [Account Basics](help/Account-Basics) +* [New User Quick Start](help/guide) * [Profiles](help/Profiles) * [Connectors](help/Connectors) * [Making Friends](help/Making-Friends) diff --git a/doc/andfinally.md b/doc/andfinally.md new file mode 100644 index 0000000000..cd8a6994ba --- /dev/null +++ b/doc/andfinally.md @@ -0,0 +1,24 @@ +And that brings the Quick Start to an end. + +Here are some more things to help get you started: + +**Groups** + + +- New Here - a group for people new to Friendica + +- Friendica Support - problems? This is the place to ask. + +- Public Stream - a place to talk about anything to anyone. + +- Let's Talk a group for finding people and groups who share similar interests. + +- Local Friendica a page for local Friendica groups + + +**Documentation** + +- Connecting to more networks +- Help Index + + diff --git a/doc/groupsandpages.md b/doc/groupsandpages.md new file mode 100644 index 0000000000..418e682c83 --- /dev/null +++ b/doc/groupsandpages.md @@ -0,0 +1,11 @@ +This is the global directory. If you get lost, you can click this link to bring yourself back here. + +On this page, you'll find a collection of groups, forums and celebrity pages. Groups are not real people. Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum. You don't have to feel awkward about introducing yourself to a new person, because they're not people! + +When you connect to a group, all messages to that group will start appearing in your network tab. You can comment on these posts, or post to the group yourself without ever having to add any of the groups members. This is a great way to make friends dynamically - you'll find people you like and add each other naturally instead of adding random strangers. Simply find a group you're interested in, and connect to it the same way you did with people in the last section. There are a lot of groups, and you're likely to get lost. Remember the link at the top of this page will bring you back here. + +Once you've added some groups, move on to the next section. + + + + diff --git a/doc/guide.md b/doc/guide.md new file mode 100644 index 0000000000..178170c4e2 --- /dev/null +++ b/doc/guide.md @@ -0,0 +1,13 @@ +First things first, let's make sure you're logged in to your account. If you're not already logged in, do so in the frame below. + +Once you've logged in (or if you are already logged in), you'll now be looking at your profile page. + +This is a bit like your Facebook wall. It's where all your status messgages are kept, and where your friends come to post on your wall. To write your status, simply click in the box that says "share". When you do this, the box will expand. You can see some formatting options at the top such as Bold, Italics and Underline, as well as ways to add links and pictures. At the bottom you'll find some more links. You can use these to upload pictures and files from your computer, share websites with a bit of preview text, or embed video and audio files from elsewhere on the web. You can also set your post location here. + +Once you've finished writing your post, click on the padlock icon to select who can see it. If you do not use the padlock icon, your post will be public. This means it will appear to anybody who views your profile, and in the community tab if your site has it enabled, as well as in the network tab of any of your contacts. + +Play around with this a bit, then when you're ready to move on, we'll take a look at the Network Tab + + + + diff --git a/doc/makingnewfriends.md b/doc/makingnewfriends.md new file mode 100644 index 0000000000..35befaa365 --- /dev/null +++ b/doc/makingnewfriends.md @@ -0,0 +1,11 @@ +This is your Suggested Friends page. If you get lost, you can click this link to bring yourself back here. + +This is a bit like the Friend Suggestions page of Facebook. Everybody on this list has agreed that they may be suggested as a friend. This means they're unlikely to refuse an introduction you send, and they want to meet new people too! + +See somebody you like the look of? Click the connect button beneath their photograph. This will bring you to the introductions page. Fill in the form as instructed, and add a small note (optional). Now, wait a bit and they'll accept your request - note that these are real people, and it might take a while. Now you've added one, you're probably lost. Click the link at the top of this page to go back to the suggested friends list and add some more. + +Feel uncomfortable adding people you don't know? Don't worry - that's where Groups and Pages come in! + + + + diff --git a/doc/network.md b/doc/network.md new file mode 100644 index 0000000000..f445b0055e --- /dev/null +++ b/doc/network.md @@ -0,0 +1,9 @@ +This is your Network Tab. If you get lost, you can click this link to bring yourself back here. + +This is a bit like the Newsfeed at Facebook or the Stream at Diaspora. It's where all the posts from your contacts, groups, and feeds will appear. If you're new, you won't see anything in this page, unless you posted your status in the last step. If you've already added a few friends, you'll be able to see their posts. Here, you can comment, like, or dislike posts, or click on somebody's name to visit their profile page where you can write on their wall. + +Now we need to fill it up, the first step, is to add people you already know from Facebook. + + + + diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md new file mode 100644 index 0000000000..07a22e58d4 --- /dev/null +++ b/doc/peopleyouknow.md @@ -0,0 +1,11 @@ +This is your connector settings page. If you get lost, you can click this link to bring yourself back here. + +This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. If you need help with the rest, you can always ask at Friendica Support or see the instructions here. + +The biggest of them all is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this later, but for now, we'll move on to making new friends. + + + + + + From 8406803473773404b18b95c709da0b8f5da59d3c Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 00:27:47 +0100 Subject: [PATCH 4/8] modified: mod/newmember.php Add a link to the quick start --- mod/newmember.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mod/newmember.php b/mod/newmember.php index 2ecc890247..683463ecb8 100755 --- a/mod/newmember.php +++ b/mod/newmember.php @@ -13,6 +13,8 @@ function newmember_content(&$a) { $o .= '
    '; + $o .= '
  • ' . '' . t('On your Quick Start page - find a brief introduction to your profile and network tabs, connect to Facebook, make some new connections, and find some groups to join.') . '
    • ' . EOL; + $o .= '
  • ' . '' . t('On your Settings page - change your initial password. Also make a note of your Identity Address. This looks just like an email address - and will be useful in making friends on the free social web.') . '
    • ' . EOL; $o .= '
  • ' . '' . t('Review the other settings, particularly the privacy settings. An unpublished directory listing is like having an unlisted phone number. In general, you should probably publish your listing - unless all of your friends and potential friends know exactly how to find you.') . '
    • ' . EOL; From 23dc376364b7d8f8e27e3493fe3edbf5cf768a35 Mon Sep 17 00:00:00 2001 From: tommy tomson Date: Mon, 2 Apr 2012 01:29:20 +0200 Subject: [PATCH 5/8] diabook-themes: add link to global dir in "find friends" at right_aside --- view/theme/diabook-aerith/communityhome.tpl | 1 + view/theme/diabook-aerith/fpostit/fpostit.php | 4 ++-- view/theme/diabook-aerith/theme.php | 3 ++- view/theme/diabook-blue/communityhome.tpl | 1 + view/theme/diabook-blue/fpostit/fpostit.php | 4 ++-- view/theme/diabook-blue/theme.php | 3 ++- view/theme/diabook-red/communityhome.tpl | 1 + view/theme/diabook-red/fpostit/fpostit.php | 4 ++-- view/theme/diabook-red/theme.php | 3 ++- view/theme/diabook/communityhome.tpl | 1 + view/theme/diabook/fpostit/fpostit.php | 4 ++-- view/theme/diabook/theme.php | 3 ++- 12 files changed, 20 insertions(+), 12 deletions(-) diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl index 917af49f1a..c26d02dc6a 100755 --- a/view/theme/diabook-aerith/communityhome.tpl +++ b/view/theme/diabook-aerith/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook-aerith/fpostit/fpostit.php +++ b/view/theme/diabook-aerith/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook-aerith/theme.php b/view/theme/diabook-aerith/theme.php index e9fe8e0f0e..4900107507 100755 --- a/view/theme/diabook-aerith/theme.php +++ b/view/theme/diabook-aerith/theme.php @@ -139,7 +139,8 @@ function diabook_aerith_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index cff75cd40a..3b95b376e2 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook-blue/fpostit/fpostit.php +++ b/view/theme/diabook-blue/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3d54ba9efc..891c13cbf3 100755 --- a/view/theme/diabook-blue/theme.php +++ b/view/theme/diabook-blue/theme.php @@ -139,7 +139,8 @@ function diabook_blue_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook-red/communityhome.tpl b/view/theme/diabook-red/communityhome.tpl index 326c766b25..91935a9d35 100755 --- a/view/theme/diabook-red/communityhome.tpl +++ b/view/theme/diabook-red/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook-red/fpostit/fpostit.php +++ b/view/theme/diabook-red/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook-red/theme.php b/view/theme/diabook-red/theme.php index b091295b7d..44a76a5e45 100755 --- a/view/theme/diabook-red/theme.php +++ b/view/theme/diabook-red/theme.php @@ -139,7 +139,8 @@ function diabook_red_community_info(){ //nav FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); diff --git a/view/theme/diabook/communityhome.tpl b/view/theme/diabook/communityhome.tpl index 91871a7b96..d344cad31a 100755 --- a/view/theme/diabook/communityhome.tpl +++ b/view/theme/diabook/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }}

    Find Friends

    $nv.directory.1
    +$nv.global_directory.1
    $nv.match.1
    $nv.suggest.1
    $nv.invite.1 diff --git a/view/theme/diabook/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php index 65c43a2b9f..4505c99469 100644 --- a/view/theme/diabook/fpostit/fpostit.php +++ b/view/theme/diabook/fpostit/fpostit.php @@ -113,12 +113,12 @@ function showForm($error, $content) { echo <<

    - Friendika Bookmarklet

    + Friendica Bookmarklet
    - Enter the email address of the Friendika Account that you want to cross-post to:(example: user@friendika.org)

    + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.org)

    Account ID:
    Password:

    diff --git a/view/theme/diabook/theme.php b/view/theme/diabook/theme.php index 6ac64bedac..d6ee57316a 100755 --- a/view/theme/diabook/theme.php +++ b/view/theme/diabook/theme.php @@ -143,7 +143,8 @@ function diabook_community_info(){ //right_aside FIND FRIENDS if(local_user()) { $nv = array(); - $nv['directory'] = Array('directory', t('Directory'), "", ""); + $nv['directory'] = Array('directory', t('Local').' '.t('Directory'), "", ""); + $nv['global_directory'] = Array('http://dir.friendica.com/', t('Global Directory'), "", ""); $nv['match'] = Array('match', t('Similar Interests'), "", ""); $nv['suggest'] = Array('suggest', t('Friend Suggestions'), "", ""); $nv['invite'] = Array('invite', t('Invite Friends'), "", ""); From 1457d6e90f36a6a7bb07df3579b6e5c0475b121d Mon Sep 17 00:00:00 2001 From: Thomas Willingham Date: Mon, 2 Apr 2012 01:26:45 +0100 Subject: [PATCH 6/8] Modified peopleyouknow to handle sites without Facebook better --- doc/peopleyouknow.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/doc/peopleyouknow.md b/doc/peopleyouknow.md index 07a22e58d4..143c492176 100644 --- a/doc/peopleyouknow.md +++ b/doc/peopleyouknow.md @@ -1,8 +1,10 @@ This is your connector settings page. If you get lost, you can click this link to bring yourself back here. -This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. If you need help with the rest, you can always ask at Friendica Support or see the instructions here. +This is the bit that makes Friendica unique. You can connect to anybody on the internet from your Friendica account using this page! The available connectors varies depending on which plugins you have installed, but for now, we'll walk you through Facebook. Note that not all servers have the Facebook connector installed. If you can't find it in the list below, don't worry, we'll look at ways of connecting to more people in the following pages. -The biggest of them all is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this later, but for now, we'll move on to making new friends. +The biggest of all social networks is Facebook. Fortunately, this connector is really easy. Scroll down the page, and click Facebook Connector Settings. Enter your Facebook user name and password and let the application (the connector) do everything the options suggest. You can fine tune this or experiment with the other connectors too. If you need help, you can always ask at Friendica Support or see the instructions here. + +When you're ready, we can move on to making new friends. From 581b54c974a9b9a050a8a0b9a17a19bd41b1f2f5 Mon Sep 17 00:00:00 2001 From: Michael Johnston Date: Sun, 1 Apr 2012 21:28:31 -0400 Subject: [PATCH 7/8] allow users to set categories on their posts --- boot.php | 5 ++ include/contact_widgets.php | 28 ++++++++ include/conversation.php | 2 + include/text.php | 112 ++++++++++++++++++++++++++++++ mod/editpost.php | 2 + mod/item.php | 30 ++++++-- mod/profile.php | 21 +++++- view/categories_widget.tpl | 13 ++++ view/jot.tpl | 1 + view/theme/darkzero/style.css | 8 ++- view/theme/duepuntozero/style.css | 22 +++--- 11 files changed, 226 insertions(+), 18 deletions(-) create mode 100755 view/categories_widget.tpl diff --git a/boot.php b/boot.php index 2f2e28cebd..c2690f6ef0 100755 --- a/boot.php +++ b/boot.php @@ -293,6 +293,8 @@ class App { public $nav_sel; + public $category; + private $scheme; private $hostname; private $baseurl; @@ -377,6 +379,9 @@ class App { $this->argc = count($this->argv); if((array_key_exists('0',$this->argv)) && strlen($this->argv[0])) { $this->module = str_replace(".", "_", $this->argv[0]); + if(array_key_exists('2',$this->argv)) { + $this->category = $this->argv[2]; + } } else { $this->argc = 1; diff --git a/include/contact_widgets.php b/include/contact_widgets.php index 7346b95afa..e0f37f078f 100755 --- a/include/contact_widgets.php +++ b/include/contact_widgets.php @@ -103,3 +103,31 @@ function fileas_widget($baseurl,$selected = '') { )); } +function categories_widget($baseurl,$selected = '') { + $a = get_app(); + + $saved = get_pconfig($a->profile['profile_uid'],'system','filetags'); + if(! strlen($saved)) + return; + + $matches = false; + $terms = array(); + $cnt = preg_match_all('/<(.*?)>/',$saved,$matches,PREG_SET_ORDER); + if($cnt) { + foreach($matches as $mtch) { + $unescaped = xmlify(file_tag_decode($mtch[1])); + $terms[] = array('name' => $unescaped,'selected' => (($selected == $unescaped) ? 'selected' : '')); + } + } + + return replace_macros(get_markup_template('categories_widget.tpl'),array( + '$title' => t('Categories'), + '$desc' => '', + '$sel_all' => (($selected == '') ? 'selected' : ''), + '$all' => t('Everything'), + '$terms' => $terms, + '$base' => $baseurl, + + )); +} + diff --git a/include/conversation.php b/include/conversation.php index 5a922b2b52..df92a40ed0 100755 --- a/include/conversation.php +++ b/include/conversation.php @@ -974,6 +974,8 @@ function status_editor($a,$x, $notes_cid = 0, $popup=false) { '$shortnoloc' => t('clear location'), '$title' => "", '$placeholdertitle' => t('Set title'), + '$category' => "", + '$placeholdercategory' => t('Categories (comma-separated list)'), '$wait' => t('Please wait'), '$permset' => t('Permission settings'), '$shortpermset' => t('permissions'), diff --git a/include/text.php b/include/text.php index 191f4fca8a..f204e3f9b9 100644 --- a/include/text.php +++ b/include/text.php @@ -1314,6 +1314,118 @@ function file_tag_file_query($table,$s,$type = 'file') { return " AND " . (($table) ? dbesc($table) . '.' : '') . "file regexp '" . dbesc($str) . "' "; } +// ex. given music,video return