non security modules update
This commit is contained in:
@@ -50,12 +50,15 @@
|
||||
* The sub-categories faqs, recursively themed (by this template).
|
||||
*/
|
||||
|
||||
// @todo should be moved to better place.
|
||||
// @codingStandardsIgnoreStart
|
||||
if ($category_depth > 0) {
|
||||
$hdr = 'h4';
|
||||
}
|
||||
else {
|
||||
$hdr = 'h3';
|
||||
}
|
||||
// @codingStandardsIgnoreEnd
|
||||
|
||||
?><div class="faq-category-group">
|
||||
<!-- category header with title, link, image, description, and count of
|
||||
@@ -130,7 +133,5 @@ else {
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</div> <!-- Close div: faq-dl-hide-answer -->
|
||||
|
||||
</div> <!-- Close div: faq-qa / faq-qa-hide -->
|
||||
|
||||
</div> <!-- Close div: faq-category-group -->
|
||||
|
@@ -46,12 +46,15 @@
|
||||
* The sub-categories faqs, recursively themed (by this template).
|
||||
*/
|
||||
|
||||
// @todo should be moved to better place.
|
||||
// @codingStandardsIgnoreStart
|
||||
if ($category_depth > 0) {
|
||||
$hdr = 'h4';
|
||||
}
|
||||
else {
|
||||
$hdr = 'h3';
|
||||
}
|
||||
// @codingStandardsIgnoreEnd
|
||||
|
||||
?><div class="faq-category-group">
|
||||
<!-- category header with title, link, image, description, and count of
|
||||
@@ -119,8 +122,5 @@ else {
|
||||
</<?php print $question_list_style; ?>>
|
||||
</div> <!-- Close div: item-list -->
|
||||
<?php endif; ?>
|
||||
|
||||
|
||||
</div> <!-- Close div: faq-qa / faq-qa-hide -->
|
||||
|
||||
</div> <!-- Close div: faq-category-group -->
|
||||
|
@@ -53,13 +53,15 @@
|
||||
* The sub-categories faqs, recursively themed (by this template).
|
||||
*/
|
||||
|
||||
// @todo should be moved to better place.
|
||||
// @codingStandardsIgnoreStart
|
||||
if ($category_depth > 0) {
|
||||
$hdr = 'h4';
|
||||
}
|
||||
else {
|
||||
$hdr = 'h3';
|
||||
}
|
||||
|
||||
// @codingStandardsIgnoreEnd
|
||||
?>
|
||||
<a id="faq-top"></a>
|
||||
<div class="faq-category-group">
|
||||
@@ -143,7 +145,5 @@ else {
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
</div> <!-- Close div -->
|
||||
|
||||
</div> <!-- Close div: faq-qa / faq-qa-hide -->
|
||||
|
||||
</div> <!-- Close div: faq-category-group -->
|
||||
|
@@ -53,17 +53,19 @@
|
||||
* The sub-categories faqs, recursively themed (by this template).
|
||||
*/
|
||||
|
||||
|
||||
// @todo should be moved to better place.
|
||||
// @codingStandardsIgnoreStart
|
||||
if ($category_depth > 0) {
|
||||
$hdr = 'h4';
|
||||
}
|
||||
else {
|
||||
$hdr = 'h3';
|
||||
}
|
||||
|
||||
$depth = 0;
|
||||
// @codingStandardsIgnoreEnd
|
||||
?>
|
||||
|
||||
?><?php if ($display_answers): ?>
|
||||
<?php if ($display_answers): ?>
|
||||
<?php if ($answer_category_name): ?>
|
||||
<?php while ($depth < $category_depth): ?>
|
||||
<div class="faq-category-indent">
|
||||
@@ -135,5 +137,4 @@ $depth = 0;
|
||||
</div> <!-- Close div: faq-category-indent -->
|
||||
<?php $depth--; endwhile; ?>
|
||||
<?php endif; ?>
|
||||
<?php
|
||||
endif; // if display_answers
|
||||
<?php endif; ?>
|
||||
|
@@ -60,13 +60,15 @@
|
||||
* The sub-categories faqs, recursively themed (by this template).
|
||||
*/
|
||||
|
||||
// @todo should be moved to better place.
|
||||
// @codingStandardsIgnoreStart
|
||||
if ($category_depth > 0) {
|
||||
$hdr = 'h4';
|
||||
}
|
||||
else {
|
||||
$hdr = 'h3';
|
||||
}
|
||||
|
||||
// @codingStandardsIgnoreEnd
|
||||
?>
|
||||
<a id="faq-top"></a>
|
||||
<div class="faq-category-menu">
|
||||
@@ -115,14 +117,14 @@ else {
|
||||
|
||||
<div class="<?php print $container_class; ?>">
|
||||
|
||||
<?php // include subcategories ?>
|
||||
<?php /* Include subcategories. */ ?>
|
||||
<?php if (count($subcat_body_list)): ?>
|
||||
<?php foreach ($subcat_body_list as $i => $subcat_html): ?>
|
||||
<div class="faq-category-indent"><?php print $subcat_html; ?></div>
|
||||
<?php endforeach; ?>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php // list question links ?>
|
||||
<?php /* List question links. */ ?>
|
||||
<?php if (!empty($question_list)): ?>
|
||||
<div class="item-list">
|
||||
<<?php print $question_list_style; ?> class="faq-ul-questions-top">
|
||||
@@ -149,14 +151,14 @@ else {
|
||||
<div class="clear-block"></div>
|
||||
<?php endif; ?>
|
||||
|
||||
<?php // List questions (in title link) and answers (in body). ?>
|
||||
<?php /* List questions (in title link) and answers (in body). */ ?>
|
||||
<div class="faq-category-group">
|
||||
<div>
|
||||
|
||||
<?php if (count($nodes)): ?>
|
||||
<?php foreach ($nodes as $i => $node): ?>
|
||||
|
||||
<div class="faq-question"><?php // Strong question label here? ?>
|
||||
<div class="faq-question">
|
||||
<?php if (!empty($question_label)) : ?>
|
||||
<strong class="faq-question-label">
|
||||
<?php print $question_label; ?>
|
||||
@@ -185,5 +187,4 @@ else {
|
||||
<?php if ($group_questions_top || $category_display == 'hide_qa'): ?>
|
||||
</div> <!-- Close div: faq-qa / faq-qa-hide -->
|
||||
</div> <!-- Close div: faq-category-menu -->
|
||||
<?php
|
||||
endif;
|
||||
<?php endif; ?>
|
||||
|
@@ -21,7 +21,7 @@
|
||||
?><div>
|
||||
<?php if (count($nodes)): ?>
|
||||
<?php foreach ($nodes as $node): ?>
|
||||
<?php // Cycle through each of the nodes. We now have the variable $node to work with. ?>
|
||||
<?php /* Cycle through each of the nodes. We now have the variable $node to work with. */ ?>
|
||||
<div class="faq-question-answer">
|
||||
<div class="faq-question faq-dt-hide-answer">
|
||||
<?php print $node['question']; ?>
|
||||
|
@@ -16,5 +16,4 @@
|
||||
* Pre-formatted list.
|
||||
*/
|
||||
?>
|
||||
<?php
|
||||
print $list;
|
||||
<?php print $list; ?>
|
||||
|
@@ -26,7 +26,6 @@
|
||||
<div>
|
||||
<?php if (count($nodes)): ?>
|
||||
<?php foreach ($nodes as $node): ?>
|
||||
<?php // Cycle through the $nodes array so that we now have a $node variable to work with. ?>
|
||||
<br />
|
||||
<div class="faq-question">
|
||||
<?php if (!empty($question_label)): ?>
|
||||
|
@@ -35,7 +35,7 @@
|
||||
<br />
|
||||
<?php $key = 0; ?>
|
||||
<?php while ($key < $limit): ?>
|
||||
<?php // Cycle through all the answers and "more" links. $key will represent the applicable position in the arrays. ?>
|
||||
<?php /* Cycle through all the answers and "more" links. $key will represent the applicable position in the arrays. */ ?>
|
||||
<div class="faq-question">
|
||||
<?php if (!empty($question_label)): ?>
|
||||
<strong class="faq-question-label">
|
||||
@@ -54,7 +54,6 @@
|
||||
<?php print $answers[$key]['body']; ?>
|
||||
<?php print $answers[$key]['links']; ?>
|
||||
</div> <!-- Close div: faq-answer -->
|
||||
<?php // Increment $key to move on to the next position. ?>
|
||||
<?php /* Increment $key to move on to the next position. */ ?>
|
||||
<?php $key++; ?>
|
||||
<?php
|
||||
endwhile;
|
||||
<?php endwhile; ?>
|
||||
|
@@ -8,7 +8,7 @@
|
||||
/**
|
||||
* Create FAQ page if set to show/hide answer when question is clicked.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_hide_answer(&$variables) {
|
||||
@@ -35,7 +35,7 @@ function template_preprocess_faq_hide_answer(&$variables) {
|
||||
/**
|
||||
* Create categorized FAQ page if set to show answer when question is clicked.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_category_hide_answer(&$variables) {
|
||||
@@ -76,7 +76,6 @@ function template_preprocess_faq_category_hide_answer(&$variables) {
|
||||
$show_term_page_children = TRUE;
|
||||
}
|
||||
|
||||
|
||||
// Get number of questions, and account for hidden sub-categories.
|
||||
$count = 0;
|
||||
if ($display_faq_count && $hide_child_terms) {
|
||||
@@ -94,7 +93,7 @@ function template_preprocess_faq_category_hide_answer(&$variables) {
|
||||
$variables['category_depth'] = $term->depth;
|
||||
$variables['category_name'] = check_plain(faq_tt("taxonomy:term:$term->tid:name", $term->name));
|
||||
if ($category_display == 'hide_qa') {
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq/$term->tid");
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq-page/$term->tid");
|
||||
}
|
||||
else {
|
||||
$variables['header_title'] = check_plain(faq_tt("taxonomy:term:$term->tid:name", $term->name));
|
||||
@@ -145,4 +144,3 @@ function template_preprocess_faq_category_hide_answer(&$variables) {
|
||||
$variables['nodes'] = $nodes;
|
||||
$variables['question_count'] = $count;
|
||||
}
|
||||
|
||||
|
@@ -8,7 +8,7 @@
|
||||
/**
|
||||
* Create FAQ page if set to show the answer in a new page.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_new_page(&$variables) {
|
||||
@@ -23,16 +23,22 @@ function template_preprocess_faq_new_page(&$variables) {
|
||||
$variables['list_style'] = $list_style;
|
||||
$variables['list_items'] = $items;
|
||||
|
||||
$variables['list'] = theme('item_list', array('items' => $items, 'title' => NULL, 'type' => $list_style, 'attributes' => array("class" => "faq-question-listing")));
|
||||
$variables['list'] = theme('item_list',
|
||||
array(
|
||||
'items' => $items,
|
||||
'title' => NULL,
|
||||
'type' => $list_style,
|
||||
'attributes' => array("class" => "faq-question-listing"),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create categorized FAQ page if set to show answer in a new page.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
|
||||
function template_preprocess_faq_category_new_page(&$variables) {
|
||||
$data = $variables['data'];
|
||||
$category_display = $variables['category_display'];
|
||||
@@ -84,7 +90,7 @@ function template_preprocess_faq_category_new_page(&$variables) {
|
||||
// Configure header.
|
||||
$variables['category_depth'] = $term->depth;
|
||||
if ($category_display == 'hide_qa') {
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq/$term->tid");
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq-page/$term->tid");
|
||||
}
|
||||
else {
|
||||
$variables['header_title'] = check_plain(faq_tt("taxonomy:term:$term->tid:name", $term->name));
|
||||
@@ -132,4 +138,3 @@ function template_preprocess_faq_category_new_page(&$variables) {
|
||||
$variables['question_list_style'] = variable_get('faq_question_listing', 'ul');
|
||||
$variables['question_count'] = $count;
|
||||
}
|
||||
|
||||
|
@@ -8,7 +8,7 @@
|
||||
/**
|
||||
* Create the FAQ page if set to show the questions inline.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_questions_inline(&$variables) {
|
||||
@@ -46,7 +46,7 @@ function template_preprocess_faq_questions_inline(&$variables) {
|
||||
/**
|
||||
* Create categorized FAQ page if set to show/hide the questions inline.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_category_questions_inline(&$variables) {
|
||||
@@ -87,7 +87,6 @@ function template_preprocess_faq_category_questions_inline(&$variables) {
|
||||
$show_term_page_children = TRUE;
|
||||
}
|
||||
|
||||
|
||||
// Configure "back to top" link.
|
||||
$back_to_top = faq_init_back_to_top($this_page);
|
||||
|
||||
@@ -115,7 +114,7 @@ function template_preprocess_faq_category_questions_inline(&$variables) {
|
||||
// Configure header.
|
||||
$variables['category_depth'] = $term->depth;
|
||||
if ($category_display == 'hide_qa') {
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq/$term->tid");
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq-page/$term->tid");
|
||||
}
|
||||
else {
|
||||
$variables['header_title'] = check_plain(faq_tt("taxonomy:term:$term->tid:name", $term->name));
|
||||
@@ -166,4 +165,3 @@ function template_preprocess_faq_category_questions_inline(&$variables) {
|
||||
$variables['nodes'] = $nodes;
|
||||
$variables['question_count'] = $count;
|
||||
}
|
||||
|
||||
|
@@ -8,9 +8,10 @@
|
||||
/**
|
||||
* Create the structure of the page, when the questions are to be shown on top.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
* @return
|
||||
*
|
||||
* @return array
|
||||
* A variable holding the HTML formatted page.
|
||||
*/
|
||||
function template_preprocess_faq_questions_top(&$variables) {
|
||||
@@ -51,13 +52,22 @@ function template_preprocess_faq_questions_top(&$variables) {
|
||||
$variables['use_teaser'] = $teaser;
|
||||
$variables['questions'] = $questions;
|
||||
$variables['answers'] = $answers;
|
||||
$variables['questions_list'] = theme('item_list', array('items' => $questions, 'title' => NULL, 'type' => $list_style, 'attributes' => array("class" => "faq-ul-questions-top")));
|
||||
$variables['questions_list'] = theme('item_list',
|
||||
array(
|
||||
'items' => $questions,
|
||||
'title' => NULL,
|
||||
'type' => $list_style,
|
||||
'attributes' => array(
|
||||
"class" => "faq-ul-questions-top",
|
||||
),
|
||||
)
|
||||
);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create categorized questions for FAQ page if set to show questions on top.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_category_questions_top(&$variables) {
|
||||
@@ -76,7 +86,7 @@ function template_preprocess_faq_category_questions_top(&$variables) {
|
||||
$show_term_page_children = variable_get('faq_show_term_page_children', FALSE);
|
||||
$group_questions_top = variable_get('faq_group_questions_top', FALSE);
|
||||
$default_sorting = variable_get('faq_default_sorting', 'DESC');
|
||||
|
||||
|
||||
// Configure labels.
|
||||
$variables['question_label'] = '';
|
||||
$variables['answer_label'] = '';
|
||||
@@ -126,7 +136,7 @@ function template_preprocess_faq_category_questions_top(&$variables) {
|
||||
$variables['category_depth'] = $term->depth;
|
||||
$variables['category_name'] = check_plain(faq_tt("taxonomy:term:$term->tid:name", $term->name));
|
||||
if ($category_display == 'hide_qa') {
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq/$term->tid");
|
||||
$variables['header_title'] = l(faq_tt("taxonomy:term:$term->tid:name", $term->name), "faq-page/$term->tid");
|
||||
}
|
||||
else {
|
||||
$variables['header_title'] = check_plain(faq_tt("taxonomy:term:$term->tid:name", $term->name));
|
||||
@@ -199,7 +209,7 @@ function template_preprocess_faq_category_questions_top(&$variables) {
|
||||
/**
|
||||
* Create categorized answers for FAQ page if set to show the questions on top.
|
||||
*
|
||||
* @param &$variables
|
||||
* @param array &$variables
|
||||
* Array reference of arguments given to the theme() function.
|
||||
*/
|
||||
function template_preprocess_faq_category_questions_top_answers(&$variables) {
|
||||
@@ -271,7 +281,6 @@ function template_preprocess_faq_category_questions_top_answers(&$variables) {
|
||||
$variables['subcat_body_list'] = faq_get_child_categories_faqs($term, 'faq_category_questions_top_answers', $default_weight, $default_sorting, $category_display, $variables['class'], $parent_term);
|
||||
}
|
||||
|
||||
|
||||
$nodes = array();
|
||||
foreach ($data as $node) {
|
||||
$node_var = array();
|
||||
@@ -290,4 +299,3 @@ function template_preprocess_faq_category_questions_top_answers(&$variables) {
|
||||
$variables['display_header'] = TRUE;
|
||||
}
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user