Merge pull request #81 from cmrn/collapsable-sidebar

Collapsable sidebar (patch by cmrn)
This commit is contained in:
Stefan Breunig
2013-02-10 15:20:15 -08:00
4 changed files with 26 additions and 1 deletions

View File

@ -75,6 +75,7 @@ Contributors
------------ ------------
[Bananeweizen](https://github.com/Bananeweizen), [Bananeweizen](https://github.com/Bananeweizen),
[cmrn](https://github.com/cmrn),
[epf](https://github.com/epf), [epf](https://github.com/epf),
[integ3r](https://github.com/integ3r), [integ3r](https://github.com/integ3r),
[JasonMillward](https://github.com/JasonMillward), [JasonMillward](https://github.com/JasonMillward),

View File

@ -35,6 +35,7 @@ window.setupStyles = function() {
'#chat { height: '+CHAT_SHRINKED+'px; } ', '#chat { height: '+CHAT_SHRINKED+'px; } ',
'#updatestatus { width:'+(SIDEBAR_WIDTH-2*4)+'px; } ', '#updatestatus { width:'+(SIDEBAR_WIDTH-2*4)+'px; } ',
'#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 2 /*border*/)+'px; } ', '#sidebar { width:'+(SIDEBAR_WIDTH + HIDDEN_SCROLLBAR_ASSUMED_WIDTH + 2 /*border*/)+'px; } ',
'#sidebartoggle { right:'+SIDEBAR_WIDTH+'px; } ',
'#scrollwrapper { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ', '#scrollwrapper { width:'+(SIDEBAR_WIDTH + 2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH)+'px; right:-'+(2*HIDDEN_SCROLLBAR_ASSUMED_WIDTH-2)+'px } ',
'#sidebar input, h2, #updatestatus { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ', '#sidebar input, h2, #updatestatus { width:'+(SIDEBAR_WIDTH - 2*4)+'px !important } ',
'#sidebar > *, #gamestat span, .imgpreview img { width:'+SIDEBAR_WIDTH+'px; }'].join("\n") '#sidebar > *, #gamestat span, .imgpreview img { width:'+SIDEBAR_WIDTH+'px; }'].join("\n")
@ -169,6 +170,25 @@ window.setupPlayerStat = function() {
); );
} }
window.setupSidebarToggle = function() {
$('#sidebartoggle').on('click', function() {
var toggle = $('#sidebartoggle');
var sidebar = $('#sidebar');
if(sidebar.is(':visible')) {
sidebar.hide();
$('#map').css('margin-right','0');
toggle.html('◢<br>◥');
toggle.css('right', '0');
} else {
sidebar.show();
$('#map').css('margin-right', SIDEBAR_WIDTH+2+'px');
toggle.html('◣<br>◤');
toggle.css('right', SIDEBAR_WIDTH+'px');
}
window.map.invalidateSize(false);
});
}
// BOOTING /////////////////////////////////////////////////////////// // BOOTING ///////////////////////////////////////////////////////////
@ -179,6 +199,7 @@ function boot() {
window.setupGeosearch(); window.setupGeosearch();
window.setupRedeem(); window.setupRedeem();
window.setupLargeImagePreview(); window.setupLargeImagePreview();
window.setupSidebarToggle();
window.updateGameScore(); window.updateGameScore();
window.setupPlayerStat(); window.setupPlayerStat();
window.chat.setup(); window.chat.setup();

View File

@ -71,6 +71,7 @@ document.getElementsByTagName('body')[0].innerHTML = ''
+ ' <div id="chatautomated"></div>' + ' <div id="chatautomated"></div>'
+ '</div>' + '</div>'
+ '<form id="chatinput" style="display:none"><time></time><span>tell faction:</span><input type="text"/></form>' + '<form id="chatinput" style="display:none"><time></time><span>tell faction:</span><input type="text"/></form>'
+ '<a id="sidebartoggle">◣<br>◤</a>'
+ '<div id="scrollwrapper">' // enable scrolling for small screens + '<div id="scrollwrapper">' // enable scrolling for small screens
+ ' <div id="sidebar" style="display: none">' + ' <div id="sidebar" style="display: none">'
+ ' <div id="playerstat">t</div>' + ' <div id="playerstat">t</div>'

View File

@ -37,7 +37,9 @@ body {
#sidebartoggle { #sidebartoggle {
display: block; display: block;
padding: 5px; padding: 10px 5px;
margin-top: -31px;
line-height: 10px;
position: absolute; position: absolute;
top: 50%; top: 50%;
z-index: 3000; z-index: 3000;