diff options
| author | marijus <mario@mariovavti.com> | 2014-02-20 08:33:55 +0100 |
|---|---|---|
| committer | marijus <mario@mariovavti.com> | 2014-02-20 08:33:55 +0100 |
| commit | 5939da8b09c31b3065e81e5c6a2edd9e7b65317d (patch) | |
| tree | 793e2eb49387c4a371229cc70f18c2c3df95485c /view/tpl | |
| parent | 225ad00b0e7456e5816429b828f2df4f4f69eabc (diff) | |
| parent | c219451702b2e20c100c8b2a32f4dd1f42e82768 (diff) | |
| download | volse-hubzilla-5939da8b09c31b3065e81e5c6a2edd9e7b65317d.tar.gz volse-hubzilla-5939da8b09c31b3065e81e5c6a2edd9e7b65317d.tar.bz2 volse-hubzilla-5939da8b09c31b3065e81e5c6a2edd9e7b65317d.zip | |
Merge branch 'master' of https://github.com/friendica/red
Diffstat (limited to 'view/tpl')
| -rwxr-xr-x | view/tpl/chanview.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 19 |
2 files changed, 20 insertions, 1 deletions
diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl index 4df327bf9..a43ea1b5d 100755 --- a/view/tpl/chanview.tpl +++ b/view/tpl/chanview.tpl @@ -1,2 +1,2 @@ -<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" >☐</div> +<div id="chanview-iframe-border" class="fakelink" onclick="chanviewFull(); return true;" title="{{$full}}" ><i class="icon-fullscreen"></i></div> <iframe id="remote-channel" width="100%" src="{{$url}}" onload="resize_iframe()"></iframe> diff --git a/view/tpl/settings.tpl b/view/tpl/settings.tpl index f5f2206bc..49dff4822 100755 --- a/view/tpl/settings.tpl +++ b/view/tpl/settings.tpl @@ -127,4 +127,23 @@ <input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> </div> + +{{if $menus}} +<h3 class="settings-heading">{{$lbl_misc}}</h3> + +<div id="settings-menu-desc">{{$menu_desc}}</div> +<div class="settings-channel-menu-div"> +<select name="channel_menu" class="settings-channel-menu-sel"> +{{foreach $menus as $menu }} +<option value="{{$menu.name}}" {{$menu.selected}} >{{$menu.name}} </option> +{{/foreach}} +</select> +</div> +<div class="settings-submit-wrapper" > +<input type="submit" name="submit" class="settings-submit" value="{{$submit}}"{{if !$expert}} onclick="$('select').prop('disabled', false);"{{/if}} /> +</div> +<div id="settings-channel-menu-end"></div> +{{/if}} + + </div> |