From 515458eb62bf2249e819992e6dca96e9ce4f728f Mon Sep 17 00:00:00 2001 From: Pasqualino Ferrentino Date: Thu, 18 Oct 2007 10:52:12 +0200 Subject: [PATCH] reorganized the help section, now the who_we_are is more hidden --- web-site/breadcrumbs/breadcrumbs.yml | 3 + .../breadcrumbs/lib/breadcrumbs/Controller/Help.pm | 23 ++++---- .../breadcrumbs/lib/breadcrumbs/Controller/Root.pm | 64 ++-------------------- .../lib/breadcrumbs/Controller/SimpleHelp.pm | 11 ++++ .../lib/breadcrumbs/Controller/starthere.pm | 6 +- web-site/breadcrumbs/root/src/bc_hello.tt | 4 +- .../breadcrumbs/root/src/map_of_documentation.tt | 7 +++ 7 files changed, 41 insertions(+), 77 deletions(-) create mode 100644 web-site/breadcrumbs/root/src/map_of_documentation.tt diff --git a/web-site/breadcrumbs/breadcrumbs.yml b/web-site/breadcrumbs/breadcrumbs.yml index 9a89a93..1f0a294 100644 --- a/web-site/breadcrumbs/breadcrumbs.yml +++ b/web-site/breadcrumbs/breadcrumbs.yml @@ -3,3 +3,6 @@ name: breadcrumbs #comment authentication: use_session: 1 +# the location of the faq file... +paths: + faq_file_path: /home/lino/work/breadcrumbs/web-site/breadcrumbs/root/src/ \ No newline at end of file diff --git a/web-site/breadcrumbs/lib/breadcrumbs/Controller/Help.pm b/web-site/breadcrumbs/lib/breadcrumbs/Controller/Help.pm index 04d9db1..6bc5ba0 100644 --- a/web-site/breadcrumbs/lib/breadcrumbs/Controller/Help.pm +++ b/web-site/breadcrumbs/lib/breadcrumbs/Controller/Help.pm @@ -27,7 +27,7 @@ Catalyst Controller. sub index : Private { my ( $self, $c ) = @_; - $c->response->body('Matched breadcrumbs::Controller::Help in Help.'); + $c->stash->{template} = "map_of_documentation.tt"; } sub who_we_are : Local{ @@ -54,9 +54,12 @@ sub record_this_answer{ sub faq : Local{ my ( $self, $c ) = @_; + my $config = $c->config(); + $c->stash->{config} = $config; if ($ENV{"TEST_DB"}){ - open (INFILE, "uri_for('faq'); - my @item = ('FAQ', "$url"); - push (@menu, \@item); - - my @item1 = ('Manuale', "/bcd-doc/"); - push (@menu, \@item1); - - my @item2 = ('Licenza', "licence"); - push (@menu, \@item2); - + breadcrumbs::util::MenuUtils->add_menu_entry('licence', 'Licenza', \@menu, $c); breadcrumbs::util::MenuUtils->add_menu_entry('breadcrumb_and_gpg', 'Sicurezza', \@menu, $c); + breadcrumbs::util::MenuUtils->add_menu_entry('faq', 'FAQ', \@menu, $c); + breadcrumbs::util::MenuUtils->add_menu_entry('/bcd-doc', 'Manuale', \@menu, $c); breadcrumbs::util::MenuUtils->add_menu_entry('/simplehelp', 'Schede', \@menu, $c); + breadcrumbs::util::MenuUtils->add_menu_entry('/help/who_we_are', 'Chi siamo', \@menu, $c); breadcrumbs::util::MenuUtils->add_menu_entry('/starthere', 'Inizia da qui', \@menu, $c); $c->stash->{"menu_items"} = \@menu; @@ -203,7 +200,7 @@ sub auto : Private { my ( $self, $c) = @_; my $trails = $c->stash->{"trails"}; - my $url = $c->uri_for('who_we_are'); + my $url = $c->uri_for('/help'); my @item = ('Aiuto', "$url"); push(@{$trails}, \@item); diff --git a/web-site/breadcrumbs/lib/breadcrumbs/Controller/Root.pm b/web-site/breadcrumbs/lib/breadcrumbs/Controller/Root.pm index 66320e4..6375646 100644 --- a/web-site/breadcrumbs/lib/breadcrumbs/Controller/Root.pm +++ b/web-site/breadcrumbs/lib/breadcrumbs/Controller/Root.pm @@ -2,7 +2,6 @@ package breadcrumbs::Controller::Root; use strict; use warnings; -use Mail::Sendmail; use breadcrumbs::Controller::BcController; use base 'breadcrumbs::Controller::BcController'; @@ -34,9 +33,6 @@ sub new{ $self->_register_action_href - ("Root_comment_subscribe", "subscribe", "Voglio essere informato su questo sito o lasciare un commento"); - - $self->_register_action_href ("Root_demo", "want_demo", "Fammi fare un giro di prova"); bless ($self, $class); @@ -48,58 +44,6 @@ sub want_demo : Local { $c->stash->{template} = "want_demo.tt"; } -sub subscribe : Local { - my ( $self, $c ) = @_; - - - my $dlg = breadcrumbs::Dialogs::MailingListSubscribeDialog->new($c); - - $self->_process_this_dialog - ($c, - $dlg, - "subscribe_mailing_list_or_leave_comment.tt", - '/subscribe_on_ok'); - - $c->detach(); -} - -sub subscribe_on_ok : Local { - - my ( $self, $c ) = @_; - - my $result = $c->stash->{result}; - - #ok, I should simply get the fields from the request - - my $name = breadcrumbs::Dialogs::MailingListSubscribeDialog->get_name($result); - my $mail = breadcrumbs::Dialogs::MailingListSubscribeDialog->get_mail($result); - my $comment = breadcrumbs::Dialogs::MailingListSubscribeDialog->get_comment($result); - - my $message = " l'utente con nome $name e mail $mail : \n"; - - if (defined ($result->param("want_to_subscribe"))){ - $message .= " si vuole iscrivere alla news letter e ti scrive\n"; - } else { - $message .= " ti scrive \n"; - } - - - - $message .= $comment; - - #I try to process a mail message - my %mail = ( To => 'lino@localhost', - From => 'bc@bricioline.it', - Message => $message, - ); - - sendmail(%mail); - - $c->flash->{status_msg} = "Grazie del tuo commento, $name"; - $c->response->redirect($c->uri_for('')); - - -} =head2 default @@ -112,7 +56,7 @@ sub default : Private { $self->_put_action_in_stash($c, "ANC_go_to_current_ant_nest"); $self->_put_action_in_stash($c, "Root_demo"); - $self->_put_action_in_stash($c, "Root_comment_subscribe"); + #$self->_put_action_in_stash($c, "Root_comment_subscribe"); $c->stash->{trail} = 1; @@ -130,13 +74,15 @@ sub _make_menu{ my @menu = (); - breadcrumbs::util::MenuUtils->add_menu_entry('/help/who_we_are', 'Aiuto', \@menu, $c); + if ( $c->namespace !~ /simplehelp/){ + breadcrumbs::util::MenuUtils->add_menu_entry('/help', 'Aiuto', \@menu, $c); + } if ( $c->namespace eq ""){ breadcrumbs::util::MenuUtils->add_menu_entry ('/antnestscontroller/', 'I Formicai', \@menu, $c); - + #breadcrumbs::util::MenuUtils->add_menu_entry('/help/who_we_are', 'Chi siamo', \@menu, $c); } diff --git a/web-site/breadcrumbs/lib/breadcrumbs/Controller/SimpleHelp.pm b/web-site/breadcrumbs/lib/breadcrumbs/Controller/SimpleHelp.pm index 1905a88..c720ec9 100644 --- a/web-site/breadcrumbs/lib/breadcrumbs/Controller/SimpleHelp.pm +++ b/web-site/breadcrumbs/lib/breadcrumbs/Controller/SimpleHelp.pm @@ -76,6 +76,17 @@ sub ant_nest : Local{ $c->stash->{template} = "simple_help_ant_nest.tt"; } +sub auto : Private { + my ( $self, $c) = @_; + + my $trails = $c->stash->{"trails"}; + + breadcrumbs::util::MenuUtils->add_trail("/help", "Aiuto", $trails, $c); + breadcrumbs::util::MenuUtils->add_trail("/simplehelp", "Le schede", $trails, $c); + + return 1; +} + diff --git a/web-site/breadcrumbs/lib/breadcrumbs/Controller/starthere.pm b/web-site/breadcrumbs/lib/breadcrumbs/Controller/starthere.pm index f9a487e..ea11a4e 100644 --- a/web-site/breadcrumbs/lib/breadcrumbs/Controller/starthere.pm +++ b/web-site/breadcrumbs/lib/breadcrumbs/Controller/starthere.pm @@ -80,9 +80,9 @@ sub auto : Private { my ( $self, $c) = @_; my $trails = $c->stash->{"trails"}; - my $url = $c->uri_for('/help/who_we_are'); - my @item = ('Aiuto', "$url"); - push(@{$trails}, \@item); + + breadcrumbs::util::MenuUtils->add_trail("/help", "Aiuto", $trails, $c); + breadcrumbs::util::MenuUtils->add_trail("/starthere", "Inizia da qui", $trails, $c); return 1; #You can continue } diff --git a/web-site/breadcrumbs/root/src/bc_hello.tt b/web-site/breadcrumbs/root/src/bc_hello.tt index e6b85d8..a2f5597 100644 --- a/web-site/breadcrumbs/root/src/bc_hello.tt +++ b/web-site/breadcrumbs/root/src/bc_hello.tt @@ -5,8 +5,8 @@ residenza nella casella in alto e clicca su "Vai". Il sistema cercherà per te il "formicaio" più vicino.

Se invece non sai di cosa stiamo parlando o vuoi saperne comunque -di più inizia da chi siamo. Da lì potrai anche accedere alle FAQ ed al manuale +di più inizia da qui. Da lì potrai anche accedere alle FAQ ed al manuale completo.

Senza troppe parole, comunque, questo è un sito che promuove diff --git a/web-site/breadcrumbs/root/src/map_of_documentation.tt b/web-site/breadcrumbs/root/src/map_of_documentation.tt new file mode 100644 index 0000000..053969f --- /dev/null +++ b/web-site/breadcrumbs/root/src/map_of_documentation.tt @@ -0,0 +1,7 @@ +[% META title="Documentazione delle Bricioline" %] + +

+Questa è la pagina centrale dell'aiuto: da qui si può accedere a vari +livelli di aiuto; potete scegliere le schede, il manuale o le FAQ. +

+ -- 2.11.4.GIT