aboutsummaryrefslogtreecommitdiffhomepage
path: root/lib/sisu/v6/se_info_env.rb
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sisu/v6/se_info_env.rb')
-rw-r--r--lib/sisu/v6/se_info_env.rb32
1 files changed, 17 insertions, 15 deletions
diff --git a/lib/sisu/v6/se_info_env.rb b/lib/sisu/v6/se_info_env.rb
index d00868b1..e8342783 100644
--- a/lib/sisu/v6/se_info_env.rb
+++ b/lib/sisu/v6/se_info_env.rb
@@ -60,6 +60,7 @@
@@current_document=Dir.pwd #nil #''
module SiSU_Info_Env
require_relative 'se_envcall' # se_envcall.rb
+ require_relative 'html_parts' # html_parts.rb
begin
require 'singleton'
require 'fileutils'
@@ -573,7 +574,7 @@ module SiSU_Info_Env
def widget #needs (md) #move
@rc=SiSU_Env::GetInit.new.sisu_yaml.rc
@ad=SiSU_Env::GetInit.new.ads
- @vz=SiSU_Viz::Defaults.new
+ @html_bits=SiSU_Proj_HTML::Bits.new
@flag={
ad: false,
md: false,
@@ -581,13 +582,14 @@ module SiSU_Info_Env
rc: false
}
def promo?
- @flag[:ad]=if @md.flag_promo && @ad[:flag_promo]
+ @flag[:ad]=if @md.flag_promo \
+ && @ad[:flag_promo]
@flag[:md]=true
true
- elsif defined? @vz.widget_promo \
- and not @vz.widget_promo.nil? \
- and @vz.widget_promo.is_a?(Array) \
- and @vz.widget_promo.length > 0
+ elsif defined? @html_bits.widget_promo \
+ and not @html_bits.widget_promo.nil? \
+ and @html_bits.widget_promo.is_a?(Array) \
+ and @html_bits.widget_promo.length > 0
@flag[:sk]=true
true
elsif defined? @rc['html']['promo'] \
@@ -610,8 +612,8 @@ module SiSU_Info_Env
and @rc['search'][type]['action'] =~/https?:\/\//
flag=if promo?[:ad]
false
- elsif defined? @vz.widget_search \
- and @vz.widget_search==true
+ elsif defined? @html_bits.widget_search \
+ and @html_bits.widget_search==true
true
elsif defined? @rc['search'][type]['flag'] \
and @rc['search'][type]['flag']==true
@@ -636,8 +638,8 @@ module SiSU_Info_Env
and @rc['search'][type]['db'] =~/\S+/
flag=if promo?[:ad]
false
- elsif defined? @vz.widget_search \
- and @vz.widget_search==true
+ elsif defined? @html_bits.widget_search \
+ and @html_bits.widget_search==true
true
elsif defined? @rc['search'][type]['flag'] \
and @rc['search'][type]['flag']==true
@@ -756,7 +758,7 @@ WOK
end
def widget_static
@rc=SiSU_Env::GetInit.new.sisu_yaml.rc
- @vz=SiSU_Viz::Defaults.new
+ @html_bits=SiSU_Proj_HTML::Bits.new
@flag={ ad: false, md: false, sk: false, rc: false }
def search?
flag=if defined? @rc['search'] \
@@ -765,8 +767,8 @@ WOK
and @rc['search']['sisu']['action'] =~/https?:\/\// \
and defined? @rc['search']['sisu']['db'] \
and @rc['search']['sisu']['db'] =~/\S+/
- flag=if defined? @vz.widget_search \
- and @vz.widget_search==true
+ flag=if defined? @html_bits.widget_search \
+ and @html_bits.widget_search==true
true
elsif defined? @rc['search']['sisu']['flag'] \
and @rc['search']['sisu']['flag']==true
@@ -787,8 +789,8 @@ WOK
and @rc['search']['sisu']['db'] =~/\S+/ \
and defined? @rc['search']['sisu']['db'] \
and @rc['search']['sisu']['db'] =~/\S+/
- flag=if defined? @vz.widget_search \
- and @vz.widget_search==true
+ flag=if defined? @html_bits.widget_search \
+ and @html_bits.widget_search==true
true
elsif defined? @rc['search']['sisu']['flag'] \
and @rc['search']['sisu']['flag']==true