Index: trunk/CHANGELOG
===================================================================
--- trunk/CHANGELOG (revision 1085)
+++ trunk/CHANGELOG (revision 1086)
@@ -12,6 +12,8 @@
------------------------------------- 2.8.0 -------------------------------------
20-July 2009 Matthias Gallas
+! Moved backend.js back from to
++ Added possibility to add a backend_body.js to modules wich is then called in
+ Readded admin/images folder to keep backward compatibility to old modules
19-July 2009 Matthias Gallas
# Fixed display issue of jsadmin in backend themes (Thanks to Argos)
Index: trunk/wb/framework/class.admin.php
===================================================================
--- trunk/wb/framework/class.admin.php (revision 1085)
+++ trunk/wb/framework/class.admin.php (revision 1086)
@@ -201,7 +201,7 @@
$footer_template->set_file('page', 'footer.htt');
$footer_template->set_block('page', 'footer_block', 'header');
$footer_template->set_var(array(
- 'BACKEND_MODULE_JS' => $this->register_backend_modfiles('js'),
+ 'BACKEND_BODY_MODULE_JS' => $this->register_backend_modfiles_body('js'),
'WB_URL' => WB_URL,
'WB_PATH' => WB_PATH,
'ADMIN_URL' => ADMIN_URL,
@@ -323,11 +323,72 @@
}
}
+ // Function to add optional module Javascript or CSS stylesheets into the section of the backend
+ function register_backend_modfiles_body($file_id="js")
+ {
+ // sanity check of parameter passed to the function
+ $file_id = strtolower($file_id);
+ if($file_id !== "javascript" && $file_id !== "js")
+ {
+ return;
+ }
+ global $database;
+ $body_links = "";
+ // define default baselink and filename for optional module javascript and stylesheet files
+ if($file_id == "js") {
+ $base_link = '';
+ $base_file = "backend_body.js";
+ }
+ // check if backend_body.js files needs to be included to the section of the backend
+ if(isset($_GET['tool']))
+ {
+ // check if displayed page contains a installed admin tool
+ $result = $database->query("SELECT * FROM " .TABLE_PREFIX ."addons
+ WHERE type = 'module' AND function = 'tool' AND directory = '".addslashes($_GET['tool'])."'");
+ if($result->numRows())
+ {
+ // check if admin tool directory contains a backend_body.js file to include
+ $tool = $result->fetchRow();
+ if(file_exists(WB_PATH ."/modules/" .$tool['directory'] ."/$base_file"))
+ {
+ // return link to the backend_body.js file
+ return str_replace("{MODULE_DIRECTORY}", $tool['directory'], $base_link);
+ }
+ }
+ } elseif(isset($_GET['page_id']) or isset($_POST['page_id']))
+ {
+ // check if displayed page in the backend contains a page module
+ if (isset($_GET['page_id']))
+ {
+ $page_id = (int) addslashes($_GET['page_id']);
+ } else {
+ $page_id = (int) addslashes($_POST['page_id']);
+ }
+ // gather information for all models embedded on actual page
+ $query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections
+ WHERE page_id=$page_id");
+ while($row = $query_modules->fetchRow()) {
+ // check if page module directory contains a backend_body.js file
+ if(file_exists(WB_PATH ."/modules/" .$row['module'] ."/$base_file")) {
+ // create link with backend_body.js source for the current module
+ $tmp_link = str_replace("{MODULE_DIRECTORY}", $row['module'], $base_link);
+ // ensure that backend_body.js is only added once per module type
+ if(strpos($body_links, $tmp_link) === false) {
+ $body_links .= $tmp_link ."\n";
+ }
+ }
+ }
+ // write out links with all external module javascript/CSS files, remove last line feed
+ return rtrim($body_links);
+ }
+ }
+
+
// Function to add optional module Javascript or CSS stylesheets into the section of the backend
function register_backend_modfiles($file_id="css") {
// sanity check of parameter passed to the function
$file_id = strtolower($file_id);
- if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
+ if($file_id !== "css" && $file_id !== "javascript" && $file_id !== "js") {
return;
}
@@ -335,7 +396,7 @@
// define default baselink and filename for optional module javascript and stylesheet files
$head_links = "";
if($file_id == "css") {
- $base_link = ' section of the backend
if(isset($_GET['tool'])) {
// check if displayed page contains a installed admin tool
- $result = $database->query("SELECT * FROM " .TABLE_PREFIX ."addons
+ $result = $database->query("SELECT * FROM " .TABLE_PREFIX ."addons
WHERE type = 'module' AND function = 'tool' AND directory = '".addslashes($_GET['tool'])."'");
if($result->numRows()) {
@@ -366,7 +427,7 @@
}
// gather information for all models embedded on actual page
- $query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections
+ $query_modules = $database->query("SELECT module FROM " .TABLE_PREFIX ."sections
WHERE page_id=$page_id");
while($row = $query_modules->fetchRow()) {
Index: trunk/wb/templates/classic_theme/templates/header.htt
===================================================================
--- trunk/wb/templates/classic_theme/templates/header.htt (revision 1085)
+++ trunk/wb/templates/classic_theme/templates/header.htt (revision 1086)
@@ -10,6 +10,7 @@
{BACKEND_MODULE_CSS}
+{BACKEND_MODULE_JS}
-{BACKEND_MODULE_JS}
+{BACKEND_BODY_MODULE_JS}
\ No newline at end of file
Index: trunk/wb/templates/wb_theme/templates/header.htt
===================================================================
--- trunk/wb/templates/wb_theme/templates/header.htt (revision 1085)
+++ trunk/wb/templates/wb_theme/templates/header.htt (revision 1086)
@@ -10,6 +10,7 @@
{BACKEND_MODULE_CSS}
+{BACKEND_MODULE_JS}
-{BACKEND_MODULE_JS}
+{BACKEND_BODY_MODULE_JS}
\ No newline at end of file
Index: trunk/wb/templates/argos_theme/templates/footer.htt
===================================================================
--- trunk/wb/templates/argos_theme/templates/footer.htt (revision 1085)
+++ trunk/wb/templates/argos_theme/templates/footer.htt (revision 1086)
@@ -37,7 +37,7 @@
}
-{BACKEND_MODULE_JS}
+{BACKEND_BODY_MODULE_JS}