bachir/materio-base-legacy
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated webform & faq

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2020-03-27 14:25:57 +01:00
parent 1e27fcca51
commit be549a75f6
35 changed files with 569 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sites/all/modules/contrib/users/faq/includes/faq.hide_answer.inc
View File

@@ -63,7 +63,7 @@ function template_preprocess_faq_category_hide_answer(&$variables) {
$this_page = $_GET['q'];
$get_child_terms = 0;
// Check if we're on a faq page.
if (arg(0) == 'faq-page') {
if (arg(0) == _faq_path()) {
// Check if we're on a categorized faq page.
if (is_numeric(arg(1))) {
$get_child_terms = arg(1);
@@ -85,7 +85,7 @@ function template_preprocess_faq_category_hide_answer(&$variables) {
// Get taxonomy image.
$variables['term_image'] = '';
if (module_exists('taxonomy_image')) {
if (module_exists('taxonomy_image') && function_exists('taxonomy_image_display')) {
$variables['term_image'] = taxonomy_image_display($term->tid, array('class' => 'faq-tax-image'));
}
@@ -120,7 +120,7 @@ function template_preprocess_faq_category_hide_answer(&$variables) {
// Configure sub-category bodies (theme recursively).
$variables['subcat_body_list'] = array();
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != 'faq-page') || $hide_child_terms) && $category_display == 'hide_qa')) {
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != _faq_path()) || $hide_child_terms) && $category_display == 'hide_qa')) {
$variables['subcat_body_list'] = faq_get_child_categories_faqs($term, 'faq_category_hide_answer', $default_weight, $default_sorting, $category_display, $variables['class'], $parent_term);
}

6
sites/all/modules/contrib/users/faq/includes/faq.new_page.inc
View File

@@ -55,7 +55,7 @@ function template_preprocess_faq_category_new_page(&$variables) {
// Initialise some variables.
$get_child_terms = 0;
// Check if we're on a faq page.
if (arg(0) == 'faq-page') {
if (arg(0) == _faq_path()) {
// Check if we're on a categorized faq page.
if (is_numeric(arg(1))) {
$get_child_terms = arg(1);
@@ -83,7 +83,7 @@ function template_preprocess_faq_category_new_page(&$variables) {
// Get taxonomy image.
$variables['term_image'] = '';
if (module_exists('taxonomy_image')) {
if (module_exists('taxonomy_image') && function_exists('taxonomy_image_display')) {
$variables['term_image'] = taxonomy_image_display($term->tid, array('class' => 'faq-tax-image'));
}
@@ -117,7 +117,7 @@ function template_preprocess_faq_category_new_page(&$variables) {
// Configure sub-category bodies (theme recursively).
$variables['subcat_body_list'] = array();
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != 'faq-page') || $hide_child_terms) && $category_display == 'hide_qa')) {
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != _faq_path()) || $hide_child_terms) && $category_display == 'hide_qa')) {
$variables['subcat_body_list'] = faq_get_child_categories_faqs($term, 'faq_category_new_page', $default_weight, $default_sorting, $category_display, $variables['class'], $parent_term);
}

6
sites/all/modules/contrib/users/faq/includes/faq.questions_inline.inc
View File

@@ -74,7 +74,7 @@ function template_preprocess_faq_category_questions_inline(&$variables) {
$this_page = $_GET['q'];
$get_child_terms = 0;
// Check if we're on a faq page.
if (arg(0) == 'faq-page') {
if (arg(0) == _faq_path()) {
// Check if we're on a categorized faq page.
if (is_numeric(arg(1))) {
$get_child_terms = arg(1);
@@ -107,7 +107,7 @@ function template_preprocess_faq_category_questions_inline(&$variables) {
// Get taxonomy image.
$variables['term_image'] = '';
if (module_exists('taxonomy_image')) {
if (module_exists('taxonomy_image') && function_exists('taxonomy_image_display')) {
$variables['term_image'] = taxonomy_image_display($term->tid, array('class' => 'faq-tax-image'));
}
@@ -141,7 +141,7 @@ function template_preprocess_faq_category_questions_inline(&$variables) {
// Configure sub-category bodies (theme recursively).
$variables['subcat_body_list'] = array();
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != 'faq-page') || $hide_child_terms) && $category_display == 'hide_qa')) {
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != _faq_path()) || $hide_child_terms) && $category_display == 'hide_qa')) {
$variables['subcat_body_list'] = faq_get_child_categories_faqs($term, 'faq_category_questions_inline', $default_weight, $default_sorting, $category_display, $variables['class'], $parent_term);
}

10
sites/all/modules/contrib/users/faq/includes/faq.questions_top.inc
View File

@@ -103,7 +103,7 @@ function template_preprocess_faq_category_questions_top(&$variables) {
$this_page = $_GET['q'];
$get_child_terms = 0;
// Check if we're on a faq page.
if (arg(0) == 'faq-page') {
if (arg(0) == _faq_path()) {
// Check if we're on a categorized faq page.
if (is_numeric(arg(1))) {
$get_child_terms = arg(1);
@@ -128,7 +128,7 @@ function template_preprocess_faq_category_questions_top(&$variables) {
// Get taxonomy image.
$variables['term_image'] = '';
if (module_exists('taxonomy_image')) {
if (module_exists('taxonomy_image') && function_exists('taxonomy_image_display')) {
$variables['term_image'] = taxonomy_image_display($term->tid, array('class' => 'faq-tax-image'));
}
@@ -163,7 +163,7 @@ function template_preprocess_faq_category_questions_top(&$variables) {
// Configure sub-category bodies (theme recursively).
$variables['subcat_body_list'] = array();
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != 'faq-page') || $hide_child_terms) && $category_display == 'hide_qa')) {
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != _faq_path()) || $hide_child_terms) && $category_display == 'hide_qa')) {
$variables['subcat_body_list'] = faq_get_child_categories_faqs($term, 'faq_category_questions_top', $default_weight, $default_sorting, $category_display, $variables['class'], $parent_term);
}
@@ -253,7 +253,7 @@ function template_preprocess_faq_category_questions_top_answers(&$variables) {
$this_page = $_GET['q'];
$get_child_terms = 0;
// Check if we're on a faq page.
if (arg(0) == 'faq-page') {
if (arg(0) == _faq_path()) {
// Check if we're on a categorized faq page.
if (is_numeric(arg(1))) {
$get_child_terms = arg(1);
@@ -277,7 +277,7 @@ function template_preprocess_faq_category_questions_top_answers(&$variables) {
// Configure sub-category bodies (theme recursively).
$variables['subcat_body_list'] = array();
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != 'faq-page') || $hide_child_terms) && $category_display == 'hide_qa')) {
if (($get_child_terms && $category_display == 'categories_inline') || ((($show_term_page_children && $this_page != _faq_path()) || $hide_child_terms) && $category_display == 'hide_qa')) {
$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);
}