diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-25 15:14:57 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-25 15:14:57 -0800 |
| commit | 6892ba4cd8668ec48d036876d999ed9685165256 (patch) | |
| tree | 413576d1912df0fe6a9b5197d851659affca52ab /view | |
| parent | 7972de13caf21647c8cc2e82c499a344f7191a22 (diff) | |
| parent | 5ad9b48f1d916425e41f475319c7237293d055b9 (diff) | |
| download | volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.tar.gz volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.tar.bz2 volse-hubzilla-6892ba4cd8668ec48d036876d999ed9685165256.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'view')
| -rwxr-xr-x | view/tpl/events_cal-js.tpl | 1 | ||||
| -rwxr-xr-x | view/tpl/profile_advanced.tpl | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/view/tpl/events_cal-js.tpl b/view/tpl/events_cal-js.tpl index b3c7ff03b..bc8a3aa31 100755 --- a/view/tpl/events_cal-js.tpl +++ b/view/tpl/events_cal-js.tpl @@ -1,3 +1,4 @@ +{{$tabs}} <div class="generic-content-wrapper"> <div class="section-title-wrapper"> <div class="pull-right"> diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index a027a7c2e..780626cf9 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -12,6 +12,9 @@ <i class="icon-thumbs-up-alt" title="{{$profile.likethis}}"></i> </button> {{/if}} + {{if $edit}} + <a href="{{$edit.link}}" class="btn btn-primary btn-xs"><i class="icon-pencil"></i> {{$edit.label}}</a> + {{/if}} </div> <h2>{{$title}}</h2> <div class="clear"></div> |