first-class second-class'),
'#default_value' => $additional_default,
);
- $form['skinr_settings'][$module . '_group'][$theme->name]['_template'] = array(
- '#type' => !empty($template_options) ? 'select' : 'hidden',
- '#title' => t('Template file'),
- '#options' => array_merge(array('' => 'Default'), $template_options),
- '#default_value' => $template_default,
- '#description' => t('Optionally, select a template file to use. The "Default" option allows Drupal to handle this.'),
- );
// Only add validation handler once.
if (!isset($form['#validate']) || !in_array('skinr_ui_form_validate', $form['#validate'])) {
@@ -775,34 +760,3 @@ function skinr_ui_info_options_to_form_o
}
return $form_options;
}
-
-/**
- * Helper function to convert an array of template filenames, as specified in
- * the info file, into an array usable by form api.
- */
-function skinr_ui_info_templates_to_form_options($templates) {
- $form_options = array();
- foreach ($templates as $template) {
- // If it exists, strip .tpl.php from template.
- $template = str_replace('.tpl.php', '', $template);
- $form_options[$template] = $template . '.tpl.php';
- }
- return $form_options;
-}
-
-/**
- * Helper function to filter templates by preprocess_hooks.
- */
-function skinr_ui_info_templates_filter($templates, $preprocess_hooks) {
- $filtered_templates = array();
- foreach ($templates as $template) {
- // If it exists, strip .tpl.php from template.
- $template = str_replace('.tpl.php', '', $template);
- foreach ($preprocess_hooks as $preprocess_hook) {
- if (drupal_substr(str_replace('_', '-', $template), (drupal_strlen($preprocess_hook) * -1)) == str_replace('_', '-', $preprocess_hook)) {
- $filtered_templates[] = $template;
- }
- }
- }
- return $filtered_templates;
-}
Index: help/skinr.help.ini
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/skinr/help/skinr.help.ini,v
retrieving revision 1.2
diff -u -p -r1.2 skinr.help.ini
--- help/skinr.help.ini 15 Oct 2010 07:26:55 -0000 1.2
+++ help/skinr.help.ini 9 Nov 2010 00:49:44 -0000
@@ -16,11 +16,6 @@ title = "Features"
parent = syntax
weight = 2
-[templates]
-title = "Templates"
-parent = syntax
-weight = 5
-
[examples]
title = "Examples"
parent = syntax
Index: help/templates.html
===================================================================
RCS file: help/templates.html
diff -N help/templates.html
--- help/templates.html 15 Oct 2010 07:26:55 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,51 +0,0 @@
-
-At the moment, templates can be associated with a Skin, or just on their own: -
--skinr[rounded_corners][templates][] = rounded-corners-block -skinr[rounded_corners][templates][] = rounded-corners-node-
However, associating a template with a Skin doesn't automatically mean that - file will be used. It needs to be selected manually in the UI. -
-Also, since there are different variables and template file structures - available per hook, it's necessary to provide template files for each type; - hence, the -block, -node suffix. This is required, and will automatically - filter out the template files that do no apply based on the -hook suffix. - While this can still be incredibly useful as is, it's obviously not ideal. An - implementation such as rounded corners would probably be better served as some - type of wrapper template (like comment-wrapper does today). Ideas and patches - to solve this issue are more than welcome. -
- -Some creative uses for template files could include:
- --skinr[extras][templates][] = minimal-block -skinr[extras][templates][] = blank-block-
By not specifying the regular widget options, like [title] and [description]
- for Skins, the widget is conveniently hidden in the UI, but the template still
- exists under advanced options. So, if you have a case where you don't need the
- extra markup like the block title and , you can switch the template file to
- use minimal-block.tpl.php and with the below in your template markup you'll
- only get the $skinr class and the block content.
-
In the above example, minimal-block.tpl.php could contain the following - markup: -
--<div class="<?php print $skinr; ?>"> - <?php print $block->content; ?> -</div>-
You could also specify a blank-block.tpl.php, which could contain only the content:
-<?php print $block->content; ?>-
Both of these examples are useful for cases where you might otherwise be - creating multiple template files for custom blocks just to remove markup, - which can get unruly. In this case you can just assign the appropriate - template file and be done with it, while keeping the number of template files - in your theme manageable. -
Index: modules/panels.skinr.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/panels.skinr.inc,v retrieving revision 1.14 diff -u -p -r1.14 panels.skinr.inc --- modules/panels.skinr.inc 29 Oct 2010 06:24:37 -0000 1.14 +++ modules/panels.skinr.inc 9 Nov 2010 00:49:44 -0000 @@ -235,13 +235,6 @@ function panels_skinr_submit_handler_set } } - if (isset($theme['_template'])) { - $theme['_template'] = trim($theme['_template']); - if (!empty($theme['_template'])) { - $value['_template'] = $theme['_template']; - } - } - if (empty($sid)) { // We didn't receive a valid sid, so raise an error. drupal_set_message(t("Skinr settings weren't saved due to an error."), 'error'); Index: modules/views.skinr.inc =================================================================== RCS file: /cvs/drupal-contrib/contributions/modules/skinr/modules/views.skinr.inc,v retrieving revision 1.8 diff -u -p -r1.8 views.skinr.inc --- modules/views.skinr.inc 2 Jun 2010 13:16:58 -0000 1.8 +++ modules/views.skinr.inc 9 Nov 2010 00:49:44 -0000 @@ -213,13 +213,6 @@ function views_skinr_submit_handler_disp } } - if (isset($theme['_template'])) { - $theme['_template'] = trim($theme['_template']); - if (!empty($theme['_template'])) { - $value['_template'] = $theme['_template']; - } - } - if (empty($sid)) { // We didn't receive a valid sid, so raise an error drupal_set_message(t("Skinr settings weren't saved due to an error."), 'error');