diff options
| author | Ralph Amissah <ralph@amissah.com> | 2012-03-12 18:51:21 -0400 |
|---|---|---|
| committer | Ralph Amissah <ralph@amissah.com> | 2012-03-12 18:51:21 -0400 |
| commit | 1b7b1b2aec62cf261faa94ce2fbc05e9c28c83e2 (patch) | |
| tree | 52b39f3a8e625db1678c3353a2a88a271379d81f /lib/sisu/v3dv/html_promo.rb | |
| parent | debian/changelog (3.1.14-1) (diff) | |
| parent | v3dv: documentation sisu_commands, add sqlite3 discreet (diff) | |
Merge tag 'sisu_3.1.15' into debian/sid
Diffstat (limited to 'lib/sisu/v3dv/html_promo.rb')
| -rw-r--r-- | lib/sisu/v3dv/html_promo.rb | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lib/sisu/v3dv/html_promo.rb b/lib/sisu/v3dv/html_promo.rb index 7617b52c..f53211e9 100644 --- a/lib/sisu/v3dv/html_promo.rb +++ b/lib/sisu/v3dv/html_promo.rb @@ -67,22 +67,33 @@ module SiSU_HTML_Promo @ad=SiSU_Env::GetInit.instance.ads @vz=SiSU_Env::GetInit.instance.skin @flag=@env.widget.promo? + @make=SiSU_Env::ProcessingSettings.new(@md) end def div def major - @flag[:ad] ? '<div id="pane_major">' : '' + (@make.build.html_right_pane? \ + && @flag[:ad]) \ + ? '<div id="pane_major">' + : '' end def minor - @flag[:ad] ? '<div id="pane_minor">' : '' + (@make.build.html_right_pane? \ + && @flag[:ad]) \ + ? '<div id="pane_minor">' + : '' end def close - @flag[:ad] ? '</div>' : '' + (@make.build.html_right_pane? \ + && @flag[:ad]) \ + ? '</div>' + : '' end self end - def display #(type=nil,id=nil) + def display ads_array,promo_array=[],[] - if @flag[:ad] + if @make.build.html_right_pane? \ + && @flag[:ad] ads=if @md.promo && @md.promo.length > 0 #promo set in document promo_array=@md.promo elsif @flag[:sk] #promo set in associated skin |