Browse Source

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

Issue 1779: Atom feed link under the connect link on the profile page
tags/3.4.3
Tobias Diekershoff 4 years ago
parent
commit
be40fb8186
14 changed files with 37 additions and 5 deletions
  1. +7
    -1
      include/identity.php
  2. +1
    -2
      mod/item.php
  3. +3
    -0
      view/templates/profile_vcard.tpl
  4. +1
    -0
      view/theme/duepuntozero/style.css
  5. +3
    -0
      view/theme/duepuntozero/templates/profile_vcard.tpl
  6. +1
    -0
      view/theme/frost/style.css
  7. +3
    -2
      view/theme/frost/templates/profile_vcard.tpl
  8. +2
    -0
      view/theme/quattro/dark/style.css
  9. +2
    -0
      view/theme/quattro/green/style.css
  10. +2
    -0
      view/theme/quattro/lilac/style.css
  11. +3
    -0
      view/theme/quattro/templates/profile_vcard.tpl
  12. +3
    -0
      view/theme/smoothly/style.css
  13. +3
    -0
      view/theme/vier/style.css
  14. +3
    -0
      view/theme/vier/templates/profile_vcard.tpl

+ 7
- 1
include/identity.php View File

@@ -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,

+ 1
- 2
mod/item.php View File

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

+ 3
- 0
view/templates/profile_vcard.tpl View File

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

+ 1
- 0
view/theme/duepuntozero/style.css View File

@@ -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;

+ 3
- 0
view/theme/duepuntozero/templates/profile_vcard.tpl View File

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

+ 1
- 0
view/theme/frost/style.css View File

@@ -284,6 +284,7 @@ aside {
/* float:left;*/
}

#subscribe-feed-link,
#dfrn-request-link {
display: block;
color: #FFFFFF;

+ 3
- 2
view/theme/frost/templates/profile_vcard.tpl View File

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



+ 2
- 0
view/theme/quattro/dark/style.css View File

@@ -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;

+ 2
- 0
view/theme/quattro/green/style.css View File

@@ -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;

+ 2
- 0
view/theme/quattro/lilac/style.css View File

@@ -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;

+ 3
- 0
view/theme/quattro/templates/profile_vcard.tpl View File

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

+ 3
- 0
view/theme/smoothly/style.css View File

@@ -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;

+ 3
- 0
view/theme/vier/style.css View File

@@ -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;

+ 3
- 0
view/theme/vier/templates/profile_vcard.tpl View File

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

Loading…
Cancel
Save