fixed [ 915498 ] htmlArea - insert image WebGUI 6.0
This commit is contained in:
JT Smith
parent
7ee5a4a4bc
commit
6a3a4627f7
7 changed files with 30 additions and 10 deletions
|
|
@ -23,6 +23,7 @@ Andreas Graf).
|
|||
Mountifield.)
|
||||
- Added Tony Mountifield to the credits list for all his debugging efforts as
|
||||
of late.
|
||||
- Bugfix [ 915498 ] htmlArea - insert image WebGUI 6.0
|
||||
|
||||
|
||||
6.0.0
|
||||
|
|
|
|||
|
|
@ -82,5 +82,6 @@ update Navigation set depth=99 where depth=0;
|
|||
delete from international where internationalId=981 and namespace='WebGUI';
|
||||
delete from template where namespace='Macro/L_loginBox' and templateId=2;
|
||||
INSERT INTO template VALUES (2,'Horizontal Login Box','<div class=\"loginBox\">\n<tmpl_if user.isVisitor>\n <tmpl_var form.header>\n <table border=\"0\" class=\"loginBox\" cellpadding=\"1\" cellspacing=\"0\">\n <tr>\n <td><tmpl_var username.form></td>\n <td><tmpl_var password.form></td>\n <td><tmpl_var form.login></td>\n </tr>\n <tr>\n <td><tmpl_var username.label></td>\n <td><tmpl_var password.label></td>\n <td></td>\n </tr>\n </table> <tmpl_if session.setting.anonymousRegistration>\n <a href=\"<tmpl_var account.create.url>\"><tmpl_var account.create.label></a>\n </tmpl_if> <tmpl_var form.footer> \n<tmpl_else>\n <tmpl_unless customText>\n <tmpl_var hello.label> <a href=\"<tmpl_var account.display.url>\"><tmpl_var session.user.username></a>.\n <tmpl_var logout.label><br />\n <tmpl_else>\n <tmpl_var customText>\n </tmpl_unless>\n</tmpl_if>\n</div>\n','Macro/L_loginBox',1,1);
|
||||
|
||||
delete from template where namespace='richEditor' and templateId=1;
|
||||
INSERT INTO template VALUES (1,'HTMLArea','<script language=\"JavaScript\">\r\nfunction fixChars(element) {\r\n element.value = element.value.replace(/~V/mg,\"-\");\r\n}\r\n</script>\r\n\r\n<tmpl_if htmlArea.supported>\r\n <tmpl_if popup>\r\n <script language=\"JavaScript\">\r\n var formObj;\r\n var extrasDir=\"<tmpl_var session.config.extrasURL>\";\r\n function openEditWindow(obj) {\r\n formObj = obj;\r\n window.open(\"<tmpl_var session.config.extrasURL>/htmlArea/editor.html\",\"editWindow\",\"width=490,height=400,resizable=1\");\r\n }\r\n function setContent(content) {\r\n formObj.value = content;\r\n }\r\n </script>\r\n <tmpl_else>\r\n <script language=\"JavaScript\" src=\"<tmpl_var session.config.extrasURL>/htmlArea/editor.js\"></script>\r\n <script>\r\n var master = window;\n _editor_url = \"<tmpl_var session.config.extrasURL>/htmlArea/\";\r\n </script> \r\n </tmpl_if>\r\n</tmpl_if>\r\n\r\n<tmpl_var textarea>\r\n\r\n<tmpl_if htmlArea.supported>\r\n <script language=\"Javascript1.2\">\r\n editor_generate(\"<tmpl_var form.name>\");\r\n </script>\r\n</tmpl_if>\r\n','richEditor',1,1);
|
||||
|
||||
|
|
|
|||
|
|
@ -105,7 +105,16 @@ sub process {
|
|||
<meta http-equiv="Content-Type" content="text/html; charset='.($session{header}{charset}||$session{language}{characterSet}||"ISO-8859-1").'" />
|
||||
<link rel="icon" href="'.$session{setting}{siteicon}.'" type="image/'.$type.'" />
|
||||
<link rel="SHORTCUT ICON" href="'.$session{setting}{favicon}.'" />
|
||||
'.$session{page}{head}{raw};
|
||||
'.$session{page}{head}{raw}.'
|
||||
<script>
|
||||
function getWebguiProperty (propName) {
|
||||
var props = new Array();
|
||||
props["extrasURL"] = "'.$session{config}{extrasURL}.'";
|
||||
props["pageURL"] = "'.$session{page}{url}.'";
|
||||
return props[propName];
|
||||
}
|
||||
</script>
|
||||
';
|
||||
# generate additional link tags
|
||||
foreach my $url (keys %{$session{page}{head}{link}}) {
|
||||
$var{'head.tags'} .= '<link href="'.$url.'"';
|
||||
|
|
|
|||
|
|
@ -22,6 +22,7 @@ function doneEditing() {
|
|||
window.opener.setContent(editor_getHTML('yourFieldNameHere'));
|
||||
window.close();
|
||||
}
|
||||
var master = opener;
|
||||
</script>
|
||||
|
||||
<script language="Javascript1.2"><!-- // load htmlarea
|
||||
|
|
|
|||
|
|
@ -35,7 +35,8 @@ document.write('</SCR' + 'IPT\> \n');
|
|||
\* ---------------------------------------------------------------------- */
|
||||
|
||||
function editor_defaultConfig(objname) {
|
||||
|
||||
this.webguiPageUrl = master.getWebguiProperty("pageURL");
|
||||
//this.webguiPageUrl = "/test.pl";
|
||||
this.version = "2.02"
|
||||
|
||||
this.width = "auto";
|
||||
|
|
@ -636,7 +637,10 @@ oTags[i].outerHTML = oTags[i].innerHTML;
|
|||
|
||||
// insert image
|
||||
else if (cmdID.toLowerCase() == 'insertimage'){
|
||||
showModalDialog(_editor_url + "popups/insert_image.html", editdoc, "resizable: no; help: no; status: no; scroll: no; ");
|
||||
var args = new Array();
|
||||
args[0] = editdoc;
|
||||
args[1] = config.webguiPageUrl;
|
||||
showModalDialog(_editor_url + "popups/insert_image.html", args, "dialogWidth:600px; dialogHeight: 650px;resizable: no; help: no; status: no; scroll: no; ");
|
||||
}
|
||||
|
||||
// insert table
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ if (window.dialogArguments) { opener = window.dialogArguments; }
|
|||
|
||||
var _editor_url = "../";
|
||||
document.write('<scr'+'ipt src="' +_editor_url+ 'editor.js" language="Javascript1.2"></scr'+'ipt>');
|
||||
|
||||
var master = opener.master;
|
||||
var parent_objname = location.search.substring(1,location.search.length); // parent editor objname
|
||||
var parent_config = opener.document.all[parent_objname].config;
|
||||
|
||||
|
|
@ -128,4 +128,4 @@ function update_parent() {
|
|||
|
||||
<textarea name="editor" style="width:100%; height:300px"></textarea><br>
|
||||
|
||||
</body></html>
|
||||
</body></html>
|
||||
|
|
|
|||
|
|
@ -78,17 +78,19 @@ function HandleError(message, url, line) {
|
|||
}
|
||||
|
||||
function Init() {
|
||||
var dialogArgs = window.dialogArguments;
|
||||
var globalDoc = dialogArgs[0];
|
||||
var pageURL = dialogArgs[1];
|
||||
var elmSelectedImage;
|
||||
var htmlSelectionControl = "Control";
|
||||
var globalDoc = window.dialogArguments;
|
||||
var grngMaster = globalDoc.selection.createRange();
|
||||
var dpi = 96;
|
||||
|
||||
if(document.all.dpicheck) {
|
||||
dpi = document.all.dpicheck.width;
|
||||
}
|
||||
document.all.lister.contentWindow.navigate('/?op=htmlArealistCollateral&DPI=' + dpi);
|
||||
document.all.viewer.contentWindow.navigate('/?op=htmlAreaviewCollateral&DPI=' + dpi);
|
||||
document.all.lister.contentWindow.navigate(pageURL + '?op=htmlArealistCollateral&DPI=' + dpi);
|
||||
document.all.viewer.contentWindow.navigate(pageURL + '?op=htmlAreaviewCollateral&DPI=' + dpi);
|
||||
document.all.actions.DPI.value = dpi;
|
||||
if(dpi != 96) {
|
||||
var xfactor = ((dpi < 96) ? (dpi / 95) : (dpi / 97.5));
|
||||
|
|
@ -144,7 +146,9 @@ function OKClick() {
|
|||
var elmImage;
|
||||
var intAlignment;
|
||||
var htmlSelectionControl = "Control";
|
||||
var globalDoc = window.dialogArguments;
|
||||
var dialogArgs = window.dialogArguments;
|
||||
var globalDoc = dialogArgs[0];
|
||||
var pageURL = dialogArgs[1];
|
||||
var grngMaster = globalDoc.selection.createRange();
|
||||
|
||||
// error checking
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue