diff --git a/inc/lang/de/lang.php b/inc/lang/de/lang.php
index 037456af1449cd7fad8375b4e28f9970bd826d75..a3b43e3506808c49ea23cc25811b38d66d3bad2c 100644
--- a/inc/lang/de/lang.php
+++ b/inc/lang/de/lang.php
@@ -148,8 +148,8 @@ $lang['qb_chars'] = 'Sonderzeichen';
$lang['del_confirm']= 'Eintrag wirklich löschen?';
-$lang['admin_acl'] = 'Zugangsverwaltung...';
-$lang['admin_register']= 'Neuen Benutzer anmelden...';
+$lang['admin_acl'] = 'Zugangsverwaltung';
+$lang['admin_register']= 'Neuen Benutzer anmelden';
$lang['acl_group'] = 'Gruppe';
$lang['acl_user'] = 'Benutzer';
diff --git a/inc/lang/en/lang.php b/inc/lang/en/lang.php
index fc1be1a27e04949736fb4d92f3169e1830f12984..f83ce12290b7b48595ffe9cba51f640dec32dda2 100644
--- a/inc/lang/en/lang.php
+++ b/inc/lang/en/lang.php
@@ -77,7 +77,7 @@ $lang['resendpwdnouser'] = 'Sorry, we can\'t find this user in our database.';
$lang['resendpwdsuccess'] = 'Your new password has been sent by email.';
$lang['txt_upload'] = 'Select file to upload';
-$lang['txt_filename'] = 'Enter wikiname (optional)';
+$lang['txt_filename'] = 'Upload as (optional)';
$lang['txt_overwrt'] = 'Overwrite existing file';
$lang['lockedby'] = 'Currently locked by';
$lang['lockexpire'] = 'Lock expires at';
@@ -144,10 +144,10 @@ $lang['qb_sig'] = 'Insert Signature';
$lang['qb_smileys'] = 'Smileys';
$lang['qb_chars'] = 'Special Chars';
-$lang['del_confirm']= 'Delete this entry?';
+$lang['del_confirm']= 'Really delete selected item(s)?';
-$lang['admin_acl'] = 'Access Control List Management...';
-$lang['admin_register']= 'Add new user...';
+$lang['admin_acl'] = 'Access Control List Management';
+$lang['admin_register']= 'Add new user';
$lang['acl_group'] = 'Group';
$lang['acl_user'] = 'User';
diff --git a/lib/exe/js.php b/lib/exe/js.php
index b776f957bcf9329abc560957b2f1234ad185369f..56fa8575adecc83ef4516d59f41808d0d1b2255d 100644
--- a/lib/exe/js.php
+++ b/lib/exe/js.php
@@ -65,8 +65,9 @@ function js_out(){
ob_start();
// add some translation strings and global variables
- print "var alertText = '".str_replace('\\\\n','\\n',addslashes($lang['qb_alert']))."';";
- print "var notSavedYet = '".str_replace('\\\\n','\\n',addslashes($lang['notsavedyet']))."';";
+ print "var alertText = '".js_escape($lang['qb_alert'])."';";
+ print "var notSavedYet = '".js_escape($lang['notsavedyet'])."';";
+ print "var reallyDel = '".js_escape($lang['del_confirm'])."';";
print "var DOKU_BASE = '".DOKU_BASE."';";
// load files
diff --git a/lib/plugins/usermanager/admin.php b/lib/plugins/usermanager/admin.php
index 611a99b2edac1c4ae17b76b6592c8ea035903aa6..64ef0f5ff17f0503068f2f92a277dcf14487f4eb 100644
--- a/lib/plugins/usermanager/admin.php
+++ b/lib/plugins/usermanager/admin.php
@@ -192,7 +192,7 @@ class admin_plugin_usermanager extends DokuWiki_Admin_Plugin {
ptln(" <tbody>");
ptln(" <tr><td colspan=\"6\" style=\"text-align:center\">");
ptln(" <span style=\"float:left\">");
- ptln(" <input type=\"submit\" name=\"fn[delete]\" ".$delete_disable." value=\"".$this->lang['delete_selected']."\"/>");
+ ptln(" <input type=\"submit\" name=\"fn[delete]\" ".$delete_disable." value=\"".$this->lang['delete_selected']."\" id=\"usrmgr__del\" />");
ptln(" </span>");
ptln(" <span style=\"float:right\">");
ptln(" <input type=\"submit\" name=\"fn[start]\" ".$page_buttons['start']." value=\"".$this->lang['start']."\" />");
diff --git a/lib/scripts/domTT.js b/lib/scripts/domTT.js
index f6887968a1c858f61988919034016682a39affd6..77fe89913fba5c4da7f05d26c6edc24c89e18344 100644
--- a/lib/scripts/domTT.js
+++ b/lib/scripts/domTT.js
@@ -114,7 +114,7 @@ if (domLib_useLibrary && domTT_useGlobalMousePosition)
{
domTT_dragUpdate(in_event);
}
- }
+ };
}
// }}}
@@ -275,7 +275,7 @@ function domTT_activate(in_this, in_event)
options.set('activateTimeout', domLib_setTimeout(domTT_runShow, options.get('delay'), [owner.id, in_event]));
return owner.id;
-}
+};
// }}}
// {{{ domTT_create()
@@ -587,7 +587,7 @@ function domTT_create(in_options)
in_options.set('node', tipObj);
in_options.set('status', 'inactive');
-}
+};
// }}}
// {{{ domTT_show()
diff --git a/lib/scripts/script.js b/lib/scripts/script.js
index d589aa0b404995aeaca0108154a78a2c609a7c7b..a8c6fe3fdc63e63c02d1aa809646bc16eb26cc22 100644
--- a/lib/scripts/script.js
+++ b/lib/scripts/script.js
@@ -16,6 +16,30 @@ if (clientPC.indexOf('opera')!=-1) {
var is_opera_seven = (window.opera && document.childNodes);
}
+/**
+ * Handy shortcut to document.getElementById
+ *
+ * This function was taken from the prototype library
+ *
+ * @link http://prototype.conio.net/
+ */
+function $() {
+ var elements = new Array();
+
+ for (var i = 0; i < arguments.length; i++) {
+ var element = arguments[i];
+ if (typeof element == 'string')
+ element = document.getElementById(element);
+
+ if (arguments.length == 1)
+ return element;
+
+ elements.push(element);
+ }
+
+ return elements;
+}
+
/**
* Get the X offset of the top left corner of the given object
*
@@ -27,7 +51,7 @@ function findPosX(object){
if(typeof(object) == 'object'){
obj = object;
}else{
- obj = document.getElementById(object);
+ obj = $(object);
}
if (obj.offsetParent){
while (obj.offsetParent){
@@ -52,7 +76,7 @@ function findPosY(object){
if(typeof(object) == 'object'){
obj = object;
}else{
- obj = document.getElementById(object);
+ obj = $(object);
}
if (obj.offsetParent){
while (obj.offsetParent){
@@ -129,7 +153,7 @@ function showLoadBar(){
*/
function hideLoadBar(){
if(document.getElementById){
- document.getElementById('loading').style.display="none";
+ $('loading').style.display="none";
}
}
@@ -160,7 +184,7 @@ function suggestWikiname(){
*/
function addTocToggle() {
if(!document.getElementById) return;
- var header = document.getElementById('toc__header');
+ var header = $('toc__header');
if(!header) return;
var showimg = document.createElement('img');
@@ -184,9 +208,9 @@ function addTocToggle() {
* This toggles the visibility of the Table of Contents
*/
function toggleToc() {
- var toc = document.getElementById('toc__inside');
- var showimg = document.getElementById('toc__show');
- var hideimg = document.getElementById('toc__hide');
+ var toc = $('toc__inside');
+ var showimg = $('toc__show');
+ var hideimg = $('toc__hide');
if(toc.style.display == 'none') {
toc.style.display = '';
hideimg.style.display = '';
@@ -254,7 +278,7 @@ function fixDate(date) {
*/
function checkAclLevel(){
if(document.getElementById) {
- var scope = document.getElementById('acl_scope').value;
+ var scope = $('acl_scope').value;
//check for namespace
if( (scope.indexOf(":*") > 0) || (scope == "*") ){
@@ -270,7 +294,9 @@ function checkAclLevel(){
}
}
-/* insitu footnote addition
+/**
+ * insitu footnote addition
+ *
* provide a wrapper for domTT javascript library
* this function is placed in the onmouseover event of footnote references in the main page
*
@@ -280,17 +306,17 @@ var currentFootnote = 0;
function fnt(id, e, evt) {
if (currentFootnote && id != currentFootnote) {
- domTT_close(document.getElementById('insitu-fn'+currentFootnote));
+ domTT_close($('insitu-fn'+currentFootnote));
}
// does the footnote tooltip already exist?
- var fnote = document.getElementById('insitu-fn'+id);
+ var fnote = $('insitu-fn'+id);
var footnote;
if (!fnote) {
// if not create it...
// locate the footnote anchor element
- var a = document.getElementById( "fn"+id );
+ var a = $( "fn"+id );
if (!a){ return; }
// anchor parent is the footnote container, get its innerHTML
@@ -318,8 +344,8 @@ function fnt(id, e, evt) {
function initSizeCtl(ctlid,edid){
if(!document.getElementById){ return; }
- var ctl = document.getElementById(ctlid);
- var textarea = document.getElementById(edid);
+ var ctl = $(ctlid);
+ var textarea = $(edid);
var hgt = getCookie('DokuWikisizeCtl');
if(hgt === null || hgt === ''){
@@ -342,7 +368,7 @@ function initSizeCtl(ctlid,edid){
* This sets the vertical size of the editbox
*/
function sizeCtl(edid,val){
- var textarea = document.getElementById(edid);
+ var textarea = $(edid);
var height = parseInt(textarea.style.height.substr(0,textarea.style.height.length-2));
height += val;
textarea.style.height = height+'px';