aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2011-01-03 05:28:08 +0000
committerrvelices <rv-github@modusoptimus.com>2011-01-03 05:28:08 +0000
commit7d6af124783aab12e8ca4877b1c12738813901c3 (patch)
tree5bddf0fd8c26dd69622ca0f09ba8cff39f21d51d
parent6f99445d757f3ed478918de553206de97b864227 (diff)
- fix js exception with web services in POST mode
- added accessor for registered scripts in template - added css rule for plugins (images in the categoryActions) it was previsously there but it dissapeared with the sprites git-svn-id: http://piwigo.org/svn/trunk@8449 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--include/template.class.php5
-rw-r--r--themes/default/js/scripts.js6
-rw-r--r--themes/default/theme.css5
3 files changed, 13 insertions, 3 deletions
diff --git a/include/template.class.php b/include/template.class.php
index 1fdb028fb..da3c4bb38 100644
--- a/include/template.class.php
+++ b/include/template.class.php
@@ -899,6 +899,11 @@ class ScriptLoader
$this->head_done_scripts = array();
$this->did_head = false;
}
+
+ function get_all()
+ {
+ return $this->registered_scripts;
+ }
function add_inline($code, $require)
{
diff --git a/themes/default/js/scripts.js b/themes/default/js/scripts.js
index bcc5c1e63..25707880a 100644
--- a/themes/default/js/scripts.js
+++ b/themes/default/js/scripts.js
@@ -77,14 +77,14 @@ PwgWS.prototype = {
}
}
- if (this.options.method == "POST" )
- this.xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
- else
+ if (this.options.method != "POST" )
{
url += "&"+body;
body = null;
}
this.xhr.open(this.options.method, url, this.options.async);
+ if (this.options.method == "POST" )
+ this.xhr.setRequestHeader("Content-Type", "application/x-www-form-urlencoded");
try {
this.xhr.send(body);
} catch(e) {
diff --git a/themes/default/theme.css b/themes/default/theme.css
index 2de359b4f..e8c62dbe3 100644
--- a/themes/default/theme.css
+++ b/themes/default/theme.css
@@ -132,6 +132,11 @@
display: inline;
}
+/*following rule not used directly but it is there for plugins*/
+.categoryActions IMG {
+ margin-bottom: -5px;
+}
+
/* begin chronology/calendar elements*/
.content .calendarViews {
display: block;