Changeset 1000 in ExiteCMS

Timestamp:

10/23/07 15:01:25 (4 years ago)

Author:

root

Message:

Removed the main.advertising.tpl panel, moved it to the module template directory

Files:

• modules/common/advertising/php-files/modules/advertising/advertising.php (modified) (3 diffs)
• modules/common/advertising/php-files/modules/advertising/advertising_admin.php (modified) (1 diff)
• modules/common/advertising/php-files/modules/advertising/templates/modules.advertising.admin.tpl (copied) (copied from modules/common/advertising/php-files/modules/advertising/templates/modules.advertising.tpl)
• modules/common/advertising/php-files/modules/advertising/templates/modules.advertising.tpl (added)
• trunk/includes/templates/main.advertising.tpl (deleted)

modules/common/advertising/php-files/modules/advertising/advertising.php

@@ -10 +10 @@
 | the included gpl.txt file or visit http://gnu.org  |
 +----------------------------------------------------*/
-require_once dirname(__FILE__)."/includes/core_functions.php";
+require_once dirname(__FILE__)."/../../includes/core_functions.php";
 require_once PATH_ROOT."/includes/theme_functions.php";
 
@@ -16 +16 @@
 $variables = array();
 
-// include the locale for this module
-include PATH_LOCALE.LOCALESET."admin/adverts.php";
+// load the locale for this panel
+if (file_exists(PATH_MODULES."advertising/locale/".$settings['locale'].".php")) {
+        $locale_file = PATH_MODULES."advertising/locale/".$settings['locale'].".php";
+} else {
+        $locale_file = PATH_MODULES."advertising/locale/English.php";
+}
+include $locale_file;
 
 // include the sendmail module
@@ -258 +263 @@
 
 // define the body panel variables
-$template_panels[] = array('type' => 'body', 'name' => 'advertising', 'template' => 'main.advertising.tpl', 'locale' => PATH_LOCALE.LOCALESET."admin/adverts.php");
-$template_variables['advertising'] = $variables;
+$template_panels[] = array('type' => 'body', 'name' => 'modules.advertising', 'template' => 'modules.advertising.tpl', 'locale' => $locale_file);
+$template_variables['modules.advertising'] = $variables;
 
 // Call the theme code to generate the output for this webpage

modules/common/advertising/php-files/modules/advertising/advertising_admin.php

@@ -566 +566 @@
         $variables['errortitle'] = $errortitle;
     }
-    $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising', 'template' => 'modules.advertising.tpl', 'locale' => $locale_file);
-    $template_variables['modules.advertising'] = $variables;
+    $template_panels[] = array('type' => 'body', 'name' => 'modules.advertising.admin', 'template' => 'modules.advertising.admin.tpl', 'locale' => $locale_file);
+    $template_variables['modules.advertising.admin'] = $variables;
 
     // loop through all advertising clients