[wellwell-devel] [SCM] Interchange wellwell catalog branch, master, updated. e11db1361a5adc6ca13235f8409cca0421a103fc

[Stefan Hornburg]

       via  e11db1361a5adc6ca13235f8409cca0421a103fc (commit)
       via  9942919ca9a26606bcc6fd2763a1ebed25db3e04 (commit)
      from  36fc75edf3f3b991be742cf0b19518aef96809a7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit e11db1361a5adc6ca13235f8409cca0421a103fc
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Mon Jan 18 11:22:15 2010 -0500

    skip label on hidden elements

commit 9942919ca9a26606bcc6fd2763a1ebed25db3e04
Author: Stefan Hornburg (Racke) <racke at linuxia.de>
Date:   Mon Jan 11 17:07:16 2010 +0100

    configuration for local plugins added

-----------------------------------------------------------------------

Summary of changes and diff:
 catalog.cfg                 |    5 ++++-
 code/theme_form_element.sub |    5 ++++-
 plugins/local.cfg           |   10 ++++++++++
 3 files changed, 18 insertions(+), 2 deletions(-)
 create mode 100644 plugins/local.cfg

diff --git a/catalog.cfg b/catalog.cfg
index 1818de5..a8c806c 100644
--- a/catalog.cfg
+++ b/catalog.cfg
@@ -44,9 +44,12 @@ Database product_images AUTO_SEQUENCE product_images_code_seq
 Database users KEY uid
 Database users AUTO_SEQUENCE users_uid_seq
 
-# Plugins
+# Standard plugins
 include plugins/{__PLUGINS__}/plugin.cfg
 
+# Local plugins
+include local/plugins/{__PLUGINS__}/plugin.cfg
+
 # Virtual pages
 SpecialPage catalog index
 SpecialPage target index
diff --git a/code/theme_form_element.sub b/code/theme_form_element.sub
index 473973c..3331451 100644
--- a/code/theme_form_element.sub
+++ b/code/theme_form_element.sub
@@ -16,7 +16,10 @@ sub {
 		return qq{<legend>$label</legend>};
 	}
 
-	$out = theme('form_element_label', $name, $label);
+	unless ($type eq 'hidden') {
+		$out = theme('form_element_label', $name, $label);
+	}
+
 	$out .= theme('form_element_field', $name,
 				   	$type,
 					$value,
diff --git a/plugins/local.cfg b/plugins/local.cfg
new file mode 100644
index 0000000..e3ee9df
--- /dev/null
+++ b/plugins/local.cfg
@@ -0,0 +1,10 @@
+# custom code
+include local/plugins/__CURPLUGIN__/code/*.*
+
+# profiles
+OrderProfile local/plugins/__CURPLUGIN__/profiles/*.profile
+
+# search path for components
+TemplateDir local/plugins/__CURPLUGIN__
+# search path for pages
+TemplateDir local/plugins/__CURPLUGIN__/pages


hooks/post-receive
-- 
Interchange wellwell catalog