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

Changed midas.psi.ch to elog.psi.ch

Browse Source
This commit is contained in:
Stefan Ritt 2018-05-28 09:17:15 +02:00
parent 057e3ea2fc
commit 1473f2a111
7 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README
View File

@ -3,7 +3,7 @@ Welcome to the ELOG package
For general documentation, see the file "index.html" in the "doc" subdirectory, For general documentation, see the file "index.html" in the "doc" subdirectory,
for installation instructions, see "adminguide.html" in the same directory, for installation instructions, see "adminguide.html" in the same directory,
or consult the web page http://midas.psi.ch/elog or consult the web page http://elog.psi.ch/elog
Please send all bug reports by electronic mail to: Please send all bug reports by electronic mail to:

4
checklist.txt
View File

@ -25,7 +25,7 @@ On llc.psi.ch:
- log in as ritt - log in as ritt
- git pull in elog and mxml - git pull in elog and mxml
On midas.psi.ch: On elog.psi.ch:
- log in as root - log in as root
- cd ~ritt/elog - cd ~ritt/elog
@ -44,7 +44,7 @@ On VPC6562-1:
- c:\elog> svn ci -m "Version x.x.x-y" - c:\elog> svn ci -m "Version x.x.x-y"
- open VS 2010 command window, build xxx-y - open VS 2010 command window, build xxx-y
On midas.psi.ch: On elog.psi.ch:
- svn update - svn update
- su - su

2
doc/config.html
View File

@ -2493,7 +2493,7 @@ Options Location = Main Building{a}, New Building{b}, Old Building{c}
This specifies the default encoding for new entries. For installations This specifies the default encoding for new entries. For installations
where entries are normally submitted as plain text, the default can be where entries are normally submitted as plain text, the default can be
set to <b>1</b>. Set to <b>0</b> for <a href= set to <b>1</b>. Set to <b>0</b> for <a href=
"http://midas.psi.ch/elog/elcode_en.html">ELCode</a> encoding, to "http://elog.psi.ch/elog/elcode_en.html">ELCode</a> encoding, to
<b>2</b> for HTML encoding. The default is <b>2</b>, which activates <b>2</b> for HTML encoding. The default is <b>2</b>, which activates
the built in FCKeditor automatically for new installations. If this the built in FCKeditor automatically for new installations. If this
editor is not wanted or people are concerned about cross site scripting, editor is not wanted or people are concerned about cross site scripting,

12
doc/index.html
View File

