diff --git a/lib/LDV.pm b/lib/LDV.pm index 23d53d7..11770f7 100644 --- a/lib/LDV.pm +++ b/lib/LDV.pm @@ -51,7 +51,7 @@ sub startup { } { # /zerobin - my $zb = $r->route('/zerobin2') -> to(controller => 'zerobin'); + my $zb = $r->route('/zerobin') -> to(controller => 'zerobin'); $zb->post('/') -> to(action => 'save'); $zb->get ('/') -> to(action => 'create'); $zb->route('/:time', time => qr/\d+/) diff --git a/lib/LDV/Zerobin.pm b/lib/LDV/Zerobin.pm index f4b3dfd..e6c2cf0 100644 --- a/lib/LDV/Zerobin.pm +++ b/lib/LDV/Zerobin.pm @@ -101,7 +101,7 @@ sub view { $self->app->log->error($@); $@ = "internal error" if ($@ =~ m|at \S+ line \d+|oi); $self->flash({'result' => $@}); - $self->redirect_to("/zerobin2"); + $self->redirect_to("/zerobin"); return; }; @@ -148,13 +148,13 @@ sub save { syntax => $syntax, }); $self->_content_save($time, $paste); - $self->redirect_to("/zerobin2/$time"); 1; + $self->redirect_to("/zerobin/$time"); 1; } or do { chomp $@; $self->app->log->error($@); $@ = "internal error" if ($@ =~ m|at \S+ line \d+|oi); $self->flash({'result' => $@}); - $self->redirect_to("/zerobin2"); + $self->redirect_to("/zerobin"); }; $self->rendered; @@ -183,7 +183,7 @@ sub prune { $self->stash({result => $@}); }; - $self->redirect_to("/zerobin2"); + $self->redirect_to("/zerobin"); $self->rendered; } diff --git a/templates/zerobin/create.html.ep b/templates/zerobin/create.html.ep index 9c56fbb..e0f5165 100644 --- a/templates/zerobin/create.html.ep +++ b/templates/zerobin/create.html.ep @@ -8,7 +8,7 @@ % my %opts = (id => 'paste', name => 'paste');

Создать запись

- <%= form_for "/zerobin2" => (method => 'POST', enctype => "multipart/form-data") => begin %> + <%= form_for "/zerobin" => (method => 'POST', enctype => "multipart/form-data") => begin %>
<%= submit_button l('Save') %>  diff --git a/templates/zerobin/view.html.ep b/templates/zerobin/view.html.ep index a56c505..3ff36ab 100644 --- a/templates/zerobin/view.html.ep +++ b/templates/zerobin/view.html.ep @@ -1,13 +1,13 @@ % layout 'default'; % title 'Zerobin -- View'; -% my $paste = (stash 'paste') || {}; +% my $paste = stash('paste') || {};

<%= l('View paste') %>

- <%= link_to l('Create new') => "/zerobin2", class => 'zerobin create' %> + <%= link_to l('Create new') => "/zerobin", class => 'zerobin create' %> <%= link_to l('Download') => "/zerobin/$paste->{time}.txt", class => 'zerobin download' %>
-
+
% if (not $paste->{syntax} or $paste->{syntax} eq 'plaintext') { %= b(plaintext($paste->{data}));