Public/elog
1
0
Fork 0
mirror of https://gitea.psi.ch/ELOG/elog.git synced 2026-09-14 20:33:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

Put JS in separate file

Browse Source 
SVN revision: 1384
This commit is contained in:
Stefan Ritt 2005-05-17 21:00:53 +00:00
parent 9d2fd68373
commit caaa24b145
4 changed files with 215 additions and 145 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
NT/elogd.vcproj
View File

@ -186,6 +186,9 @@
<File <File
RelativePath="..\themes\default\default.css"> RelativePath="..\themes\default\default.css">
</File> </File>
<File
RelativePath="..\elcode.js">
</File>
<File <File
RelativePath="..\..\elogdemo\elogd.cfg"> RelativePath="..\..\elogdemo\elogd.cfg">
</File> </File>

79
elcode.js Executable file
View File

@ -0,0 +1,79 @@
function getSelection(text)
{
if (browser == 'MSIE') {
sel = document.selection;
rng = sel.createRange();
rng.colapse;
return rng.text;
} else if (browser == 'Mozilla')
return text.value.substring(text.selectionStart, text.selectionEnd);
else
return "";
}
function replaceSelection(text, newSelection, cursorPos)
{
if (browser == 'MSIE') {
text.focus();
sel = document.selection;
rng = sel.createRange();
rng.colapse;
is_sel = rng.text.length > 0;
rng.text = newSelection;
if (!is_sel) {
rng.moveStart('character', -(newSelection.length-cursorPos));
rng.moveEnd('character', -(newSelection.length-cursorPos));
rng.select();
}
} else if (browser == 'Mozilla') {
start = text.selectionStart;
stop = text.selectionEnd;
end = text.textLength;
endtext = text.value.substring(stop, end);
starttext = text.value.substring(0, start);
text.value = starttext + newSelection + endtext;
if (start != stop) {
text.selectionStart = start;
text.selectionEnd = start + newSelection.length;
} else {
text.selectionStart = start + cursorPos;
text.selectionEnd = text.selectionStart;
}
} else
text += newSelection;
}
function elcode(text, tag, value)
{
elcode1(text, tag, value, '');
}
function elcode1(text, tag, value, selection)
{
if (selection == '')
selection = getSelection(text);
if (tag == '')
str = selection + value;
else if (value == '')
str = '['+tag+']' + selection + '[/'+tag+']';
else
str = '['+tag+'='+value+']' + selection + '[/'+tag+']';
if (tag == '')
pos = value.length;
else if (value == '')
pos = tag.length + 2;
else
pos = tag.length + value.length + 3;
replaceSelection(text, str, pos);
text.focus();
}
function queryURL(text)
{
selection = getSelection(text);
linkText = prompt(linkText_prompt, selection);
linkURL = prompt(linkURL_prompt, 'http://');
elcode1(text, 'URL', linkURL, linkText);
}

270
src/elogd.c
View File

