Merge pull request #2110 from annando/1511-subscribe-feed
Issue 1779: Atom feed link under the connect link on the profile page
This commit is contained in:
commit
be40fb8186
|
@ -216,7 +216,12 @@ if(! function_exists('profile_sidebar')) {
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($connect AND ($profile['network'] != NETWORK_DFRN) AND !isset($profile['remoteconnect']))
|
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']))
|
if (isset($profile['remoteconnect']))
|
||||||
$remoteconnect = $profile['remoteconnect'];
|
$remoteconnect = $profile['remoteconnect'];
|
||||||
|
@ -337,6 +342,7 @@ if(! function_exists('profile_sidebar')) {
|
||||||
'$profile' => $p,
|
'$profile' => $p,
|
||||||
'$connect' => $connect,
|
'$connect' => $connect,
|
||||||
'$remoteconnect' => $remoteconnect,
|
'$remoteconnect' => $remoteconnect,
|
||||||
|
'$subscribe_feed' => $subscribe_feed,
|
||||||
'$wallmessage' => $wallmessage,
|
'$wallmessage' => $wallmessage,
|
||||||
'$location' => $location,
|
'$location' => $location,
|
||||||
'$gender' => $gender,
|
'$gender' => $gender,
|
||||||
|
|
|
@ -362,8 +362,7 @@ function item_post(&$a) {
|
||||||
if((local_user()) && (local_user() == $profile_uid)) {
|
if((local_user()) && (local_user() == $profile_uid)) {
|
||||||
$self = true;
|
$self = true;
|
||||||
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
$r = q("SELECT * FROM `contact` WHERE `uid` = %d AND `self` = 1 LIMIT 1",
|
||||||
intval($_SESSION['uid'])
|
intval($_SESSION['uid']));
|
||||||
);
|
|
||||||
}
|
}
|
||||||
elseif(remote_user()) {
|
elseif(remote_user()) {
|
||||||
if(is_array($_SESSION['remote'])) {
|
if(is_array($_SESSION['remote'])) {
|
||||||
|
|
|
@ -55,6 +55,9 @@
|
||||||
{{if $wallmessage}}
|
{{if $wallmessage}}
|
||||||
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $subscribe_feed}}
|
||||||
|
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
|
||||||
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -205,6 +205,7 @@ aside {
|
||||||
font-weight: bold;
|
font-weight: bold;
|
||||||
background: #3465a4 url('friendica-16.png') no-repeat 95% center;
|
background: #3465a4 url('friendica-16.png') no-repeat 95% center;
|
||||||
}
|
}
|
||||||
|
#subscribe-feed-link,
|
||||||
#wallmessage-link {
|
#wallmessage-link {
|
||||||
display: block;
|
display: block;
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
|
|
|
@ -47,6 +47,9 @@
|
||||||
{{if $wallmessage}}
|
{{if $wallmessage}}
|
||||||
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $subscribe_feed}}
|
||||||
|
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
|
||||||
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -284,6 +284,7 @@ aside {
|
||||||
/* float:left;*/
|
/* float:left;*/
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#subscribe-feed-link,
|
||||||
#dfrn-request-link {
|
#dfrn-request-link {
|
||||||
display: block;
|
display: block;
|
||||||
color: #FFFFFF;
|
color: #FFFFFF;
|
||||||
|
|
|
@ -43,10 +43,11 @@
|
||||||
{{if $wallmessage}}
|
{{if $wallmessage}}
|
||||||
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $subscribe_feed}}
|
||||||
|
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
|
||||||
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
{{$contact_block}}
|
{{$contact_block}}
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -838,6 +838,7 @@ aside #profile-extra-links li {
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link,
|
||||||
aside #wallmessage-link {
|
aside #wallmessage-link {
|
||||||
display: block;
|
display: block;
|
||||||
-moz-border-radius: 5px 5px 5px 5px;
|
-moz-border-radius: 5px 5px 5px 5px;
|
||||||
|
@ -850,6 +851,7 @@ aside #wallmessage-link {
|
||||||
padding: 4px 2px 2px 35px;
|
padding: 4px 2px 2px 35px;
|
||||||
margin-top: 3px;
|
margin-top: 3px;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed:hover,
|
||||||
aside #wallmessage-link:hover {
|
aside #wallmessage-link:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #19aeff;
|
background-color: #19aeff;
|
||||||
|
|
|
@ -854,6 +854,7 @@ aside #wallmessage-link:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #ccff42;
|
background-color: #ccff42;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link,
|
||||||
aside #dfrn-request-link {
|
aside #dfrn-request-link {
|
||||||
display: block;
|
display: block;
|
||||||
-moz-border-radius: 5px 5px 5px 5px;
|
-moz-border-radius: 5px 5px 5px 5px;
|
||||||
|
@ -865,6 +866,7 @@ aside #dfrn-request-link {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
padding: 4px 2px 2px 35px;
|
padding: 4px 2px 2px 35px;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link:hover,
|
||||||
aside #dfrn-request-link:hover {
|
aside #dfrn-request-link:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #ccff42;
|
background-color: #ccff42;
|
||||||
|
|
|
@ -854,6 +854,7 @@ aside #wallmessage-link:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #86608e;
|
background-color: #86608e;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link,
|
||||||
aside #dfrn-request-link {
|
aside #dfrn-request-link {
|
||||||
display: block;
|
display: block;
|
||||||
-moz-border-radius: 5px 5px 5px 5px;
|
-moz-border-radius: 5px 5px 5px 5px;
|
||||||
|
@ -865,6 +866,7 @@ aside #dfrn-request-link {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
padding: 4px 2px 2px 35px;
|
padding: 4px 2px 2px 35px;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link:hover,
|
||||||
aside #dfrn-request-link:hover {
|
aside #dfrn-request-link:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
background-color: #86608e;
|
background-color: #86608e;
|
||||||
|
|
|
@ -73,6 +73,9 @@
|
||||||
{{if $wallmessage}}
|
{{if $wallmessage}}
|
||||||
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $subscribe_feed}}
|
||||||
|
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
|
||||||
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -690,6 +690,7 @@ aside h4 {
|
||||||
list-style: none;
|
list-style: none;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#subscribe-feed-link,
|
||||||
#dfrn-request-link {
|
#dfrn-request-link {
|
||||||
box-shadow: inset 0px 1px 0px 0px #a65151;
|
box-shadow: inset 0px 1px 0px 0px #a65151;
|
||||||
-moz-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;
|
background-color: #3465a4;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#subscribe-feed-link:hover,
|
||||||
#dfrn-request-link:hover {
|
#dfrn-request-link:hover {
|
||||||
background: -webkit-gradient( linear, left top, left bottom, color-stop(0.05, #1873a2), color-stop(1, #6da6c4) );
|
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% );
|
background: -moz-linear-gradient( center top, #1873a2 5%, #6da6c4 100% );
|
||||||
|
@ -732,6 +734,7 @@ aside h4 {
|
||||||
background-color: #1873a2;
|
background-color: #1873a2;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#subscribe-feed-link:active,
|
||||||
#dfrn-request-link:active {
|
#dfrn-request-link:active {
|
||||||
position: relative;
|
position: relative;
|
||||||
top: 1px;
|
top: 1px;
|
||||||
|
|
|
@ -1007,9 +1007,11 @@ aside #profile-extra-links ul {
|
||||||
}
|
}
|
||||||
aside #profile-extra-links li {
|
aside #profile-extra-links li {
|
||||||
padding: 0px;
|
padding: 0px;
|
||||||
|
padding-bottom: 4px;
|
||||||
margin: 0px;
|
margin: 0px;
|
||||||
list-style: none;
|
list-style: none;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link,
|
||||||
aside #dfrn-request-link,
|
aside #dfrn-request-link,
|
||||||
aside #wallmessage-link {
|
aside #wallmessage-link {
|
||||||
display: block;
|
display: block;
|
||||||
|
@ -1022,6 +1024,7 @@ aside #wallmessage-link {
|
||||||
text-transform: uppercase;
|
text-transform: uppercase;
|
||||||
padding: 4px 2px 2px 35px;
|
padding: 4px 2px 2px 35px;
|
||||||
}
|
}
|
||||||
|
aside #subscribe-feed-link:hover,
|
||||||
aside #dfrn-request-link:hover,
|
aside #dfrn-request-link:hover,
|
||||||
aside #wallmessage-link:hover {
|
aside #wallmessage-link:hover {
|
||||||
text-decoration: none;
|
text-decoration: none;
|
||||||
|
|
|
@ -66,6 +66,9 @@
|
||||||
{{if $wallmessage}}
|
{{if $wallmessage}}
|
||||||
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
<li><a id="wallmessage-link" href="wallmessage/{{$profile.nickname}}">{{$wallmessage}}</a></li>
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
{{if $subscribe_feed}}
|
||||||
|
<li><a id="subscribe-feed-link" href="dfrn_poll/{{$profile.nickname}}">{{$subscribe_feed}}</a></li>
|
||||||
|
{{/if}}
|
||||||
</ul>
|
</ul>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in New Issue
Block a user