diff options
| author | friendica <info@friendica.com> | 2014-02-19 20:19:56 -0800 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2014-02-19 20:19:56 -0800 |
| commit | a29b71547a1ceb12d77617d9b06ba074c1793755 (patch) | |
| tree | 715f54410da299bee11b4c9bad1f375292e8f4ed /view | |
| parent | 40dbd34405d493bbdc163ea2a49e312a6df06fbb (diff) | |
| download | volse-hubzilla-a29b71547a1ceb12d77617d9b06ba074c1793755.tar.gz volse-hubzilla-a29b71547a1ceb12d77617d9b06ba074c1793755.tar.bz2 volse-hubzilla-a29b71547a1ceb12d77617d9b06ba074c1793755.zip | |
use a "fullscreen" icon for chanview full screen mode; add channel_menu selection and setting to the settings page.
Diffstat (limited to 'view')
| -rw-r--r-- | view/css/mod_settings.css | 14 | ||||
| -rw-r--r-- | view/js/icon_translate.js | 1 | ||||
| -rwxr-xr-x | view/tpl/chanview.tpl | 2 | ||||
| -rwxr-xr-x | view/tpl/settings.tpl | 19 |
4 files changed, 35 insertions, 1 deletions
diff --git a/view/css/mod_settings.css b/view/css/mod_settings.css index 0d3dd36fe..5b0105204 100644 --- a/view/css/mod_settings.css +++ b/view/css/mod_settings.css @@ -35,3 +35,17 @@ margin-bottom: 15px; } +#settings-menu-desc { + font-weight: bold; + float: left; + width: 350px; +} + +#settings-channel-menu-div select { + float: left; +} + +#settings-channel-menu-end { + clear: both; + margin-bottom: 15px; +}
\ No newline at end of file diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js index 737164cb8..45deef05b 100644 --- a/view/js/icon_translate.js +++ b/view/js/icon_translate.js @@ -52,4 +52,5 @@ $(document).ready(function() { $('.icon-circle-blank').addClass(''); $('.icon-circle').addClass(''); $('.icon-bookmark').addClass(''); + $('.icon-fullscreen').addClass(''); });
\ No newline at end of file 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> |