diff options
| author | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
|---|---|---|
| committer | Andrew Manning <tamanning@zoho.com> | 2018-03-27 21:11:34 -0400 |
| commit | 1dc795722a8e748ebb98e8fab778cd4686a0654f (patch) | |
| tree | 4f4a4e8dea10090106c4d54a02c6860332cd9df4 /view/tpl | |
| parent | dcd658f12ea60945678717e3c310e94ece7b1f96 (diff) | |
| parent | c98776923a3aed4a0a17ca1412787de3b718eba9 (diff) | |
| download | volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.gz volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.tar.bz2 volse-hubzilla-1dc795722a8e748ebb98e8fab778cd4686a0654f.zip | |
Merge branch 'dev' into oauth2
Diffstat (limited to 'view/tpl')
| -rw-r--r-- | view/tpl/cloud_directory.tpl | 6 | ||||
| -rwxr-xr-x | view/tpl/connections.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/profile_edit.tpl | 8 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 4 |
4 files changed, 13 insertions, 7 deletions
diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index ad3caff88..1f0addc95 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -1,5 +1,5 @@ <div id="cloud-drag-area" class="section-content-wrapper-np"> - {{if $tiles}} +{{if $tiles}} <table id="cloud-index"> <tr id="new-upload-progress-bar-1"></tr> {{* this is needed to append the upload files in the right order *}} </table> @@ -36,7 +36,7 @@ </div> {{/foreach}} <div class="clear"></div> - {{else}} +{{else}} <table id="cloud-index"> <tr> <th width="1%"></th> @@ -80,5 +80,5 @@ {{/foreach}} </table> - {{/if}} +{{/if}} </div> diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index 32973353e..0bf88b818 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -9,7 +9,7 @@ </button> <div class="dropdown-menu dropdown-menu-right"> {{foreach $tabs as $menu}} - <a class="dropdown-item" href="{{$menu.url}}">{{$menu.label}}</a> + <a class="dropdown-item {{$menu.sel}}" href="{{$menu.url}}">{{$menu.label}}</a> {{/foreach}} </div> </div> diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 95183fdf4..c967fa02c 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -4,7 +4,7 @@ <button type="button" class="btn btn-outline-secondary btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"> <i class="fa fa-cog"></i> {{$tools_label}} </button> - <div class="dropdown-menu"> + <div class="dropdown-menu dropdown-menu-right"> <a class="dropdown-item" href="profile_photo" id="profile-photo_upload-link" title="{{$profpic}}"><i class="fa fa-fw fa-user"></i> {{$profpic}}</a> {{if $is_default}} <a class="dropdown-item" href="cover_photo" id="cover-photo_upload-link" title="{{$coverpic}}"><i class="fa fa-fw fa-picture-o"></i> {{$coverpic}}</a> @@ -15,7 +15,7 @@ <a class="dropdown-item" href="thing" id="profile-edit-thing-link" title="{{$addthing}}"><i class="fa fa-fw fa-plus-circle"></i> {{$addthing}}</a> <div class="dropdown-divider"></div> <a class="dropdown-item" href="profile/{{$profile_id}}/view" id="profile-edit-view-link" title="{{$viewprof}}">{{$viewprof}}</a> - {{if $profile_clone_link}} + {{if $multi_profiles}} <div class="dropdown-divider"></div> <a class="dropdown-item" href="{{$profile_clone_link}}" id="profile-edit-clone-link" title="{{$cr_prof}}">{{$cl_prof}}</a> {{/if}} @@ -56,7 +56,11 @@ </div> <div id="personal-collapse" class="panel-collapse collapse show" data-parent="#profile-edit-wrapper" role="tabpanel" aria-labelledby="personal"> <div class="section-content-tools-wrapper"> + {{if $multi_profiles}} {{include file="field_input.tpl" field=$profile_name}} + {{else}} + <input type="hidden" name="{{$profile_name.0}}" value="{{$profile_name.2}}"> + {{/if}} {{include file="field_input.tpl" field=$name}} diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index 130dc6918..0055fa265 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -138,7 +138,9 @@ {{include file="field_intcheckbox.tpl" field=$vnotify7}} {{include file="field_intcheckbox.tpl" field=$vnotify8}} {{include file="field_intcheckbox.tpl" field=$vnotify9}} - {{include file="field_intcheckbox.tpl" field=$vnotify11}} + {{if $vnotify11}} + {{include file="field_intcheckbox.tpl" field=$vnotify11}} + {{/if}} {{include file="field_intcheckbox.tpl" field=$vnotify12}} {{if $vnotify13}} {{include file="field_intcheckbox.tpl" field=$vnotify13}} |