@ -15,10 +15,10 @@
[<a class="nav" href="userguide.html">User's Guide</a>]&nbsp; &nbsp; [<a class="nav" href="userguide.html">User's Guide</a>]&nbsp; &nbsp;
[<a class="nav" href="adminguide.html">Administrator's Guide</a>]&nbsp; &nbsp; [<a class="nav" href="adminguide.html">Administrator's Guide</a>]&nbsp; &nbsp;
[<a class="nav" href="faq.html">FAQ</a>]&nbsp;&nbsp; [<a class="nav" href="faq.html">FAQ</a>]&nbsp;&nbsp;
[<a class="nav" href="http://midas.psi.ch/elogs/Forum">Forum</a>]&nbsp;&nbsp; [<a class="nav" href="http://elog.psi.ch/elogs/Forum">Forum</a>]&nbsp;&nbsp;
[<a class="nav" href="wishlist.html">Wishlist</a>]&nbsp; &nbsp; [<a class="nav" href="wishlist.html">Wishlist</a>]&nbsp; &nbsp;
[<a class="nav" href="contrib.html">Contributions</a>]&nbsp;&nbsp; [<a class="nav" href="contrib.html">Contributions</a>]&nbsp;&nbsp;
[<a class="nav" href="http://midas.psi.ch/elogs/Linux%20Demo/">DEMO</a>]&nbsp;&nbsp; [<a class="nav" href="http://elog.psi.ch/elogs/Linux%20Demo/">DEMO</a>]&nbsp;&nbsp;
[<a class="nav" href="download.html">Download</a>]&nbsp; [<a class="nav" href="download.html">Download</a>]&nbsp;
</div> </div>
<p> <p>
@ -105,7 +105,7 @@
An additional feature is the automatic generation of a notification email An additional feature is the automatic generation of a notification email
messages based on a certain type or category of a logbook entry. messages based on a certain type or category of a logbook entry.
<p> <p>
Also try out the <b><a href="http://midas.psi.ch/elogs/Linux%20Demo/">online demo</a></b> Also try out the <b><a href="http://elog.psi.ch/elogs/Linux%20Demo/">online demo</a></b>
!</p> !</p>
</td> </td>
</tr> </tr>
@ -198,8 +198,8 @@
<p> <p>
Here are some talks and presentations given at various occasions: Here are some talks and presentations given at various occasions:
<ul> <ul>
<li>Seminar at KIT, Karlsruhe, Jan. 2015. <a href="http://midas.psi.ch/elog/talks/2015_1_intro.pptx">Introduction talk</a> by <a href="mailto:stefan.ritt@psi.ch">Stefan Ritt</a>. <li>Seminar at KIT, Karlsruhe, Jan. 2015. <a href="http://elog.psi.ch/elog/talks/2015_1_intro.pptx">Introduction talk</a> by <a href="mailto:stefan.ritt@psi.ch">Stefan Ritt</a>.
<li>Seminar at KIT, Karlsruhe, Jan. 2015. <a href="http://midas.psi.ch/elog/talks/2015_1_accel.pptx">Application of ELOG</a> for accelerator operation at PSI by <a href="mailto:andreas.luedeke@psi.ch">Andreas Luedeke</a>. <li>Seminar at KIT, Karlsruhe, Jan. 2015. <a href="http://elog.psi.ch/elog/talks/2015_1_accel.pptx">Application of ELOG</a> for accelerator operation at PSI by <a href="mailto:andreas.luedeke@psi.ch">Andreas Luedeke</a>.
</ul> </ul>
<p> <p>
<hr> <hr>
@ -207,7 +207,7 @@
<div class="section">&nbsp; Links &nbsp;</div> <div class="section">&nbsp; Links &nbsp;</div>
<p> <p>
If your are reading this documentation from your local <b>ELOG</b> server, If your are reading this documentation from your local <b>ELOG</b> server,
check for updates on the <a href="http://midas.psi.ch/elog/">ELOG Home Page</a> check for updates on the <a href="http://elog.psi.ch/elog/">ELOG Home Page</a>
. .
<p> <p>
<HR> <HR>

4
elog.spec
View File

@ -6,9 +6,9 @@ Version: 3.1.3
Release: 1 Release: 1
License: GPL License: GPL
Group: Applications/Networking Group: Applications/Networking
Source: http://midas.psi.ch/elog/download/elog-%{version}.tar.gz Source: http://elog.psi.ch/elog/download/elog-%{version}.tar.gz
Vendor: Stefan Ritt <stefan.ritt@psi.ch> Vendor: Stefan Ritt <stefan.ritt@psi.ch>
URL: http://midas.psi.ch/elog URL: http://elog.psi.ch/elog
BuildRoot: /tmp/%{name}-root BuildRoot: /tmp/%{name}-root
Prefix: /usr/local Prefix: /usr/local
BuildRequires: openssl-devel >= 0.9.8e BuildRequires: openssl-devel >= 0.9.8e

10
elog_pad_file.xml
View File

@ -77,14 +77,14 @@
</Program_Descriptions> </Program_Descriptions>
<Web_Info> <Web_Info>
<Application_URLs> <Application_URLs>
<Application_Info_URL>http://midas.psi.ch/elog</Application_Info_URL> <Application_Info_URL>http://elog.psi.ch/elog</Application_Info_URL>
<Application_Order_URL /> <Application_Order_URL />
<Application_Screenshot_URL>http://midas.psi.ch/elog/elog.gif</Application_Screenshot_URL> <Application_Screenshot_URL>http://elog.psi.ch/elog/elog.gif</Application_Screenshot_URL>
<Application_Icon_URL>http://midas.psi.ch/elogs/forum/elog.png</Application_Icon_URL> <Application_Icon_URL>http://elog.psi.ch/elogs/forum/elog.png</Application_Icon_URL>
<Application_XML_File_URL>http://midas.psi.ch/elog/elog_pad_file.xml</Application_XML_File_URL> <Application_XML_File_URL>http://elog.psi.ch/elog/elog_pad_file.xml</Application_XML_File_URL>
</Application_URLs> </Application_URLs>
<Download_URLs> <Download_URLs>
<Primary_Download_URL>http://midas.psi.ch/elog/download/</Primary_Download_URL> <Primary_Download_URL>http://elog.psi.ch/elog/download/</Primary_Download_URL>
<Secondary_Download_URL /> <Secondary_Download_URL />
<Additional_Download_URL_1 /> <Additional_Download_URL_1 />
<Additional_Download_URL_2 /> <Additional_Download_URL_2 />

