diff options
| author | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
|---|---|---|
| committer | Simon L'nu <simon.lnu@gmail.com> | 2012-04-01 23:56:13 -0400 |
| commit | 5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c (patch) | |
| tree | 5ce33b1595a2dd7d94e43ca9d2efc7be8facc94b /view/theme/diabook-blue | |
| parent | 9472ba8d2031183cc9d573f27e02511c1c5a3050 (diff) | |
| parent | 5d35f0d54a52801dd9a17d4e44c294e4c9168de3 (diff) | |
| download | volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.gz volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.tar.bz2 volse-hubzilla-5eca42975cdf3fc0e5be2dfdb05ded9d19ed5b7c.zip | |
Merge branch 'master', remote-tracking branch 'remotes/upstream/master'
* remotes/upstream/master:
add title to D* posts
allow users to set categories on their posts
Modified peopleyouknow to handle sites without Facebook better
diabook-themes: add link to global dir in "find friends" at right_aside
modified: mod/newmember.php
New user quick start.
check for style.php existence before inclusion
Moved Diaspora notes away from top, per user request
* master:
Diffstat (limited to 'view/theme/diabook-blue')
| -rwxr-xr-x | view/theme/diabook-blue/communityhome.tpl | 1 | ||||
| -rw-r--r-- | view/theme/diabook-blue/fpostit/fpostit.php | 4 | ||||
| -rwxr-xr-x | view/theme/diabook-blue/theme.php | 3 |
3 files changed, 5 insertions, 3 deletions
diff --git a/view/theme/diabook-blue/communityhome.tpl b/view/theme/diabook-blue/communityhome.tpl index cff75cd40..3b95b376e 100755 --- a/view/theme/diabook-blue/communityhome.tpl +++ b/view/theme/diabook-blue/communityhome.tpl @@ -34,6 +34,7 @@ {{ if $nv }} <h3>Find Friends<a id="close_friends_icon" onClick="close_friends()" class="icon close_box" title="close"></a></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.global_directory.2" href="$nv.global_directory.0" style="margin-left: 10px; " title="$nv.global_directory.3" >$nv.global_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><br> <a class="$nv.invite.2" href="$nv.invite.0" style="margin-left: 10px; " title="$nv.invite.3" >$nv.invite.1</a> diff --git a/view/theme/diabook-blue/fpostit/fpostit.php b/view/theme/diabook-blue/fpostit/fpostit.php index 65c43a2b9..4505c9946 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 <<<EOF <div class='wrap1'> <h2><img class='logo' src='friendika-32.png' align='middle';/> - Friendika Bookmarklet</h2> + Friendica 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 /> + Enter the email address of the Friendica Account that you want to cross-post to:(example: user@friendica.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 /> diff --git a/view/theme/diabook-blue/theme.php b/view/theme/diabook-blue/theme.php index 3d54ba9ef..891c13cbf 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'), "", ""); |