diff options
| author | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-04 23:42:30 +0100 |
|---|---|---|
| committer | Haakon Meland Eriksen <haakon.eriksen@far.no> | 2016-03-04 23:42:30 +0100 |
| commit | 01c0e5c46cb2dbb5e4939f326be5bb638edea3d2 (patch) | |
| tree | 4c6db7e63baf4a1b5f764f995a97a1bcb29509a3 | |
| parent | 059da4d01705ca1515e0ccf4b790c407c751685c (diff) | |
| parent | 25ebac8d0b8acd73c13a0789a0292591f6ccc204 (diff) | |
| download | volse-hubzilla-01c0e5c46cb2dbb5e4939f326be5bb638edea3d2.tar.gz volse-hubzilla-01c0e5c46cb2dbb5e4939f326be5bb638edea3d2.tar.bz2 volse-hubzilla-01c0e5c46cb2dbb5e4939f326be5bb638edea3d2.zip | |
Merge remote-tracking branch 'upstream/master'
| -rw-r--r-- | mod/profiles.php | 1 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/mod/profiles.php b/mod/profiles.php index 282d741ac..3ae1390df 100644 --- a/mod/profiles.php +++ b/mod/profiles.php @@ -675,6 +675,7 @@ function profiles_content(&$a) { '$submit' => t('Submit'), '$viewprof' => t('View this profile'), '$editvis' => t('Edit visibility'), + '$coverpic' => t('Change Cover Photo'), '$profpic' => t('Change Profile Photo'), '$cr_prof' => t('Create a new profile using these settings'), '$cl_prof' => t('Clone this profile'), diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 535aa19dd..229a84ae6 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -8,6 +8,7 @@ <div id="profile-edit-links"> <span class="btn btn-default"><a href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}">{{$profpic}}</a></span> +{{if $is_default}}<span class="btn btn-default"><a href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}">{{$coverpic}}</a></span>{{/if}} <span class="btn btn-default"><a href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a></span> {{if ! $is_default}}<span class="btn btn-default"><a href="profperm/{{$profile_id}}" id="profile-edit-view-link" title="{{$editvis}}">{{$editvis}}</a></span>{{/if}} {{if $profile_clone_link}}<span class="btn btn-default"><a href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a></span>{{/if}} |