diff options
| author | Aleksey Lim <alsroot@member.fsf.org> | 2010-11-22 17:19:23 (GMT) |
|---|---|---|
| committer | Aleksey Lim <alsroot@member.fsf.org> | 2010-11-22 17:19:23 (GMT) |
| commit | f7362a22420d5c07f8a8f3994b30aa9104e48b31 (patch) | |
| tree | 022ff578fe0ff0cb3ebe10ed291ccc617e515937 | |
| parent | 15b706431aca0530f5eeaa955b90cfd676508d50 (diff) | |
Do not overlap header
| -rw-r--r-- | bin/optionsgen.py | 2 | ||||
| -rw-r--r-- | config.py.example | 1 | ||||
| -rw-r--r-- | js/qwebircinterface.js | 2 | ||||
| -rw-r--r-- | js/ui/frontends/qui.js | 4 |
4 files changed, 5 insertions, 4 deletions
diff --git a/bin/optionsgen.py b/bin/optionsgen.py index eee0a6d..ff656db 100644 --- a/bin/optionsgen.py +++ b/bin/optionsgen.py @@ -2,5 +2,5 @@ import config import qwebirc.util.qjson as json def get_options(): - options = dict(networkName=config.NETWORK_NAME, networkServices=[config.AUTH_SERVICE], loginRegex=config. AUTH_OK_REGEX, appTitle=config.APP_TITLE, baseURL=config.BASE_URL, staticBaseURL=config.STATIC_BASE_URL, dynamicBaseURL=config.DYNAMIC_BASE_URL, channels=config.CHANNELS, languages=config.LANGUAGES, lingva_bot=config.LINGVA_BOT) + options = dict(networkName=config.NETWORK_NAME, networkServices=[config.AUTH_SERVICE], loginRegex=config. AUTH_OK_REGEX, appTitle=config.APP_TITLE, baseURL=config.BASE_URL, staticBaseURL=config.STATIC_BASE_URL, dynamicBaseURL=config.DYNAMIC_BASE_URL, channels=config.CHANNELS, languages=config.LANGUAGES, lingva_bot=config.LINGVA_BOT, header_height=config.HEADER_HEIGHT) return json.dumps(options) diff --git a/config.py.example b/config.py.example index 92ad383..4334220 100644 --- a/config.py.example +++ b/config.py.example @@ -265,3 +265,4 @@ import dummyauthgate as AUTHGATEPROVIDER #CHANNELS = [('en', '#sugar), ...] #LANGUAGES = [('en', 'English'), ...] #HEADER_FILE = join(dirname(__file__), 'header.html') +#HEADER_HEIGHT = 26 diff --git a/js/qwebircinterface.js b/js/qwebircinterface.js index ec77587..427f31b 100644 --- a/js/qwebircinterface.js +++ b/js/qwebircinterface.js @@ -24,7 +24,7 @@ qwebirc.ui.Interface = new Class({ staticBaseURL: "/" }, initialize: function(element, ui, options) { - qwebirc.global = {dynamicBaseURL: options.dynamicBaseURL, staticBaseURL: options.staticBaseURL, channels: options.channels, languages: options.languages, lingva_bot: options.lingva_bot, irc: null, initialLanguage: null}; /* HACK */ + qwebirc.global = {dynamicBaseURL: options.dynamicBaseURL, staticBaseURL: options.staticBaseURL, channels: options.channels, languages: options.languages, lingva_bot: options.lingva_bot, irc: null, initialLanguage: null, header_height: options.header_height}; /* HACK */ this.setOptions(options); diff --git a/js/ui/frontends/qui.js b/js/ui/frontends/qui.js index b1d3363..c7af797 100644 --- a/js/ui/frontends/qui.js +++ b/js/ui/frontends/qui.js @@ -363,7 +363,7 @@ qwebirc.ui.QUI.JSUI = new Class({ var bottomsize = bottom.getSize(); var docsize = this.sizer.getSize(); - var mheight = (docsize.y - topsize.y - bottomsize.y - topicsize.y); + var mheight = (docsize.y - topsize.y - bottomsize.y - topicsize.y) - qwebirc.global.header_height; var mwidth = (docsize.x - rightsize.x); topic.setStyle("top", topsize.y); @@ -379,7 +379,7 @@ qwebirc.ui.QUI.JSUI = new Class({ right.setStyle("top", (topsize.y + topicsize.y)); right.setStyle("left", mwidth); - bottom.setStyle("top", (docsize.y - bottomsize.y)); + bottom.setStyle("top", (docsize.y - bottomsize.y - qwebirc.global.header_height)); this.fireEvent("reflow"); }, showChannel: function(state) { |