14
src/elogd.c
View File

@ -7766,14 +7766,14 @@ void show_upgrade_page(LOGBOOK * lbs)
rsprintf("It is of course possible to change the attributes or add new ones. The new\n"); rsprintf("It is of course possible to change the attributes or add new ones. The new\n");
rsprintf("options in the configuration file are described under <a href=\"\n"); rsprintf("options in the configuration file are described under <a href=\"\n");
rsprintf("https://midas.psi.ch/elog/config.html\">https://midas.psi.ch/elog/config.html\n"); rsprintf("https://elog.psi.ch/elog/config.html\">https://elog.psi.ch/elog/config.html\n");
rsprintf("</a>.\n"); rsprintf("</a>.\n");
rsprintf("</td></tr></table>\n\n"); rsprintf("</td></tr></table>\n\n");
rsprintf("<hr>\n"); rsprintf("<hr>\n");
rsprintf("<address>\n"); rsprintf("<address>\n");
rsprintf("<a href=\"https://midas.psi.ch/~stefan\">S. Ritt</a>, 18 October 2001"); rsprintf("<a href=\"https://www.psi.ch/ltp-muon-physics/stefan-ritt\">S. Ritt</a>, 18 October 2001");
rsprintf("</address>"); rsprintf("</address>");
show_bottom_text(lbs); show_bottom_text(lbs);
rsprintf("</body></html>\r\n"); rsprintf("</body></html>\r\n");
@ -8287,7 +8287,7 @@ void show_bottom_text(LOGBOOK * lbs)
} else } else
/* add little logo */ /* add little logo */
rsprintf rsprintf
("<center><a class=\"bottomlink\" title=\"%s\" href=\"https://midas.psi.ch/elog/\">ELOG V%s-%s</a></center>", ("<center><a class=\"bottomlink\" title=\"%s\" href=\"https://elog.psi.ch/elog/\">ELOG V%s-%s</a></center>",
loc("Goto ELOG home page"), VERSION, git_revision()); loc("Goto ELOG home page"), VERSION, git_revision());
} }
@ -8341,7 +8341,7 @@ void show_bottom_text_login(LOGBOOK * lbs)
} else } else
/* add little logo */ /* add little logo */
rsprintf rsprintf
("<center><a class=\"bottomlink\" title=\"%s\" href=\"https://midas.psi.ch/elog/\">ELOG V%s-%s</a></center>", ("<center><a class=\"bottomlink\" title=\"%s\" href=\"https://elog.psi.ch/elog/\">ELOG V%s-%s</a></center>",
loc("Goto ELOG home page"), VERSION, git_revision()); loc("Goto ELOG home page"), VERSION, git_revision());
} }
@ -12776,7 +12776,7 @@ void show_admin_page(LOGBOOK * lbs, char *top_group)
rsprintf("</textarea>\n"); rsprintf("</textarea>\n");
/* put link for config page */ /* put link for config page */
rsprintf("<br><a target=\"_blank\" href=\"https://midas.psi.ch/elog/config.html\">Syntax Help</a>"); rsprintf("<br><a target=\"_blank\" href=\"https://elog.psi.ch/elog/config.html\">Syntax Help</a>");
rsprintf("</td></tr>\n"); rsprintf("</td></tr>\n");
@ -28029,7 +28029,7 @@ void interprete(char *lbook, char *path)
strlcat(file_name, ".html", sizeof(file_name)); strlcat(file_name, ".html", sizeof(file_name));
f = fopen(file_name, "r"); f = fopen(file_name, "r");
if (f == NULL) if (f == NULL)
redirect(lbs, "https://midas.psi.ch/elog/eloghelp_english.html"); redirect(lbs, "https://elog.psi.ch/elog/eloghelp_english.html");
else { else {
fclose(f); fclose(f);
send_file_direct(file_name); send_file_direct(file_name);
@ -28052,7 +28052,7 @@ void interprete(char *lbook, char *path)
strlcat(file_name, ".html", sizeof(file_name)); strlcat(file_name, ".html", sizeof(file_name));
f = fopen(file_name, "r"); f = fopen(file_name, "r");
if (f == NULL) if (f == NULL)
redirect(lbs, "https://midas.psi.ch/elog/elcode_english.html"); redirect(lbs, "https://elog.psi.ch/elog/elcode_english.html");
else { else {
fclose(f); fclose(f);
send_file_direct(file_name); send_file_direct(file_name);