Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-08 17:13:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Insertion of pictures half finished

Browse Source 
SVN revision: 1925
This commit is contained in:
Stefan Ritt 2007-09-20 21:19:37 +00:00
parent 753f68ffce
commit 86636176e4
3 changed files with 105 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
scripts/fckeditor/editor/plugins/elog/fckplugin.js
View File

@ -46,6 +46,30 @@ oELOGSubmitCommand.GetState = function()
FCKCommands.RegisterCommand('ELOGSubmit', oELOGSubmitCommand); FCKCommands.RegisterCommand('ELOGSubmit', oELOGSubmitCommand);
/*---- 'ELOGImage' ------------------------------------------------*/
// Register 'ELOGImage' toolbar button
var oELOGImage = new FCKToolbarButton('ELOGImage', 'Insert Image', null, null, true, null, 37);
FCKToolbarItems.RegisterItem('ELOGImage', oELOGImage);
// Register 'ELOGImage' command
var oELOGImageCommand = new Object();
oELOGImageCommand.Name = 'ELOGImage';
oELOGImageCommand.Execute = function()
{
window.open('../../'+parent.logbook+'/upload.html?next_attachment='+parent.next_attachment, '',
'top=280,left=350,width=500,height=120,dependent=yes,menubar=no,status=no,scrollbars=no,location=no,resizable=yes');
}
oELOGImageCommand.GetState = function()
{
// This function is always enabled.
return FCK_TRISTATE_OFF ;
}
FCKCommands.RegisterCommand('ELOGImage', oELOGImageCommand);
/*---- 'InsertTime' ------------------------------------------------*/ /*---- 'InsertTime' ------------------------------------------------*/
// Create 'InsertTime' toolbar button // Create 'InsertTime' toolbar button

2
scripts/fckeditor/fckelog.js
View File

