Most <em> tags replaced/removed

[mailer.git] / inc / template-functions.php

diff --git a/inc/template-functions.php b/inc/template-functions.php
index e8bbe8171ae416d8010e76d70d0fe0dc253b22f8..8ec37cc2bdf207d25482bae1fd8df9c175a06ebd 100644 (file)
--- a/inc/template-functions.php
+++ b/inc/template-functions.php
@@ -340,7 +340,7 @@ function loadTemplate ($template, $return = false, $content = array(), $compileC
                } elseif ((isAdmin()) || ((isInstalling()) && (!isInstalled()))) {
                        // Only admins shall see this warning or when installation mode is active
                        $ret = '<div class="para">
-       <span class="notice">{--TEMPLATE_404--}</span>
+       <span class="bad">{--TEMPLATE_404--}</span>
 </div>
 <div class="para">
        (' . $template . ')
@@ -1603,16 +1603,16 @@ function sendModeMails ($mod, $modes) {
 
                                default: // Unsupported module!
                                        logDebugMessage(__FUNCTION__, __LINE__, sprintf("Unsupported module %s detected.", $mod));
-                                       $content['message'] = '<span class="notice">{--UNKNOWN_MODULE--}</span>';
+                                       $content['message'] = '<span class="bad">{--UNKNOWN_MODULE--}</span>';
                                        break;
                        } // END - switch
                } else {
                        // Passwords mismatch
-                       $content['message'] = '<span class="notice">{--MEMBER_PASSWORD_ERROR--}</span>';
+                       $content['message'] = '<span class="bad">{--MEMBER_PASSWORD_ERROR--}</span>';
                }
        } else {
                // Could not load profile
-               $content['message'] = '<span class="notice">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
+               $content['message'] = '<span class="bad">{--MEMBER_CANNOT_LOAD_PROFILE--}</span>';
        }
 
        // Send email to user if required
@@ -1638,7 +1638,7 @@ function sendModeMails ($mod, $modes) {
 }
 
 // Generates a 'selection box' from given array
-function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '') {
+function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionContent = '', $extraName = '', $templateName = '') {
        // Start the output
        $OUT = '<select name="' . $name . '" size="1" class="form_select">
 <option value="X" disabled="disabled">{--PLEASE_SELECT--}</option>';
@@ -1647,8 +1647,14 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
        foreach ($options as $option) {
                // Add the <option> entry from ...
                if (empty($optionContent)) {
-                       // ... template
-                       $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+                       // Is a template name given?
+                       if (empty($templateName)) {
+                               // ... $name template
+                               $OUT .= loadTemplate('select_' . $name . $extraName . '_option', true, $option);
+                       } else {
+                               // ... $templateName template
+                               $OUT .= loadTemplate('select_' . $templateName . $extraName . '_option', true, $option);
+                       }
                } else {
                        // ... direct HTML code
                        $OUT .= '<option value="' . $option[$optionValue] . '">' . $option[$optionContent] . '</option>';
@@ -1664,7 +1670,13 @@ function generateSelectionBoxFromArray ($options, $name, $optionValue, $optionCo
        );
 
        // Load template and return it
-       return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+       if (empty($templateName)) {
+               // Use name from $name + $extraName
+               return loadTemplate('select_' . $name . $extraName . '_box', true, $content);
+       } else {
+               // Use name from $templateName + $extraName
+               return loadTemplate('select_' . $templateName . $extraName . '_box', true, $content);
+       }
 }
 
 // Prepares the header for HTML output
@@ -1798,7 +1810,7 @@ function doTemplateColorSwitch ($template, $clear = false, $return = true) {
 // Helper function for extension registration link
 function doTemplateExtensionRegistrationLink ($template, $clear, $ext_name) {
        // Default is all non-productive
-       $OUT = '<em style="cursor:help" class="notice" title="{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE=' . $ext_name . '%}">{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}</em>';
+       $OUT = '<div style="cursor:help" class="notice" title="{%message,ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK_TITLE=' . $ext_name . '%}">{--ADMIN_EXTENSION_IS_NON_PRODUCTIVE_LINK--}</div>';
 
        // Is the given extension non-productive?
        if (isExtensionProductive($ext_name)) {
@@ -1825,7 +1837,7 @@ function doTemplateAdminMemberMailLinks ($template, $clear, $mailId) {
 // Helper function to create a selection box for YES/NO configuration entries
 function doTemplateConfigurationYesNoSelectionBox ($template, $clear, $configEntry) {
        // Default is a "missing entry" warning
-       $OUT = '<em style="cursor:help" class="notice" title="{%message,ADMIN_CONFIG_ENTRY_MISSING=' . $configEntry . '%}">!' . $configEntry . '!</em>';
+       $OUT = '<div class="bad" style="cursor:help" title="{%message,ADMIN_CONFIG_ENTRY_MISSING=' . $configEntry . '%}">!' . $configEntry . '!</div>';
 
        // Generate the HTML code
        if (isConfigEntrySet($configEntry)) {