Kategorie-Templates dazu

diff --git a/bin/run_debug.sh b/bin/run_debug.sh
index 776b7fcea1ed641767e0601d8569d3078d511af9..4d1b274a398ee7e2646478d1376725aef464c586 100755 (executable)
--- a/bin/run_debug.sh
+++ b/bin/run_debug.sh
@@ -9,4 +9,4 @@ cd $DIR || exit 6
 
 pwd
 
-CATALYST_DEBUG=1 DBIC_TRACE=1 script/frbr_books_server.pl
+CATALYST_DEBUG=3 DBIC_TRACE=1 script/frbr_books_server.pl

diff --git a/lib/FrBr/Books/Controller/Verlag.pm b/lib/FrBr/Books/Controller/Verlag.pm
index aa105111068563ff1865c5d4440c3fbe2d6a4a8a..83fcf1403f2175b46bce9efd253c4a65e19b9a31 100644 (file)
--- a/lib/FrBr/Books/Controller/Verlag.pm
+++ b/lib/FrBr/Books/Controller/Verlag.pm
@@ -114,8 +114,6 @@ sub form_new : Path('new') {
     $self->verlag_session2stash($c);
     $c->stash->{'verlag_edit'}{'name'} = "Neuer Verlag" unless $c->stash->{'verlag_edit'}{'name'};
 
-    $c->stash->{'return_target_verlag_save'} = $c->session->{'return_target_verlag_save'} || $c->web_path('/verlag');
-
     return 1 unless $c->request->params->{'verlag_form_sent'} and $c->request->params->{'do_save'};
 
     return $self->do_save_verlag($c);
@@ -175,10 +173,10 @@ sub verlag_cgi2session : Private {
     my ( $self, $c ) = @_;
     my $K = __PACKAGE__ . "::verlag_cgi2session(): ";
 
-    return 1 unless $c->request->params->{'verlag_form_sent'};
-
     $c->session->{'return_target_verlag_save'} = $c->request->params->{'return_target_form'} if $c->request->params->{'return_target_form'};
 
+    return 1 unless $c->request->params->{'verlag_form_sent'};
+
     # Basis anlegen, wenn notwendig
     $c->session->{'verlag_data_edit'} = {} unless $c->session->{'verlag_data_edit'};
 
@@ -212,11 +210,16 @@ sub verlag_session2stash : Private {
     my ( $self, $c ) = @_;
     my $K = __PACKAGE__ . "::verlag_session2stash(): ";
 
+    $c->log->debug( get_output_string( $K . "Verlag in der Session:", $c->session->{'verlag_data_edit'} ) ) if $c->stash->{'debug_level'} > 2;
+    $c->log->debug( $K . "Rücksprungadresse in der Session: '" . $c->session->{'return_target_verlag_save'} . "'" ) if $c->stash->{'debug_level'} > 2;
+
     $c->stash->{'verlag_edit'} = {} unless $c->stash->{'verlag_edit'};
     $c->stash->{'verlag_edit'}{'id'}   = $c->session->{'verlag_data_edit'}{'id'}   if $c->session->{'verlag_data_edit'}{'id'};
     $c->stash->{'verlag_edit'}{'name'} = $c->session->{'verlag_data_edit'}{'name'} if $c->session->{'verlag_data_edit'}{'name'};
     $c->stash->{'verlag_edit'}{'name_long'} = $c->session->{'verlag_data_edit'}{'name_long'} if $c->session->{'verlag_data_edit'}{'desc'};
 
+    $c->stash->{'return_target_verlag_save'} = $c->session->{'return_target_verlag_save'} || $c->web_path('/verlag');
+
     return 1;
 
 }

diff --git a/root/src/category/cat_form.tt2 b/root/src/category/cat_form.tt2
new file mode 100644 (file)
index 0000000..1901121
--- /dev/null
+++ b/root/src/category/cat_form.tt2
@@ -0,0 +1,36 @@
+[%#
+
+    Template für Kategorieangaben
+
+    vim: noai : ts=4 fenc=utf-8 filetype=html expandtab :
+
+    $Id$
+    $URL$
+
+-%]
+
+<!-- Kategorie-Formular -->
+
+<form method="post" name="category_form" action="[% self_url %]">
+<input type="hidden" name="category_form_sent" value="sent" />
+[%- IF category_edit.id %]<input type="hidden" name="category_id" value="[% category_edit.id | html %]" />[% END %]
+  <table class="ftable" cellspacing="0">
+    <tr>
+      <th colspan="2" class="title">[% category_form_title %]</th>
+    </tr><tr>
+      <td colspan="2">&nbsp;</td>
+    </tr><tr>
+      <th>Kategorie:</th>
+      <td><input type="text" name="category_name" size="50" maxlength="100" value="[% category_edit.name | html %]" /></td>
+    </tr><tr>
+      <td colspan="2">&nbsp;</td>
+    </tr><tr>
+      <th colspan="2" class="button"><input type="submit" name="do_save" value="  OK  " /></th>
+    </tr>
+  </table>
+</form>
+[%- IF error_message %]
+<div class="error">
+<span class="bold">Fehler:</span>&nbsp;[% error_message %]
+</div>
+[% END -%]

diff --git a/root/src/category/form.css b/root/src/category/form.css
new file mode 100644 (file)
index 0000000..ae5c535
--- /dev/null
+++ b/root/src/category/form.css
@@ -0,0 +1,10 @@
+[%#
+   # Template fuer Stylesheets Kategorieformulare
+   #
+   # $Id$
+   # $URL$
+   #
+-%]
+/*  Stylesheets Kategorie-Formulare */
+
+

diff --git a/root/src/category/index.tt2 b/root/src/category/index.tt2
new file mode 100644 (file)
index 0000000..17c2876
--- /dev/null
+++ b/root/src/category/index.tt2
@@ -0,0 +1,47 @@
+[%#
+
+    index.tt2 - Index-Template (Menue) fuer Kategorien
+
+    vim: noai : ts=4 fenc=utf-8 filetype=html expandtab :
+
+    $Id$
+    $URL$
+
+-%]
+<div style="text-align: center">
+<table class="menu" cellspacing="0">
+  <tr>
+    <th colspan="2">Menü</th>
+  </tr>
+  <tr>
+    <td colspan="2" class="empty">
+      &nbsp;</td>
+  </tr>
+  <tr>
+    <td class="button">
+      &nbsp;</td>
+    <td class="item">
+      <a href="[% path('/category/list') %]">Liste der Kategorien</a></td>
+  </tr>
+  <tr>
+    <td colspan="2" class="empty">
+      &nbsp;</td>
+  </tr>
+  <tr>
+    <td class="button">
+      &nbsp;</td>
+    <td class="item">
+      <a href="[% path('/category/new') %]">Neue Kategorie</a></td>
+  </tr>
+  <tr>
+    <td colspan="2" class="empty">
+      &nbsp;</td>
+  </tr>
+  <tr>
+    <td class="button">
+      &nbsp;</td>
+    <td class="item">
+      <a href="[% path('/') %]">Zurück zum Hauptmenü</a></td>
+  </tr>
+</table>
+</div>

diff --git a/root/src/category/new.tt2 b/root/src/category/new.tt2
new file mode 100644 (file)
index 0000000..82f6b4b
--- /dev/null
+++ b/root/src/category/new.tt2
@@ -0,0 +1,16 @@
+[%#
+
+    Template für neue Kategorie
+
+    vim: noai : ts=4 fenc=utf-8 filetype=html expandtab :
+
+    $Id$
+    $URL$
+
+-%]
+[%- book_form_title = 'Neue Kategorie' -%]
+[% PROCESS category/cat_form.tt2 %]
+
+<div class="back">
+<h2><a href="[% return_target_category_save ) %]">[% 'Zurück' %]</a></h2>
+</div>

diff --git a/root/src/category/save_success.tt2 b/root/src/category/save_success.tt2
new file mode 100644 (file)
index 0000000..581d5d8
--- /dev/null
+++ b/root/src/category/save_success.tt2
@@ -0,0 +1,17 @@
+[%#
+
+    save_success.tt2 - Template fuer erfolgreiches Speichern der Kategorie
+
+    vim: noai : ts=4 fenc=utf-8 filetype=html expandtab :
+
+    $Id$
+    $URL$
+
+-%]
+<div style="text-align: center">
+
+Die Kategorie <b>&quot;[% category_edit.name %]</b> wurde erfolgreich gespeichert.
+
+<h2><a href="[% return_target_category_save %]">OK</a></h2>
+
+</div>

diff --git a/root/src/category/styles.css b/root/src/category/styles.css
new file mode 100644 (file)
index 0000000..ee3d387
--- /dev/null
+++ b/root/src/category/styles.css
@@ -0,0 +1,10 @@
+/* [%#
+   # Template fuer Stylesheets Kategorien
+   #
+   # $Id$
+   # $URL$
+   #
+-%]
+ Stylesheets Kategorien */
+
+

diff --git a/root/src/verlag/new.tt2 b/root/src/verlag/new.tt2
index c13ea03be16474a2d4ca5dee31ddbc3ae6586d35..b19890ee6d5045daf127b54abbc19276de7ec7ee 100644 (file)
--- a/root/src/verlag/new.tt2
+++ b/root/src/verlag/new.tt2
@@ -12,5 +12,5 @@
 [% PROCESS verlag/verlag_form.tt2 %]
 
 <div class="back">
-<h2><a href="[% path('/books') %]">[% 'Zurück' %]</a></h2>
+<h2><a href="[% return_target_verlag_save %]">[% 'Zurück' %]</a></h2>
 </div>