@ -6,6 +6,9 @@
Contents: Web server program for Electronic Logbook ELOG Contents: Web server program for Electronic Logbook ELOG
$Log$ $Log$
Revision 1.669 2005/05/17 21:00:53 ritt
Put JS in separate file
Revision 1.668 2005/05/17 13:00:47 ritt Revision 1.668 2005/05/17 13:00:47 ritt
Fixed bug with missing 'full' view Fixed bug with missing 'full' view
@ -6323,7 +6326,7 @@ void rsputs_elcode(const char *str)
if (pattern_list[l].pattern[strlen(pattern_list[l].pattern)-1] == '=') { if (pattern_list[l].pattern[strlen(pattern_list[l].pattern)-1] == '=') {
i += strlen(pattern_list[l].pattern); i += strlen(pattern_list[l].pattern);
strextract(str+i, ']', attrib, sizeof(attrib)); strextract(str+i, ']', attrib, sizeof(attrib));
i += strlen(attrib)+1; i += strlen(attrib);
if (attrib[0] == '\"') if (attrib[0] == '\"')
strcpy(attrib, attrib+1); strcpy(attrib, attrib+1);
@ -8265,6 +8268,38 @@ BOOL is_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *owner)
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
BOOL get_author(LOGBOOK * lbs, char attrib[MAX_N_ATTR][NAME_LENGTH], char *author)
{
char str[NAME_LENGTH], preset[NAME_LENGTH];
int i;
/* search attribute which contains full_name of author */
for (i = 0; i < lbs->n_attr; i++) {
sprintf(str, "Preset %s", attr_list[i]);
if (getcfg(lbs->name, str, preset, sizeof(preset))) {
if (stristr(preset, "$long_name")) {
strcpy(author, attrib[i]);
return TRUE;
}
}
}
/* if not found, search attribute which contains short_name of author */
for (i = 0; i < lbs->n_attr; i++) {
sprintf(str, "Preset %s", attr_list[i]);
if (getcfg(lbs->name, str, preset, sizeof(preset))) {
if (stristr(preset, "$short_name")) {
strcpy(author, attrib[i]);
return TRUE;
}
}
}
return FALSE;
}
/*------------------------------------------------------------------*/
BOOL is_cond_attr(int index) BOOL is_cond_attr(int index)
{ {
int i; int i;
@ -8486,11 +8521,11 @@ void attrib_from_param(int n_attr, char attrib[MAX_N_ATTR][NAME_LENGTH])
/*------------------------------------------------------------------*/ /*------------------------------------------------------------------*/
void ricon(char *name, char *comment, char *elcode) void ricon(char *name, char *comment, char *onclick)
{ {
rsprintf("<img align=\"middle\" name=\"%s\" src=\"icons/elc_%s.png\" alt=\"%s\" title=\"%s\" border=\"0\"", rsprintf("<img align=\"middle\" name=\"%s\" src=\"icons/elc_%s.png\" alt=\"%s\" title=\"%s\" border=\"0\"",
name, name, comment, comment); name, name, comment, comment);
rsprintf(" onclick=\"elcode(document.form1.Text, '%s','')\"", elcode); rsprintf(" onclick=\"%s\"", onclick);
rsprintf(" onmousedown=\"document.images.%s.src='icons/eld_%s.png'\"", name, name); rsprintf(" onmousedown=\"document.images.%s.src='icons/eld_%s.png'\"", name, name);
rsprintf(" onmouseup=\"document.images.%s.src='icons/elc_%s.png'\"", name, name); rsprintf(" onmouseup=\"document.images.%s.src='icons/elc_%s.png'\"", name, name);
rsprintf(" onmouseover=\"this.style.cursor='hand';\" />"); rsprintf(" onmouseover=\"this.style.cursor='hand';\" />");
@ -9000,147 +9035,83 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
rsprintf("}\n\n"); rsprintf("}\n\n");
/* mark_submit() gets called via "Back" button */ /* mark_submit() gets called via "Back" button */
rsprintf("function mark_submit() \n"); rsprintf("function mark_submit()\n");
rsprintf("{ \n"); rsprintf("{\n");
rsprintf(" submitted = true; \n"); rsprintf(" submitted = true;\n");
rsprintf(" return true; \n"); rsprintf(" return true;\n");
rsprintf("} \n\n"); rsprintf("}\n\n");
/* chkupload() gets called via "Upload" button */ /* chkupload() gets called via "Upload" button */
rsprintf("function chkupload() \n"); rsprintf("function chkupload()\n");
rsprintf("{ \n"); rsprintf("{\n");
rsprintf(" if (document.form1.attfile.value == \"\") { \n"); rsprintf(" if (document.form1.attfile.value == \"\") {\n");
rsprintf(" alert(\"%s\"); \n", loc("No attachment file specified")); rsprintf(" alert(\"%s\");\n", loc("No attachment file specified"));
rsprintf(" return false; \n"); rsprintf(" return false;\n");
rsprintf(" } \n"); rsprintf(" }\n");
rsprintf(" submitted = true; \n"); rsprintf(" submitted = true;\n");
rsprintf(" return true; \n"); rsprintf(" return true;\n");
rsprintf("} \n\n"); rsprintf("}\n\n");
/* cond_submit() gets called via selection of new conditional attribute */ /* cond_submit() gets called via selection of new conditional attribute */
rsprintf("function cond_submit() \n"); rsprintf("function cond_submit()\n");
rsprintf("{ \n"); rsprintf("{\n");
rsprintf(" submitted = true; \n"); rsprintf(" submitted = true;\n");
rsprintf(" document.form1.submit(); \n"); rsprintf(" document.form1.submit();\n");
rsprintf("} \n\n"); rsprintf("}\n\n");
/* abandon() gets called "onUnload" */ /* abandon() gets called "onUnload" */
rsprintf("function unload() \n"); rsprintf("function unload()\n");
rsprintf("{ \n"); rsprintf("{\n");
rsprintf(" if (!submitted && modified) { \n"); rsprintf(" if (!submitted && modified) {\n");
rsprintf(" var subm = confirm(\"%s\"); \n", loc("Submit modified ELOG entry?")); rsprintf(" var subm = confirm(\"%s\");\n", loc("Submit modified ELOG entry?"));
rsprintf(" if (subm) { \n"); rsprintf(" if (subm) {\n");
rsprintf(" document.form1.jcmd.value = \"%s\"; \n", loc("Submit")); rsprintf(" document.form1.jcmd.value = \"%s\";\n", loc("Submit"));
rsprintf(" document.form1.submit(); \n"); rsprintf(" document.form1.submit();\n");
rsprintf(" } else { \n"); rsprintf(" } else {\n");
rsprintf(" document.form1.jcmd.value = \"%s\"; \n", loc("Back")); rsprintf(" document.form1.jcmd.value = \"%s\";\n", loc("Back"));
rsprintf(" document.form1.submit(); \n"); rsprintf(" document.form1.submit();\n");
rsprintf(" } \n"); rsprintf(" }\n");
rsprintf(" } \n"); rsprintf(" }\n");
rsprintf(" if (!submitted && !modified) { \n"); rsprintf(" if (!submitted && !modified) {\n");
rsprintf(" document.form1.jcmd.value = \"%s\"; \n", loc("Back")); rsprintf(" document.form1.jcmd.value = \"%s\";\n", loc("Back"));
rsprintf(" document.form1.submit(); \n"); rsprintf(" document.form1.submit();\n");
rsprintf(" } \n"); rsprintf(" }\n");
rsprintf("} \n\n"); rsprintf("}\n\n");
/* mod() gets called via throuch "onchange" event */ /* mod() gets called via throuch "onchange" event */
rsprintf("function mod() \n"); rsprintf("function mod()\n");
rsprintf("{ \n"); rsprintf("{\n");
rsprintf(" modified = true; \n"); rsprintf(" modified = true;\n");
rsprintf(" window.status = \"%s\"; \n", loc("Entry has been modified")); rsprintf(" window.status = \"%s\";\n", loc("Entry has been modified"));
rsprintf("} \n\n"); rsprintf("}\n\n");
/* switch_smileys turn on/off the smiley bar by setting the smcmd, which in turn /* switch_smileys turn on/off the smiley bar by setting the smcmd, which in turn
sets the hsm=0/hsm=1 cookie */ sets the hsm=0/hsm=1 cookie */
rsprintf("function switch_smileys() \n"); rsprintf("function switch_smileys()\n");
rsprintf("{ \n"); rsprintf("{\n");
if (show_smileys) if (show_smileys)
rsprintf(" document.form1.smcmd.value = 'hsm'; \n"); rsprintf(" document.form1.smcmd.value = 'hsm';\n");
else else
rsprintf(" document.form1.smcmd.value = 'ssm'; \n"); rsprintf(" document.form1.smcmd.value = 'ssm';\n");
rsprintf(" document.form1.submit(); \n"); rsprintf(" document.form1.submit();\n");
rsprintf("} \n\n"); rsprintf("}\n\n");
/* strings for elcode.js */
/* elcode() gets called by selecting ELCode buttons */ rsprintf("linkText_prompt = '%s';\n", loc("Enter name of hypelink"));
if (stristr(browser, "MSIE") && !stristr(browser, "opera")) { /* Internet Explorer */ rsprintf("linkURL_prompt = '%s';\n", loc("Enter URL of hypelink"));
rsprintf("function elcode(text, tag, value) \n"); if (stristr(browser, "MSIE") && !stristr(browser, "opera"))
rsprintf("{ \n"); rsprintf("browser = 'MSIE';\n");
rsprintf(" text.focus(); \n"); else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror"))
rsprintf(" sel = document.selection; \n"); rsprintf("browser = 'Mozilla';\n");
rsprintf(" rng = sel.createRange(); \n"); else
rsprintf(" rng.colapse; \n"); rsprintf("browser = 'Other';\n");
rsprintf(" \n");
rsprintf(" is_range = rng.text.length > 0; \n");
rsprintf(" if (tag == '') \n");
rsprintf(" str = rng.text + value; \n");
rsprintf(" else if (value == '') \n");
rsprintf(" str = '[' + tag + ']' + rng.text + '[/' + tag + ']'; \n");
rsprintf(" else \n");
rsprintf(" str = '[' + tag + '=' + value + ']' + rng.text + '[/' + tag + ']'; \n");
rsprintf(" \n");
rsprintf(" rng.text = str; \n");
rsprintf(" if (!is_range) { \n");
rsprintf(" rng.moveStart('character', -tag.length-3); \n");
rsprintf(" rng.moveEnd('character', -tag.length-3); \n");
rsprintf(" rng.select(); \n");
rsprintf(" } \n");
rsprintf(" \n");
rsprintf(" text.focus(); \n");
rsprintf("} \n");
} else if (stristr(browser, "Mozilla") && !stristr(browser, "opera") && !stristr(browser, "konqueror")) {
/* mozilla, firefox, netscape */
rsprintf("function elcode(text, tag, value) \n");
rsprintf("{ \n");
rsprintf(" var selection = ''; \n");
rsprintf(" var str; \n");
rsprintf(" \n");
rsprintf(" selection = text.value.substring(text.selectionStart, text.selectionEnd); \n");
rsprintf(" \n");
rsprintf(" if (tag == '') \n");
rsprintf(" str = selection + value; \n");
rsprintf(" else if (value == '') \n");
rsprintf(" str = '[' + tag + ']' + selection + '[/' + tag + ']'; \n");
rsprintf(" else \n");
rsprintf(" str = '[' + tag + '=' + value + ']' + selection + '[/' + tag + ']'; \n");
rsprintf(" \n");
rsprintf(" start = text.selectionStart; \n");
rsprintf(" end = text.textLength; \n");
rsprintf(" endtext = text.value.substring(text.selectionEnd, end); \n");
rsprintf(" starttext = text.value.substring(0, start); \n");
rsprintf(" text.value = starttext + str + endtext; \n");
rsprintf(" if (selection.length > 0) { \n");
rsprintf(" text.selectionStart = start; \n");
rsprintf(" text.selectionEnd = text.selectionStart + str.length; \n");
rsprintf(" } else { \n");
rsprintf(" if (tag == '') \n");
rsprintf(" text.selectionStart = start + value.length; \n");
rsprintf(" else \n");
rsprintf(" text.selectionStart = start + tag.length + 2; \n");
rsprintf(" text.selectionEnd = text.selectionStart; \n");
rsprintf(" } \n");
rsprintf(" \n");
rsprintf(" text.focus(); \n");
rsprintf("} \n");
} else {
rsprintf("function elcode(text, tag, value) \n");
rsprintf("{ \n");
rsprintf(" var str; \n");
rsprintf(" \n");
rsprintf(" if (tag == '') \n");
rsprintf(" str = value; \n");
rsprintf(" else if (value == '') \n");
rsprintf(" str = '[' + tag + ']' + '[/' + tag + ']'; \n");
rsprintf(" else \n");
rsprintf(" str = '[' + tag + '=' + value + ']' + '[/' + tag + ']'; \n");
rsprintf(" \n");
rsprintf(" text.value += str; \n");
rsprintf(" text.focus(); \n");
rsprintf("} \n");
}
rsprintf("//-->\n"); rsprintf("//-->\n");
rsprintf("</script>\n\n"); rsprintf("</script>\n");
/* optionally load ELCode JavaScript code */
if (enc_selected == 0)
rsprintf("<script type=\"text/javascript\" src=\"../elcode.js\"></script>\n\n");
/* external script if requested */ /* external script if requested */
if (isparam("js")) { if (isparam("js")) {
@ -9649,26 +9620,26 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
} }
if (enc_selected == 0) { if (enc_selected == 0) {
rsprintf("<tr><td colspan=2 class=\"menuframe\">\n"); rsprintf("<tr><td colspan=2 class=\"toolframe\">\n");
ricon("bold", loc("bold text"), "B"); ricon("bold", loc("bold text"), "elcode(document.form1.Text, 'B','')");
ricon("italic", loc("italics text"), "I"); ricon("italic", loc("italics text"), "elcode(document.form1.Text, 'I','')");
ricon("underline", loc("underlined text"), "U"); ricon("underline", loc("underlined text"), "elcode(document.form1.Text, 'U','')");
rsprintf(" "); rsprintf(" ");
ricon("center", loc("centered text"), "CENTER"); ricon("center", loc("centered text"), "elcode(document.form1.Text, 'CENTER','')");
rsprintf(" "); rsprintf(" ");
ricon("url", loc("insert hyperlink"), "URL"); ricon("url", loc("insert hyperlink"), "queryURL(document.form1.Text)");
ricon("email", loc("insert email"), "EMAIL"); ricon("email", loc("insert email"), "elcode(document.form1.Text, 'EMAIL','')");
ricon("image", loc("insert image"), "IMG"); ricon("image", loc("insert image"), "elcode(document.form1.Text, 'IMG','')");
rsprintf(" "); rsprintf(" ");
ricon("quote", loc("insert quote"), "QUOTE"); ricon("quote", loc("insert quote"), "elcode(document.form1.Text, 'QUOTE','')");
ricon("list", loc("insert list"), "LIST"); ricon("list", loc("insert list"), "elcode(document.form1.Text, 'LIST','')");
rsprintf(" "); rsprintf(" ");
ricon("code", loc("insert code"), "CODE"); ricon("code", loc("insert code"), "elcode(document.form1.Text, 'CODE','')");
if (show_smileys) if (show_smileys)
rsprintf(" <img align=\"middle\" name=\"smileys\" src=\"icons/eld_smile.png\" alt=\"%s\" title=\"%s\" border=\"0\"", rsprintf(" <img align=\"middle\" name=\"smileys\" src=\"icons/eld_smile.png\" alt=\"%s\" title=\"%s\" border=\"0\"",
@ -9893,7 +9864,12 @@ void show_edit_form(LOGBOOK * lbs, int message_id, BOOL breply, BOOL bedit, BOOL
strcpy(reply_string, "> "); strcpy(reply_string, "> ");
if (enc_selected == 0) { if (enc_selected == 0) {
rsprintf("[quote]");
/* check for author */
if (get_author(lbs, attrib, str))
rsprintf("[quote=\"%s\"]", str);
else
rsprintf("[quote]");
rsputs(text); rsputs(text);
rsprintf("[/quote]\r\n"); rsprintf("[/quote]\r\n");
} else { } else {
@ -15031,7 +15007,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
else else
rsputs("&nbsp;"); rsputs("&nbsp;");
rsputs("</pre>"); rsputs("</pre>");
} else if (text[0]) } else if (strieq(encoding, "ELCode"))
rsputs_elcode(text);
else if (text[0])
rsputs(text); rsputs(text);
else else
rsputs("&nbsp;"); rsputs("&nbsp;");
@ -15080,7 +15058,9 @@ void display_line(LOGBOOK * lbs, int message_id, int number, char *mode,
rsputs("<pre>"); rsputs("<pre>");
rsputs2(text); rsputs2(text);
rsputs("</pre>"); rsputs("</pre>");
} else } else if (strieq(encoding, "ELCode"))
rsputs_elcode(text);
else
rsputs(text); rsputs(text);
rsprintf("</td></tr>\n"); rsprintf("</td></tr>\n");
@ -15769,7 +15749,7 @@ void show_page_filters(LOGBOOK * lbs, int n_msg, int page_n, BOOL mode_commands,
} }
} }
rsprintf("&nbsp;<b>%d %s</b>", n_msg, loc("Entries")); rsprintf("&nbsp;<b>%d %s</b>&nbsp;", n_msg, loc("Entries"));
rsprintf("</td>\n"); rsprintf("</td>\n");
} }
@ -22892,8 +22872,8 @@ void server_loop(void)
if (chkext(logbook, ".gif") || chkext(logbook, ".jpg") || if (chkext(logbook, ".gif") || chkext(logbook, ".jpg") ||
chkext(logbook, ".jpg") || chkext(logbook, ".png") || chkext(logbook, ".jpg") || chkext(logbook, ".png") ||
chkext(logbook, ".ico") || chkext(logbook, ".htm") chkext(logbook, ".ico") || chkext(logbook, ".htm") ||
|| chkext(logbook, ".css")) { chkext(logbook, ".css") || chkext(logbook, ".js")) {
/* check if file in resource directory */ /* check if file in resource directory */
strlcpy(str, resource_dir, sizeof(str)); strlcpy(str, resource_dir, sizeof(str));
strlcat(str, logbook, sizeof(str)); strlcat(str, logbook, sizeof(str));

8
themes/default/default.css
View File

@ -237,6 +237,14 @@ td {
vertical-align:middle; vertical-align:middle;
} }
.toolframe {
border:1px solid #486090;
border-top:1px solid white;
border-left:1px solid white;
background-color:#E0E0E0;
padding:2px;
}
/* frame table in listings */ /* frame table in listings */
.listframe { .listframe {
border:1px solid #0000FF; border:1px solid #0000FF;