diff --git a/lib/Dojo/Controller/Home.pm b/lib/Dojo/Controller/Home.pm index bcbd89b..cbc7118 100755 --- a/lib/Dojo/Controller/Home.pm +++ b/lib/Dojo/Controller/Home.pm @@ -4,21 +4,9 @@ use Mojo::Template; use Dojo::Support qw{ log dmph merge_hash load_module get_names}; sub tst{ my $c=shift; - # $c->stash( merge_hash( - # (load_module("home/tst"))[0], - # (load_module("home/contact"))[0] - #)); - # $c->stash(apend => ["home/contact"]); - #$c->stash( (load_module("home/tst"))[0] ); - #$c->stash(layout=> "defaultContact"); - #my $x = [get_names("public/home/cal/img/")]; - #log("@$x"); - #$c->stash( ilist => $x); - #$c->dbv->tst; $c->render(text=> $c->config->{radio}{'channel'}); } - # User ======================================================================== sub home_ { my $c = shift; @@ -27,32 +15,32 @@ sub tst{ sub home { my $c = shift; - $c->stash((load_module("home/home"))[0]); $c->stash( $c->dbv->mod) ; + $c->stash(layout=>'default'); } sub pang { my $c = shift; - my ($v,$w)=load_module("home/pang"); - $c->stash($v); - $c->stash( $c->dbv->md_to_hash(@{$w->{'md'}}) ); + my $h=$c->dbv->pang_md; + map { $c->stash( $_ => $h->{$_}) } keys %$h; + $c->stash(layout=>'default'); + } sub cal { my $c = shift; - $c->stash((load_module("home/cal"))[0]); my $data=$c->dbv->calendar_events; my $block=$c->dbv->calendar_monthblock; - my %hdata; - map{ push @{ $hdata{$_->{bid}} },$_; }(@$data); - $c->stash( r=>\%hdata, b=>$block); + my %h; + map{ push @{ $h{$_->{bid}} },$_; }(@$data); + $c->stash( r=>\%h, b=>$block); + $c->stash(layout=>'default'); } sub event{ my $c = shift; - $c->stash((load_module("home/event"))[0]); - $c->stash(layout=> "defaultContact"); $c->stash($c->dbv->event($c->param("id"))); + $c->stash(layout=> "defaultContact"); } sub contact{ @@ -67,7 +55,7 @@ sub tst{ ); $c->redirect_to('contact2'); }else{ - $c->stash((load_module("home/contact"))[0]); + $c->stash(layout=>'default'); } } @@ -75,22 +63,17 @@ sub tst{ my $c = shift; $c->redirect_to("home") unless $c->flash('mname'); $c->stash( mname=>$c->flash('mname')); - $c->stash((load_module("home/contact2"))[0]); + $c->stash(layout=>'default'); } sub store{ my $c = shift; - $c->stash((load_module("home/store"))[0]); $c->stash( r=>$c->dbv->store); $c->stash(layout=> "defaultContact"); } sub tv{ my $c = shift; - $c->stash( merge_hash( - (load_module("home/tv"))[0], - (load_module("home/tv/trans"))[0] - )); $c->stash( videos=>$c->dbv->tv_videos, table=>$c->dbv->tv_series); $c->stash(layout=> "defaultContact"); } diff --git a/public/home/cal/q1Block.q b/lib/Dojo/Model/Data/cal/q1Block.q similarity index 100% rename from public/home/cal/q1Block.q rename to lib/Dojo/Model/Data/cal/q1Block.q diff --git a/public/home/cal/q3Event.q b/lib/Dojo/Model/Data/cal/q3Event.q similarity index 100% rename from public/home/cal/q3Event.q rename to lib/Dojo/Model/Data/cal/q3Event.q diff --git a/public/home/event/qEvent.q b/lib/Dojo/Model/Data/event/qEvent.q similarity index 100% rename from public/home/event/qEvent.q rename to lib/Dojo/Model/Data/event/qEvent.q diff --git a/public/home/pang/benjamin.md b/lib/Dojo/Model/Data/pang/benjamin.md similarity index 100% rename from public/home/pang/benjamin.md rename to lib/Dojo/Model/Data/pang/benjamin.md diff --git a/public/home/pang/helen.md b/lib/Dojo/Model/Data/pang/helen.md similarity index 100% rename from public/home/pang/helen.md rename to lib/Dojo/Model/Data/pang/helen.md diff --git a/public/home/pang/pang.md b/lib/Dojo/Model/Data/pang/pang.md similarity index 100% rename from public/home/pang/pang.md rename to lib/Dojo/Model/Data/pang/pang.md diff --git a/public/home/store/qStore.q b/lib/Dojo/Model/Data/store/qStore.q similarity index 100% rename from public/home/store/qStore.q rename to lib/Dojo/Model/Data/store/qStore.q diff --git a/public/home/tv/qSeries.q b/lib/Dojo/Model/Data/tv/qSeries.q similarity index 100% rename from public/home/tv/qSeries.q rename to lib/Dojo/Model/Data/tv/qSeries.q diff --git a/public/home/tv/qTable.q b/lib/Dojo/Model/Data/tv/qTable.q similarity index 100% rename from public/home/tv/qTable.q rename to lib/Dojo/Model/Data/tv/qTable.q diff --git a/lib/Dojo/Model/Vuelo.pm b/lib/Dojo/Model/Vuelo.pm index 50f62df..c4c303b 100755 --- a/lib/Dojo/Model/Vuelo.pm +++ b/lib/Dojo/Model/Vuelo.pm @@ -12,40 +12,44 @@ use DBI; use Dojo::Conf; sub new { bless {}, shift }; +my $data_path = path('lib/Dojo/Model/Data')->make_path; #just for fun # Read vdg user =============================================================== - sub mod{ - my $q="select nombre,contenido from casa;"; - my %h=map{ $_->{nombre} => $_->{contenido}}@{_read($q)}; - return %h; - } +# mensaje del día:mod,rmod,yt,fb,sc +sub mod{ + my $q="select nombre,contenido from casa;"; + my %h=map{ $_->{nombre} => $_->{contenido}}@{_read($q)}; + return %h; +} - sub md_to_hash{ - my ($self,@filelist)=@_; - return {map { basename($_,".md") => load_md("public/$_")}@filelist}; - } +sub pang_md{ + my $c=shift; + my %h = map {$_=> markdown(decode_utf8($data_path->child('pang/'.$_.'.md')->slurp))} + ("pang","helen","benjamin"); + return \%h; +} - sub calendar_monthblock { - return _read (path("public/home/cal/q1Block.q")->slurp); - } - sub calendar_events { - return _read (path("public/home/cal/q3Event.q")->slurp); - } +sub calendar_monthblock { + return _read ($data_path->child("cal/q1Block.q")->slurp); +} +sub calendar_events { + return _read ($data_path->child("cal/q3Event.q")->slurp); +} - sub event{ - my ($self,$id)=@_; - return shift @{ _read (path("public/home/event/qEvent.q")->slurp,$id)}; - } - sub store{ - return _read (path("public/home/store/qStore.q")->slurp); - } - sub tv_videos{ - return _read (path("public/home/tv/qSeries.q")->slurp); #group,name - } - sub tv_series{ - return _read (path("public/home/tv/qTable.q")->slurp); #name,order,group - } +sub event{ + my ($c,$id)=@_; + return shift @{ _read ($data_path->child("event/qEvent.q")->slurp,$id)}; +} +sub store{ + return _read ($data_path->child("/store/qStore.q")->slurp); +} +sub tv_videos{ + return _read ($data_path->child("/tv/qSeries.q")->slurp); #group,name +} +sub tv_series{ + return _read ($data_path->child("/tv/qTable.q")->slurp); #name,order,group +} sub podcast_txt{ # return "Hemos desarrollado con mucho cariño ejercicios gratuitos y descargables que pueden ser practicados por cualquier persona aún antes de asistir a uno de los cursos de instrucción."; return decode_utf8(path("public/home/podcast/text.txt")->slurp); @@ -90,13 +94,13 @@ sub new { bless {}, shift }; sub eimgList{ return [get_names("public/home/cal/img/")] } #============================================================================== # Write vdg user ============================================================== - sub contact{ - my $c=shift; - my $q="insert into entrada (nombre,correo,pagina,texto,fecha) values(?,?,?,?,now() )" ; - my @a=@_; - #simple method to ignore spam - return _writemsg($q,@a) unless $a[3]=~m/http|website|\"one",tag=>"notag"}); - - -my $to = 'benjamuga@gmail.com'; -my $from = 'mensajes@vuelodegrulla.com'; -my $subject = "Mensaje de $var{'mname'}"; -my $message = "Enviado por: -

$var{'mname'}

-

correo:
$var{'mail'}

-

$var{'msg'}

- "; - -my $msg = MIME::Lite->new( - From => $from, - To => $to, - Subject => $subject, - Data => $message - ); - -$msg->attr("content-type" => "text/html"); -$msg->send; - -print encode_json( \@arr ) ."\n"; - -1 -__END__ diff --git a/public/home/contact/msg/qUpdate.q b/public/home/contact/msg/qUpdate.q deleted file mode 100755 index e1e3a4c..0000000 --- a/public/home/contact/msg/qUpdate.q +++ /dev/null @@ -1,14 +0,0 @@ - - /* c#host localhost*/ - /* c#database #dbmsg */ - /* c#user #dbmsg_w */ - /* c#password #dbmsg_wp */ - /* c#write write*/ - - - - insert into entrada - (nombre,correo,pagina,texto,fecha) - values - ( q#mname , q#mail , q#wp , q#msg ,now() ); - diff --git a/public/home/contact2/cssContact2.css b/public/home/contact2/contact2.css similarity index 100% rename from public/home/contact2/cssContact2.css rename to public/home/contact2/contact2.css diff --git a/public/home/event/cssEvent.css b/public/home/event/event.css similarity index 100% rename from public/home/event/cssEvent.css rename to public/home/event/event.css diff --git a/public/home/home/cssAnimation.css b/public/home/home/animation.css similarity index 100% rename from public/home/home/cssAnimation.css rename to public/home/home/animation.css diff --git a/public/home/home/d3Tras.js b/public/home/home/d3_tras.js similarity index 100% rename from public/home/home/d3Tras.js rename to public/home/home/d3_tras.js diff --git a/public/home/home/jsFb.js b/public/home/home/fb.js similarity index 100% rename from public/home/home/jsFb.js rename to public/home/home/fb.js diff --git a/public/home/home/cssGrid.css b/public/home/home/grid.css similarity index 100% rename from public/home/home/cssGrid.css rename to public/home/home/grid.css diff --git a/public/home/home/cssHead.css b/public/home/home/head.css similarity index 100% rename from public/home/home/cssHead.css rename to public/home/home/head.css diff --git a/public/home/home/cssOsc.css b/public/home/home/osc.css similarity index 100% rename from public/home/home/cssOsc.css rename to public/home/home/osc.css diff --git a/public/home/home/qUser.q b/public/home/home/qUser.q deleted file mode 100755 index 88f2293..0000000 --- a/public/home/home/qUser.q +++ /dev/null @@ -1,13 +0,0 @@ - - - /* c#host localhost*/ - /* c#database #dbdata */ - /* c#user #dbdata_user */ - /* c#password #dbdata_pass */ - - - -select - nombre as "tag", - contenido as "uContent" - from casa; diff --git a/public/home/home/cssTrans.css b/public/home/home/trans.css similarity index 100% rename from public/home/home/cssTrans.css rename to public/home/home/trans.css diff --git a/public/home/pang/img/ben.png b/public/home/pang/ben.png similarity index 100% rename from public/home/pang/img/ben.png rename to public/home/pang/ben.png diff --git a/public/home/pang/grulla_21.jpg b/public/home/pang/bkg_grulla_21.jpg similarity index 100% rename from public/home/pang/grulla_21.jpg rename to public/home/pang/bkg_grulla_21.jpg diff --git a/public/home/pang/img/helen.png b/public/home/pang/helen.png similarity index 100% rename from public/home/pang/img/helen.png rename to public/home/pang/helen.png diff --git a/public/home/pang/htmlPang.html b/public/home/pang/htmlPang.html deleted file mode 100755 index 1a2d455..0000000 --- a/public/home/pang/htmlPang.html +++ /dev/null @@ -1,31 +0,0 @@ -
- -
-

Nuestro querido maestro Pang He Ming

-
-
-
-
- -
-
- -
-

Los maestros Zhang Qing (Helen) y  Qiu Fu Chun (Karl).

-
-
-
-
- -
-
- -
-

Instructor Benjamín Munñóz

-
-
-
-
- -
-
diff --git a/public/home/pang/img/maestro.png b/public/home/pang/maestro.png similarity index 100% rename from public/home/pang/img/maestro.png rename to public/home/pang/maestro.png diff --git a/public/home/pang/cssPang.css b/public/home/pang/pang.css similarity index 85% rename from public/home/pang/cssPang.css rename to public/home/pang/pang.css index 2ac0bb6..3bd438f 100755 --- a/public/home/pang/cssPang.css +++ b/public/home/pang/pang.css @@ -2,7 +2,7 @@ body{ background-repeat: no-repeat; background-attachment: fixed; background-size:cover; - background-image:url("grulla_21.jpg"); + background-image:url("bkg_grulla_21.jpg"); background-position: right top; } @@ -40,9 +40,9 @@ article.imageHead{ margin:20px; min-height:300px } -article#apang{ background-image:url("img/maestro.png");} -article#ahel{ background-image:url("img/helen.png");} -article#aben{ background-image:url("img/ben.png");} +article#apang{ background-image:url("maestro.png");} +article#ahel{ background-image:url("helen.png");} +article#aben{ background-image:url("ben.png");} /* text column -------------------*/ article.text{ diff --git a/public/home/store/img/libro.jpg b/public/home/store/img/libro.jpg old mode 100755 new mode 100644 index bdfb4d7..5266c74 Binary files a/public/home/store/img/libro.jpg and b/public/home/store/img/libro.jpg differ diff --git a/public/home/store/img/libro_old.jpg b/public/home/store/img/libro_old.jpg new file mode 100755 index 0000000..bdfb4d7 Binary files /dev/null and b/public/home/store/img/libro_old.jpg differ diff --git a/public/home/store/cssShop.css b/public/home/store/shop.css similarity index 100% rename from public/home/store/cssShop.css rename to public/home/store/shop.css diff --git a/public/home/tv/trans/d3Tras.js b/public/home/tv/d3_tras.js similarity index 100% rename from public/home/tv/trans/d3Tras.js rename to public/home/tv/d3_tras.js diff --git a/public/home/tv/d3Tune.js b/public/home/tv/d3_tune.js similarity index 100% rename from public/home/tv/d3Tune.js rename to public/home/tv/d3_tune.js diff --git a/public/home/tv/cssHead.css b/public/home/tv/head.css similarity index 100% rename from public/home/tv/cssHead.css rename to public/home/tv/head.css diff --git a/public/home/tv/trans/cssTrans.css b/public/home/tv/trans.css similarity index 100% rename from public/home/tv/trans/cssTrans.css rename to public/home/tv/trans.css diff --git a/public/home/tv/cssTv.css b/public/home/tv/tv.css similarity index 100% rename from public/home/tv/cssTv.css rename to public/home/tv/tv.css diff --git a/public/home/tv/trans/vdg.svg b/public/home/tv/vdg.svg similarity index 100% rename from public/home/tv/trans/vdg.svg rename to public/home/tv/vdg.svg diff --git a/templates/home/cal.html.ep b/templates/home/cal.html.ep index 9895d18..a919d56 100755 --- a/templates/home/cal.html.ep +++ b/templates/home/cal.html.ep @@ -1,17 +1,15 @@ +% stash css=>["home/cal/cal.css/"];

Próximos eventos

-
- - % foreach (@$b) { -
- -

- <%= $_->{text} %> -

-
-
+ % foreach (@$b) { +
+

+ <%= $_->{text} %> +

+
+
% foreach my $d( @{ $r->{$_->{id}} } ) { -
+

<%= $d->{ciudad} %>

@@ -23,12 +21,10 @@
...
-
-
- %} - %} + + %} }
diff --git a/templates/home/contact.html.ep b/templates/home/contact.html.ep index 70e38a7..1ec1b80 100755 --- a/templates/home/contact.html.ep +++ b/templates/home/contact.html.ep @@ -1,3 +1,4 @@ +% stash css=>["/home/contact/contact1.css"];
diff --git a/templates/home/contact2.html.ep b/templates/home/contact2.html.ep index 5da81f2..835d33f 100755 --- a/templates/home/contact2.html.ep +++ b/templates/home/contact2.html.ep @@ -1,3 +1,4 @@ +% stash css=>["/home/contact2/contact2.css"];
diff --git a/templates/home/event.html.ep b/templates/home/event.html.ep index 380323d..d115977 100755 --- a/templates/home/event.html.ep +++ b/templates/home/event.html.ep @@ -1,3 +1,4 @@ +% stash css=> ["/home/event/event.css"];
diff --git a/templates/home/home.html.ep b/templates/home/home.html.ep index bbdd4ef..6db3c74 100755 --- a/templates/home/home.html.ep +++ b/templates/home/home.html.ep @@ -1,3 +1,5 @@ +%stash css=>[ "/home/home/animation.css", "/home/home/grid.css", "/home/home/head.css", "/home/home/osc.css", "/home/home/trans.css" ]; +%stash js=>["/home/home/d3_tras.js","/home/home/fb.js"];
@@ -36,14 +38,11 @@ -
-
-
<%== $sc %> diff --git a/templates/home/pang.html.ep b/templates/home/pang.html.ep index 1c505a4..088f5cc 100755 --- a/templates/home/pang.html.ep +++ b/templates/home/pang.html.ep @@ -1,3 +1,5 @@ +% stash css => ["home/pang/pang.css"]; +% stash js => ["home/pang/d3Tras.js"];
diff --git a/templates/home/store.html.ep b/templates/home/store.html.ep index d520481..839e7a5 100755 --- a/templates/home/store.html.ep +++ b/templates/home/store.html.ep @@ -1,3 +1,4 @@ +% stash css=>["/home/store/shop.css"];

TIENDA VIRTUAL

% for (@$r){ diff --git a/templates/home/tv.html.ep b/templates/home/tv.html.ep index b34ce01..343afd1 100755 --- a/templates/home/tv.html.ep +++ b/templates/home/tv.html.ep @@ -1,11 +1,9 @@ +% stash css=>["/home/tv/head.css","/home/tv/trans.css","/home/tv/tv.css"]; +% stash js=>["/home/tv/d3_tras.js","/home/tv/d3_tune.js"];
-
-
@@ -14,8 +12,6 @@

+++

- -