Merge pull request #2110 from annando/1511-subscribe-feed

Issue 1779: Atom feed link under the connect link on the profile page

diff --git a/include/identity.php b/include/identity.php
index a785ce981dc8074873c9fb354b2e72a4e31f310d..0282b2d9a51a1a14ff4bb0c417714ff071a41317 100644 (file)
--- a/include/identity.php
+++ b/include/identity.php
@@ -216,7 +216,12 @@ if(! function_exists('profile_sidebar')) {
                }
 
                if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
-                               $connect = false;
+                       $connect = false;
+
+               if ($connect)
+                       $subscribe_feed = t("Atom feed");
+               else
+                       $subscribe_feed = false;
 
                if (isset($profile['remoteconnect']))
                        $remoteconnect = $profile['remoteconnect'];
@@ -337,6 +342,7 @@ if(! function_exists('profile_sidebar')) {
                        '$profile' => $p,
                        '$connect'  => $connect,
                        '$remoteconnect'  => $remoteconnect,
+                       '$subscribe_feed' => $subscribe_feed,
                        '$wallmessage' => $wallmessage,
                        '$location' => $location,
                        '$gender'   => $gender,

diff --git a/mod/item.php b/mod/item.php
index 91a94974e9a232cd0b7c1e2a55893fe0ee69c41b..a2b88a8e305f00474a3adecb034adb5a6ed71ddf 100644 (file)
--- a/mod/item.php
+++ b/mod/item.php
@@ -362,8 +362,7 @@ function item_post(&$a) {
        if((local_user()) && (local_user() == $profile_uid)) {
                $self = true;
                $r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
-                       intval($_SESSION['uid'])
-               );
+                       intval($_SESSION['uid']));
        }
        elseif(remote_user()) {
                if(is_array($_SESSION['remote'])) {

diff --git a/view/templates/profile_vcard.tpl b/view/templates/profile_vcard.tpl
index 05e44432fd2d33635edd787841f3d7eace0f2079..fa209bf46fa35e83da9b1d1b631e5bbb9a80f3db 100644 (file)
--- a/view/templates/profile_vcard.tpl
+++ b/view/templates/profile_vcard.tpl
@@ -55,6 +55,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/theme/duepuntozero/style.css b/view/theme/duepuntozero/style.css
index cbf0410359dbdc6a4145a67732ae83f9f24c37d2..bffc8c05724e2326b4c0486bf878fb5f70c267b5 100644 (file)
--- a/view/theme/duepuntozero/style.css
+++ b/view/theme/duepuntozero/style.css
@@ -205,6 +205,7 @@ aside {
        font-weight: bold;
        background: #3465a4 url('friendica-16.png') no-repeat 95% center;
 }
+#subscribe-feed-link,
 #wallmessage-link {
        display: block;
        color: #FFFFFF;

diff --git a/view/theme/duepuntozero/templates/profile_vcard.tpl b/view/theme/duepuntozero/templates/profile_vcard.tpl
index bf2eb27349815370e1ff6fe0f488569d6b9bb187..fb5d4e420e68ca02c75127244a61be459f3a66f4 100644 (file)
--- a/view/theme/duepuntozero/templates/profile_vcard.tpl
+++ b/view/theme/duepuntozero/templates/profile_vcard.tpl
@@ -47,6 +47,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/theme/frost/style.css b/view/theme/frost/style.css
index c0e85facb01ba342981c589ebc9fc11592a2c0c5..1f0a90938e1ed388abbd1006b087f3a9385cb6b5 100644 (file)
--- a/view/theme/frost/style.css
+++ b/view/theme/frost/style.css
@@ -284,6 +284,7 @@ aside {
 /*     float:left;*/
 }
 
+#subscribe-feed-link,
 #dfrn-request-link {
        display: block;
        color: #FFFFFF;

diff --git a/view/theme/frost/templates/profile_vcard.tpl b/view/theme/frost/templates/profile_vcard.tpl
index 515740871385e0951b5100fa77e4b9cbb51b5e94..b8f59ccaa8cd084dc43913dd4dfa418cd6533d86 100644 (file)
--- a/view/theme/frost/templates/profile_vcard.tpl
+++ b/view/theme/frost/templates/profile_vcard.tpl
@@ -43,10 +43,11 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>
 
 {{$contact_block}}
-
-

diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 25102ba31d900ef499670e440f49d268123a920d..785b527b27c170f5d37e74ace4a6f4acb738aa86 100644 (file)
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -838,6 +838,7 @@ aside #profile-extra-links li {
   margin: 0px;
   list-style: none;
 }
+aside #subscribe-feed-link,
 aside #wallmessage-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -850,6 +851,7 @@ aside #wallmessage-link {
   padding: 4px 2px 2px 35px;
   margin-top: 3px;
 }
+aside #subscribe-feed:hover,
 aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #19aeff;

diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index 78de88654292add54764fa4d1c2de792de74cf80..73354403194f99485c166a0715feb40abca9c821 100644 (file)
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -854,6 +854,7 @@ aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #ccff42;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -865,6 +866,7 @@ aside #dfrn-request-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover {
   text-decoration: none;
   background-color: #ccff42;

diff --git a/view/theme/quattro/lilac/style.css b/view/theme/quattro/lilac/style.css
index 1ca27b895c058a3b527ee732039270b5bb4bd2fc..c5027928b2ffcc2af786555f4fd7af77bec8afb8 100644 (file)
--- a/view/theme/quattro/lilac/style.css
+++ b/view/theme/quattro/lilac/style.css
@@ -854,6 +854,7 @@ aside #wallmessage-link:hover {
   text-decoration: none;
   background-color: #86608e;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link {
   display: block;
   -moz-border-radius: 5px 5px 5px 5px;
@@ -865,6 +866,7 @@ aside #dfrn-request-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover {
   text-decoration: none;
   background-color: #86608e;

diff --git a/view/theme/quattro/templates/profile_vcard.tpl b/view/theme/quattro/templates/profile_vcard.tpl
index dfa6d0445d6d0b625009914882ab1e5a5b81834b..7a06e7588f241e47602064f72491fa68b6bc7de3 100644 (file)
--- a/view/theme/quattro/templates/profile_vcard.tpl
+++ b/view/theme/quattro/templates/profile_vcard.tpl
@@ -73,6 +73,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>

diff --git a/view/theme/smoothly/style.css b/view/theme/smoothly/style.css
index 3b6b73dc6e39eb6b63719ebee41d25c7b69ab9f9..510b7d9c6d79018967cdbb2afc9d3f6fc18a0f8a 100644 (file)
--- a/view/theme/smoothly/style.css
+++ b/view/theme/smoothly/style.css
@@ -690,6 +690,7 @@ aside h4 {
        list-style: none;
 }
 
+#subscribe-feed-link,
 #dfrn-request-link {
        box-shadow: inset 0px 1px 0px 0px #a65151;
                -moz-box-shadow: inset 0px 1px 0px 0px #a65151;
@@ -725,6 +726,7 @@ aside h4 {
        background-color: #3465a4;
 }
 
+#subscribe-feed-link:hover,
 #dfrn-request-link:hover {
        background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
        background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
@@ -732,6 +734,7 @@ aside h4 {
        background-color: #1873a2;
 }
 
+#subscribe-feed-link:active,
 #dfrn-request-link:active {
        position: relative;
        top: 1px;

diff --git a/view/theme/vier/style.css b/view/theme/vier/style.css
index fcc6c7b8cc579187657b5a0bcf82b3fc8359dde6..868d4a50713025dc8fd82bc442cb89ba534bb304 100644 (file)
--- a/view/theme/vier/style.css
+++ b/view/theme/vier/style.css
@@ -1007,9 +1007,11 @@ aside #profile-extra-links ul {
 }
 aside #profile-extra-links li {
   padding: 0px;
+  padding-bottom: 4px;
   margin: 0px;
   list-style: none;
 }
+aside #subscribe-feed-link,
 aside #dfrn-request-link,
 aside #wallmessage-link {
   display: block;
@@ -1022,6 +1024,7 @@ aside #wallmessage-link {
   text-transform: uppercase;
   padding: 4px 2px 2px 35px;
 }
+aside #subscribe-feed-link:hover,
 aside #dfrn-request-link:hover,
 aside #wallmessage-link:hover {
   text-decoration: none;

diff --git a/view/theme/vier/templates/profile_vcard.tpl b/view/theme/vier/templates/profile_vcard.tpl
index c5a51ccbafe9ebae73e67815868e37cec4918830..1882c155833872d7edc2d3c79f3101569df2560c 100644 (file)
--- a/view/theme/vier/templates/profile_vcard.tpl
+++ b/view/theme/vier/templates/profile_vcard.tpl
@@ -66,6 +66,9 @@
                        {{if $wallmessage}}
                                <li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
                        {{/if}}
+                       {{if $subscribe_feed}}
+                               <li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
+                       {{/if}}
                </ul>
        </div>
 </div>