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

Fixed problem with truncated date on CKEditor "Insert Timestamp" button

Browse Source
This commit is contained in:
Stefan Ritt 2015-06-08 12:01:17 +02:00
parent c7d1f53594
commit a09ed01c82
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
scripts/ckeditor/plugins/timestamp/plugin.js
View File

@ -19,7 +19,7 @@ CKEDITOR.plugins.add( 'timestamp', {
// Define the function that will be fired when the command is executed. // Define the function that will be fired when the command is executed.
exec: function( editor ) { exec: function( editor ) {
var URL = "../../?cmd=gettimedate"; var URL = "./?cmd=gettimedate";
$.ajax({ $.ajax({
url: URL, url: URL,

2
src/elogd.c
View File

@ -28875,7 +28875,7 @@ int process_http_request(const char *request, int i_conn)
strcpy(format, DEFAULT_TIME_FORMAT); strcpy(format, DEFAULT_TIME_FORMAT);
time(&now); time(&now);
ts = localtime(&now); ts = localtime(&now);
my_strftime(str, sizeof(str), format, ts); my_strftime(str, strsize, format, ts);
show_http_header(NULL, FALSE, NULL); show_http_header(NULL, FALSE, NULL);
rsputs(str); rsputs(str);
rsputs(" "); rsputs(" ");

4
xcode/elogd.xcodeproj/project.xcworkspace/xcshareddata/elogd.xccheckout
View File

@ -7,7 +7,7 @@
<key>IDESourceControlProjectIdentifier</key> <key>IDESourceControlProjectIdentifier</key>
<string>81431534-03C4-4F18-8910-AA341A0BBED2</string> <string>81431534-03C4-4F18-8910-AA341A0BBED2</string>
<key>IDESourceControlProjectName</key> <key>IDESourceControlProjectName</key>
<string>elogd</string> <string>project</string>
<key>IDESourceControlProjectOriginsDictionary</key> <key>IDESourceControlProjectOriginsDictionary</key>
<dict> <dict>
<key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key> <key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key>
@ -16,7 +16,7 @@
<string>bitbucket.org:ritt/elog.git</string> <string>bitbucket.org:ritt/elog.git</string>
</dict> </dict>
<key>IDESourceControlProjectPath</key> <key>IDESourceControlProjectPath</key>
<string>xcode/elogd.xcodeproj</string> <string>xcode/elogd.xcodeproj/project.xcworkspace</string>
<key>IDESourceControlProjectRelativeInstallPathDictionary</key> <key>IDESourceControlProjectRelativeInstallPathDictionary</key>
<dict> <dict>
<key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key> <key>4A8AA611133AD3F7E07C7C33DCF50244FB7A1AB5</key>