@ -13,7 +13,7 @@ FCKConfig.ToolbarSets["Default"] = [
['OrderedList','UnorderedList','-','Outdent','Indent'], ['OrderedList','UnorderedList','-','Outdent','Indent'],
['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'], ['JustifyLeft','JustifyCenter','JustifyRight','JustifyFull'],
['Link','Unlink','Anchor'], ['Link','Unlink','Anchor'],
['Image','Table','Rule','Smiley','SpecialChar','InsertTime'], ['ELOGImage','Table','Rule','Smiley','SpecialChar','InsertTime'],
['Style','FontFormat','FontName','FontSize'], ['Style','FontFormat','FontName','FontSize'],
['TextColor','BGColor'], ['TextColor','BGColor'],
['About'] ['About']

117
src/elogd.c
View File

@ -7147,11 +7147,12 @@ void show_standard_header(LOGBOOK * lbs, BOOL expires, char *title, char *path,
rsprintf("<script type=\"text/javascript\">\n"); rsprintf("<script type=\"text/javascript\">\n");
rsprintf("<!--\n"); rsprintf("<!--\n");
if (stristr(browser, "MSIE") && !stristr(browser, "opera")) if (stristr(browser, "MSIE") && !stristr(browser, "opera"))
rsprintf("browser = \"MSIE\";\n"); rsprintf("var browser = \"MSIE\";\n");
else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror")) else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror"))
rsprintf("browser = \"Mozilla\";\n"); rsprintf("var browser = \"Mozilla\";\n");
else else
rsprintf("browser = \"Other\";\n"); rsprintf("var browser = \"Other\";\n");
rsprintf("logbook = \"%s\";\n", lbs->name_enc);
rsprintf("//-->\n"); rsprintf("//-->\n");
rsprintf("</script>\n"); rsprintf("</script>\n");
rsprintf("<script type=\"text/javascript\" src=\"../elcode.js\"></script>\n\n"); rsprintf("<script type=\"text/javascript\" src=\"../elcode.js\"></script>\n\n");
@ -9455,28 +9456,30 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf(" document.form1.submit();\n"); rsprintf(" document.form1.submit();\n");
rsprintf("}\n\n"); rsprintf("}\n\n");
if (!getcfg(lbs->name, "Message height", str, sizeof(str)) && if (enc_selected != 2) {
!getcfg(lbs->name, "Message width", str, sizeof(str))) { if (!getcfg(lbs->name, "Message height", str, sizeof(str)) &&
/* javascript for resizing edit box */ !getcfg(lbs->name, "Message width", str, sizeof(str))) {
rsprintf("\nfunction init_resize()\n"); /* javascript for resizing edit box */
rsprintf("{\n"); rsprintf("\nfunction init_resize()\n");
rsprintf(" window.onresize = resize_textarea;\n"); rsprintf("{\n");
rsprintf(" resize_textarea();\n"); rsprintf(" window.onresize = resize_textarea;\n");
rsprintf("}\n\n"); rsprintf(" resize_textarea();\n");
rsprintf("function resize_textarea()\n"); rsprintf("}\n\n");
rsprintf("{\n"); rsprintf("function resize_textarea()\n");
rsprintf(" p = document.form1.Text;\n"); rsprintf("{\n");
rsprintf(" t = p.offsetTop;\n"); rsprintf(" p = document.form1.Text;\n");
rsprintf(" while (p = p.offsetParent)\n"); rsprintf(" t = p.offsetTop;\n");
rsprintf(" t += p.offsetTop;\n"); rsprintf(" while (p = p.offsetParent)\n");
rsprintf(" if (window.innerHeight) // netscape\n"); rsprintf(" t += p.offsetTop;\n");
rsprintf(" height = window.innerHeight - t - 135;\n"); rsprintf(" if (window.innerHeight) // netscape\n");
rsprintf(" else // IE\n"); rsprintf(" height = window.innerHeight - t - 135;\n");
rsprintf(" height = document.body.offsetHeight - t - 135;\n"); rsprintf(" else // IE\n");
rsprintf(" if (height < 300)\n"); rsprintf(" height = document.body.offsetHeight - t - 135;\n");
rsprintf(" height = 300;\n"); rsprintf(" if (height < 300)\n");
rsprintf(" document.form1.Text.style.height = height;\n"); rsprintf(" height = 300;\n");
rsprintf("}\n\n"); rsprintf(" document.form1.Text.style.height = height;\n");
rsprintf("}\n\n");
}
} }
/* strings for elcode.js */ /* strings for elcode.js */
@ -9487,12 +9490,19 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
if (stristr(browser, "MSIE") && !stristr(browser, "opera")) if (stristr(browser, "MSIE") && !stristr(browser, "opera"))
rsprintf("browser = \"MSIE\";\n"); rsprintf("var browser = \"MSIE\";\n");
else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror")) else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror"))
rsprintf("browser = \"Mozilla\";\n"); rsprintf("var browser = \"Mozilla\";\n");
else else
rsprintf("browser = \"Other\";\n"); rsprintf("var browser = \"Other\";\n");
rsprintf("var logbook = \"%s\";\n", lbs->name_enc);
for (i = 0; i < MAX_ATTACHMENTS; i++)
if (!att[i][0]) {
/* put first free attachment for uploader */
rsprintf("var next_attachment = %d;\n", i + 1);
break;
}
rsprintf("//-->\n"); rsprintf("//-->\n");
rsprintf("</script>\n"); rsprintf("</script>\n");
@ -9533,7 +9543,7 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
else else
strcat(script, " OnLoad=\"elKeyInit();\" OnFocus=\"elKeyInit();\""); strcat(script, " OnLoad=\"elKeyInit();\" OnFocus=\"elKeyInit();\"");
} else if (enc_selected == 2 && fckedit_exist) { } else if (enc_selected == 2 && fckedit_exist) {
strcat(script, " OnLoad=\"init_resize(); initFCKedit();\""); strcat(script, " OnLoad=\"initFCKedit();\"");
} else } else
strcat(script, " OnLoad=\"init_resize();\""); strcat(script, " OnLoad=\"init_resize();\"");
@ -10539,6 +10549,31 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("[quote]"); rsprintf("[quote]");
rsputs3(text); rsputs3(text);
rsprintf("[/quote]\r\n"); rsprintf("[/quote]\r\n");
} else if (enc_selected == 2) {
rsprintf("<p>\n");
rsprintf("<table width=\"98%%\" align=\"center\" cellspacing=\"1\" style=\"border:1px solid #486090;\">\n");
rsprintf("<tbody>\n");
rsprintf("<tr>\n");
rsprintf("<td cellpadding=\"3px\" style=\"background-color:#486090; font-weidht:bold; color:white;\">");
/* check for author */
if (orig_author[0]) {
rsprintf(loc("%s wrote"), orig_author);
} else {
rsprintf(loc("Quote"));
}
rsprintf(":</td></tr>\n");
rsprintf("<tr>\n");
rsprintf("<td cellpadding=\"10px\" style=\"background-color:#FFFFB0;\">");
rsputs3(text);
rsprintf("</td>\n");
rsprintf("</tr>\n");
rsprintf("</tbody>\n");
rsprintf("</table>\n");
rsprintf("</p>\n");
} else { } else {
do { do {
if (strchr(p, '\n')) { if (strchr(p, '\n')) {
@ -23950,21 +23985,29 @@ void show_uploader_finished(LOGBOOK * lbs)
rsprintf(" function update()\n"); rsprintf(" function update()\n");
rsprintf(" {\n"); rsprintf(" {\n");
rsprintf(" i = opener.document.form1.next_attachment.value;\n"); rsprintf(" if (opener.document.title == \"FCKeditor\") {\n");
rsprintf(" elcode2(opener.document, opener.document.form1.Text, 'IMG', 'elog:/'+i);\n"); rsprintf(" i = opener.parent.next_attachment;\n");
rsprintf(" opener.document.form1.inlineatt.value = '%s';\n", att); rsprintf(" opener.FCKeditorAPI.GetInstance('Text').InsertHtml('<img src=\"../../'+opener.parent.logbook+'/'+i+'\">');\n");
rsprintf(" opener.document.form1.jcmd.value = 'Upload';\n"); rsprintf(" opener.parent.document.form1.inlineatt.value = '%s';\n", att);
rsprintf(" opener.document.form1.submit();\n"); rsprintf(" opener.parent.document.form1.jcmd.value = 'Upload';\n");
rsprintf(" opener.parent.document.form1.submit();\n");
rsprintf(" } else {\n");
rsprintf(" i = opener.document.form1.next_attachment.value;\n");
rsprintf(" elcode2(opener.document, opener.document.form1.Text, 'IMG', 'elog:/'+i);\n");
rsprintf(" opener.document.form1.inlineatt.value = '%s';\n", att);
rsprintf(" opener.document.form1.jcmd.value = 'Upload';\n");
rsprintf(" opener.document.form1.submit();\n");
rsprintf(" }\n");
rsprintf(" window.close();\n"); rsprintf(" window.close();\n");
rsprintf(" }\n\n"); rsprintf(" }\n\n");
/* strings for elcode.js */ /* strings for elcode.js */
if (stristr(browser, "MSIE") && !stristr(browser, "opera")) if (stristr(browser, "MSIE") && !stristr(browser, "opera"))
rsprintf("browser = 'MSIE';\n"); rsprintf("var browser = 'MSIE';\n");
else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror")) else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror"))
rsprintf("browser = 'Mozilla';\n"); rsprintf("var browser = 'Mozilla';\n");
else else
rsprintf("browser = 'Other';\n\n"); rsprintf("var browser = 'Other';\n\n");
rsprintf("</script>\n\n"); rsprintf("</script>\n\n");