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

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

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,

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'])) {

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>

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;

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>

view/theme/frost/style.css

@@ -284,6 +284,7 @@ aside {
 /*	float:left;*/
 }
 
+#subscribe-feed-link,
 #dfrn-request-link {
 	display: block;
 	color: #FFFFFF;

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}}
-
-

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;

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;

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;

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>

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;

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;

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>