diabook-themes: add link to global dir in "find friends" at right_aside

diff --git a/view/theme/diabook-aerith/communityhome.tpl b/view/theme/diabook-aerith/communityhome.tpl
index 917af49f1af52f9aee292ed611ecf9c3d45a0686..c26d02dc6aff9e4fe9eac6df2ddd6985461a91fa 100755 (executable)
--- a/view/theme/diabook-aerith/communityhome.tpl
+++ b/view/theme/diabook-aerith/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-aerith/fpostit/fpostit.php b/view/theme/diabook-aerith/fpostit/fpostit.php
index 65c43a2b9f5ce8f7d2f629c83507417efed4d708..4505c994694129bf63891af90fad26c31ab7371d 100644 (file)
--- 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 <<<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-aerith/theme.php b/view/theme/diabook-aerith/theme.php
index e9fe8e0f0e8d4bddeb6985447fc465615ec99932..4900107507f2da487cec3d34eccd13dd2052a9fc 100755 (executable)
--- 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 cff75cd40a672d75d1992feb344c97fa0a077883..3b95b376e21eba2186f6759957cc610d97f16d5e 100755 (executable)
--- 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 65c43a2b9f5ce8f7d2f629c83507417efed4d708..4505c994694129bf63891af90fad26c31ab7371d 100644 (file)
--- 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 3d54ba9efce83a6cca36a843a0ef0ca7bf678139..891c13cbf39fd64e94d38480a2fc8c3c82ba2c76 100755 (executable)
--- 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 326c766b25dedbcdf9f6017cdecf3c1cb9ea35ba..91935a9d3558d76e70d85aaae276e0b81e7e8a15 100755 (executable)
--- a/view/theme/diabook-red/communityhome.tpl
+++ b/view/theme/diabook-red/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-red/fpostit/fpostit.php b/view/theme/diabook-red/fpostit/fpostit.php
index 65c43a2b9f5ce8f7d2f629c83507417efed4d708..4505c994694129bf63891af90fad26c31ab7371d 100644 (file)
--- 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 <<<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-red/theme.php b/view/theme/diabook-red/theme.php
index b091295b7d6bf76898e1b63b6cb5bff8b5f758e4..44a76a5e459cd73fab55887902997f6feee6219b 100755 (executable)
--- 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 91871a7b96bc9cfe2feb1d8fb44094e0781a1d91..d344cad31a5251544d80af346f34436ed79d7ee0 100755 (executable)
--- a/view/theme/diabook/communityhome.tpl
+++ b/view/theme/diabook/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/fpostit/fpostit.php b/view/theme/diabook/fpostit/fpostit.php
index 65c43a2b9f5ce8f7d2f629c83507417efed4d708..4505c994694129bf63891af90fad26c31ab7371d 100644 (file)
--- a/view/theme/diabook/fpostit/fpostit.php
+++ b/view/theme/diabook/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/theme.php b/view/theme/diabook/theme.php
index 6ac64bedac6a4e1e1c97145b44685ba3fd57cdde..d6ee57316a8f44c32b993ce16cc68de481989286 100755 (executable)
--- 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'), "", "");