25 Sep
2011
25 Sep
'11
7:59 a.m.
The branch, master has been updated
via 16c5e7bab03d3651b05470bd1dcdf89a8998c08d (commit)
from 480e77e77e6a8f437ee50fa4c0603b494fe6407b (commit)
- Log -----------------------------------------------------------------
commit 16c5e7bab03d3651b05470bd1dcdf89a8998c08d
Author: Marc Delisle <marc(a)infomarc.info>
Date: Sun Sep 25 06:59:34 2011 -0400
Designer: broken image paths when used at the Javascript level
-----------------------------------------------------------------------
Summary of changes:
js/pmd/history.js | 4 ++--
js/pmd/move.js | 20 ++++++++++----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/js/pmd/history.js b/js/pmd/history.js
index 3e3a195..fdc76c8 100644
--- a/js/pmd/history.js
+++ b/js/pmd/history.js
@@ -68,10 +68,10 @@ function display(init,finit)
str +='<div class="block"> <table width
="250">';
str += '<thead><tr><td>';
if(history_array[i].get_and_or()){
- str +='<img src="pmd/images/or_icon.png"
onclick="and_or('+i+')" title="OR"/></td>';
+ str +='<img src="' + pmaThemeImage +
'pmd/or_icon.png" onclick="and_or('+i+')"
title="OR"/></td>';
}
else {
- str +='<img src="pmd/images/and_icon.png"
onclick="and_or('+i+')" title="AND"/></td>';
+ str +='<img src="' + pmaThemeImage +
'pmd/and_icon.png" onclick="and_or('+i+')"
title="AND"/></td>';
}
str +='<td style="padding-left: 5px;"
align="right"><img class="icon ic_b_sbrowse"
src="themes/dot.gif" title="column name"/></td><td
width="175" style="padding-left: 5px">' +
history_array[i].get_column_name();
if (history_array[i].get_type() == "GroupBy" ||
history_array[i].get_type() == "OrderBy") {
diff --git a/js/pmd/move.js b/js/pmd/move.js
index 6c3f56e..73d7c8f 100644
--- a/js/pmd/move.js
+++ b/js/pmd/move.js
@@ -636,7 +636,7 @@ function Small_tab_all(id_this) // max/min all tables
}
}
id_this.alt = ">";
- id_this.src = "pmd/images/rightarrow1.png";
+ id_this.src = pmaThemeImage + "pmd/rightarrow1.png";
} else {
for (key in j_tabs) {
if (document.getElementById('id_hide_tbody_'+key).innerHTML !=
"v") {
@@ -644,7 +644,7 @@ function Small_tab_all(id_this) // max/min all tables
}
}
id_this.alt = "v";
- id_this.src = "pmd/images/downarrow1.png";
+ id_this.src = pmaThemeImage + "pmd/downarrow1.png";
}
Re_load();
}
@@ -803,10 +803,10 @@ function Hide_tab_all(id_this) // max/min all tables
{
if (id_this.alt == 'v') {
id_this.alt = '>';
- id_this.src = "pmd/images/rightarrow1.png";
+ id_this.src = pmaThemeImage + "pmd/rightarrow1.png";
} else {
id_this.alt = 'v';
- id_this.src = "pmd/images/downarrow1.png";
+ id_this.src = pmaThemeImage + "pmd/downarrow1.png";
}
var E = document.form1;
for (i = 0; i < E.elements.length; i++) {
@@ -847,10 +847,10 @@ function No_have_constr(id_this)
if (id_this.alt == 'v') {
id_this.alt = '>';
- id_this.src = "pmd/images/rightarrow2.png";
+ id_this.src = pmaThemeImage + "pmd/rightarrow2.png";
} else {
id_this.alt = 'v';
- id_this.src = "pmd/images/downarrow2.png";
+ id_this.src = pmaThemeImage + "pmd/downarrow2.png";
}
var E = document.form1;
for (i = 0; i < E.elements.length; i++) {
@@ -921,7 +921,7 @@ function Show_left_menu(id_this) // max/min all tables
document.getElementById("layer_menu").style.left = pos.left +
'px';
document.getElementById("layer_menu").style.display = 'block';
id_this.alt = ">";
- id_this.src = "pmd/images/uparrow2_m.png";
+ id_this.src = pmaThemeImage + "pmd/uparrow2_m.png";
if (isIE) {
General_scroll();
}
@@ -929,7 +929,7 @@ function Show_left_menu(id_this) // max/min all tables
document.getElementById("layer_menu").style.top = -1000 + 'px';
//fast scroll
document.getElementById("layer_menu").style.display = 'none';
id_this.alt = "v";
- id_this.src = "pmd/images/downarrow2_m.png";
+ id_this.src = pmaThemeImage + "pmd/downarrow2_m.png";
}
}
//------------------------------------------------------------------------------
@@ -938,11 +938,11 @@ function Top_menu_right(id_this)
if (id_this.alt == ">") {
document.getElementById('top_menu').style.marginLeft =
document.getElementById('top_menu').offsetWidth + 'px'; // = 350
id_this.alt = "<";
- id_this.src = "pmd/images/2leftarrow_m.png";
+ id_this.src = pmaThemeImage + "pmd/2leftarrow_m.png";
} else {
document.getElementById('top_menu').style.marginLeft = 0;
id_this.alt = ">";
- id_this.src = "pmd/images/2rightarrow_m.png";
+ id_this.src = pmaThemeImage + "pmd/2rightarrow_m.png";
}
}
//------------------------------------------------------------------------------
hooks/post-receive
--
phpMyAdmin