From cd2b89bfa7a381a94d8a451f207b7d0867b34414 Mon Sep 17 00:00:00 2001 From: senator Date: Mon, 31 Jan 2011 12:56:42 -0500 Subject: [PATCH] cleanup and reorg parts so far --- Open-ILS/web/templates/default/kcls-wire/home.tt2 | 47 +++++++++++----------- .../default/kcls-wire/{ => parts}/base.tt2 | 2 +- .../default/kcls-wire/{ => parts}/footer.tt2 | 0 .../kcls-wire/{ => parts}/format_selector.tt2 | 0 .../default/kcls-wire/{ => parts}/homesearch.tt2 | 0 .../default/kcls-wire/{ => parts}/libselect.tt2 | 0 .../default/kcls-wire/{ => parts}/searchbar.tt2 | 6 +-- .../kcls-wire/{ => parts}/stypes_selector.tt2 | 0 .../default/kcls-wire/{ => parts}/tips.tt2 | 0 .../default/kcls-wire/{ => parts}/topnav.tt2 | 0 .../default/kcls-wire/{ => parts}/utils.tt2 | 0 11 files changed, 28 insertions(+), 27 deletions(-) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/base.tt2 (93%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/footer.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/format_selector.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/homesearch.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/libselect.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/searchbar.tt2 (88%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/stypes_selector.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/tips.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/topnav.tt2 (100%) rename Open-ILS/web/templates/default/kcls-wire/{ => parts}/utils.tt2 (100%) diff --git a/Open-ILS/web/templates/default/kcls-wire/home.tt2 b/Open-ILS/web/templates/default/kcls-wire/home.tt2 index 67433f66cb..2e17bc297a 100644 --- a/Open-ILS/web/templates/default/kcls-wire/home.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/home.tt2 @@ -1,31 +1,32 @@ -[% WRAPPER "default/kcls-wire/base.tt2"; - INCLUDE "default/kcls-wire/topnav.tt2"; +[% WRAPPER "default/kcls-wire/parts/base.tt2"; + INCLUDE "default/kcls-wire/parts/topnav.tt2"; ctx.page_title = "Home" %] +[% BLOCK html_head -%] + +[%- END %] -
-
-
- + +
+ [% INCLUDE "default/kcls-wire/parts/utils.tt2" %]
- [% INCLUDE "default/kcls-wire/utils.tt2" %] + [% INCLUDE "default/kcls-wire/parts/searchbar.tt2" %]
- - [% INCLUDE "default/kcls-wire/searchbar.tt2" %] - - -
-
-
- [% INCLUDE "default/kcls-wire/homesearch.tt2" %] -
+
+
+
+ [% INCLUDE "default/kcls-wire/parts/homesearch.tt2" %] +
+
-
[% END %] diff --git a/Open-ILS/web/templates/default/kcls-wire/base.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/base.tt2 similarity index 93% rename from Open-ILS/web/templates/default/kcls-wire/base.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/base.tt2 index 48396d5f9c..061b306eaa 100644 --- a/Open-ILS/web/templates/default/kcls-wire/base.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/base.tt2 @@ -13,6 +13,6 @@ [% content %] - [% INCLUDE "default/kcls-wire/footer.tt2" %] + [% INCLUDE "default/kcls-wire/parts/footer.tt2" %] diff --git a/Open-ILS/web/templates/default/kcls-wire/footer.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/footer.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/footer.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/footer.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/format_selector.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/format_selector.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/format_selector.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/format_selector.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/homesearch.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/homesearch.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/homesearch.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/homesearch.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/libselect.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/libselect.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/libselect.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/libselect.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/searchbar.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2 similarity index 88% rename from Open-ILS/web/templates/default/kcls-wire/searchbar.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2 index 593257ae6d..26c37b4b8b 100644 --- a/Open-ILS/web/templates/default/kcls-wire/searchbar.tt2 +++ b/Open-ILS/web/templates/default/kcls-wire/parts/searchbar.tt2 @@ -6,7 +6,7 @@ - [% INCLUDE "default/kcls-wire/stypes_selector.tt2" %] + [% INCLUDE "default/kcls-wire/parts/stypes_selector.tt2" %]
@@ -18,8 +18,8 @@ - [% INCLUDE "default/kcls-wire/format_selector.tt2" %] - [% INCLUDE "default/kcls-wire/libselect.tt2" %] + [% INCLUDE "default/kcls-wire/parts/format_selector.tt2" %] + [% INCLUDE "default/kcls-wire/parts/libselect.tt2" %] diff --git a/Open-ILS/web/templates/default/kcls-wire/stypes_selector.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/stypes_selector.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/stypes_selector.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/stypes_selector.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/tips.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/tips.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/tips.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/tips.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/topnav.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/topnav.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/topnav.tt2 diff --git a/Open-ILS/web/templates/default/kcls-wire/utils.tt2 b/Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2 similarity index 100% rename from Open-ILS/web/templates/default/kcls-wire/utils.tt2 rename to Open-ILS/web/templates/default/kcls-wire/parts/utils.tt2 -- 2.11.0