From 929051857c40298ec535a56456daf6916164f0c3 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Tue, 31 Oct 2017 11:26:50 +0100 Subject: [PATCH] Show welcome on left --- doc/resources/gcc/oddb.css | 8 ++++++++ src/view/personal.rb | 6 ++++-- src/view/welcomehead.rb | 15 +++++++-------- 3 files changed, 19 insertions(+), 10 deletions(-) diff --git a/doc/resources/gcc/oddb.css b/doc/resources/gcc/oddb.css index ac0e60a..1a2f849 100644 --- a/doc/resources/gcc/oddb.css +++ b/doc/resources/gcc/oddb.css @@ -166,6 +166,7 @@ a.atcchooser4, a.atclink4 { a.atcchooser5, a.atclink5 { margin-left : 86px; } + a.welcome { padding : 0px; padding-right : 0px; @@ -434,12 +435,19 @@ td.result-found { padding-top : 4px; font-weight : bold; } +td.home_welcome { + width : 33%; +} +td.personal { + width : 33%; +} td.pubprice { font-weight : bold; padding-right : 10px; text-align : right; } td.logo { + width : 33%; vertical-align : top; position : relative; padding : 4px; diff --git a/src/view/personal.rb b/src/view/personal.rb index 0ef2259..790bb78 100644 --- a/src/view/personal.rb +++ b/src/view/personal.rb @@ -37,9 +37,11 @@ module ODDB fullname = user.name end div.value = @lookandfeel.lookup(:welcome, fullname) - parts.push div + else + div.value = ' ' end - parts + parts.push div + return (parts.size == 1 ? div : parts) end end end diff --git a/src/view/welcomehead.rb b/src/view/welcomehead.rb index bb2fc91..33907b3 100644 --- a/src/view/welcomehead.rb +++ b/src/view/welcomehead.rb @@ -18,15 +18,14 @@ module ODDB LOGO_PATH = File.expand_path('../../../doc/resources/logos', File.dirname(__FILE__)) CSS_CLASS = 'composite' CSS_MAP = { - [0,0] => 'logo', - [1,0] => 'welcome', + [0,0] => 'personal', # x, y, col + [1,0] => 'logo', + [2,0] => 'home_welcome', } - COMPONENTS = { - [0,0] => View::Logo, - [1,0,0] => :sponsor, - [1,0,1] => "break", - [1,0,2] => :home_welcome, - [1,0,3] => :welcome, + COMPONENTS = { + [0,0] => :welcome, # Willkommen logged-in user aus personal + [1,0] => View::Logo, + [2,0] => :home_welcome, # Willkommen bei } def banner(model, session=@session) if(@lookandfeel.enabled?(:epatents)) #, false)) -- 2.10.2