tde-devs@chat.jabb.im < 2022/06/06 > | |
|---|---|
| [13:52] | michelec2 has joined |
| [13:58] | michelec2: that is probably a consequence of the fact that we have now fixed up tdelibs to use the css files from the correct location. Probably the online APIs are now looking in the wrong place |
| [14:00] | michelec2: see commit TDE/tdelibs#72c35f250 |
| [14:00] | michelec2: see commit TDE/tdelibs#72c35f25 |
| [14:01] | Slávek: The problem is a little different. |
| [14:01] | michelec2: I thought the bot could show the link to a commit... maybe I don't remember the right format |
| [14:01] | michelec2: test: commit 72c35f25 |
| [14:02] | Slávek: Files in common folder are a part of package tdelibs-data-trinity, but not all files are included in this package. |
| [14:03] | Slávek: It will now be necessary to find out which files are not included there and decide whether to insert them into tdelibs-data-trinity or tdelibs14-trinity-doc. |
| [14:04] | Slávek: At the same time, tdelibs-data-trinity could be set as a dependence for tdelibs14-trinity-doc to ensure that it is installed. |
| [14:04] | michelec2: can't we copy the required common files into the tde API folders used for online APIs? |
| [14:05] | Slávek: Before the change that you mentioned above, these files were manually copied on the web server :) |
| [14:05] | michelec2: I like the idea of the dependency |
| [14:06] | michelec2: @"manually copied on the web server": yes, I remember that |
| [14:07] | Slávek: Your commits seemed to be used to prevent this manual copying, but it turned out that some files are not included in the tdelibs-data-trinity package. |
| [14:10] | michelec2: yes, I understood from the previous comment. So I think the idea of setting a dependency for the package is good |
| [14:11] | michelec2: although it would be a bit unusual that not all tdelibs packages are installed together on a system |
| [14:11] | Slávek: In any case, besides this dependency we have to check which other "common" files are needed for APIDOC and decide whether to add them to tdelibs-data-trinity or tdelibs14-trinity-doc. |
| [14:13] | Slávek: You do not forget that it is not necessary to have tdelibs binaries installed on the web server, but there is useful to have installed documentation. |
| [14:13] | michelec2: some of the files are used by doxigen file in doc/common |
| [14:15] | michelec2: although I didn't specifically check for the files modified by the commit mentioned earlier |
| [14:18] | Slávek: No problem. For the time being, I did not want to copy the files manually so that we can verify and decide on the missing files. |
| [14:18] | michelec2: well, doxygen.css which is one of the files modified in that commit is used in various places, including in dixygen |
| [14:18] | michelec2: and tde.css is used in files used by doxygen |
| [14:20] | michelec2: being just tdeapis on the server, we have two possible solutions:
1) manually copy the files --> could break again if we change something else 2) add dependency so that the additional files are copied automatically. This may install some extra files on the server, but things will keep working if we do more changes |
| [14:23] | Slávek: Fortunately, the tdelibs-data-trinity package does not cause any additional addictions, so I installed it on the web server. |
| [14:24] | Slávek: However, it turned out to be insufficient, because some "common" files are not in this package at this time. |
| [14:25] | michelec2: :-o ? |
| [14:25] | michelec2: the files affected by the commit were very few... wow |
| [14:26] | Slávek: For example top.jpg. |
| [14:26] | Slávek: tabs.css |
| [14:27] | Slávek: As I mentioned above, we need to identify these missing files and decide whether to add them to tdelibs-data-trinity or tdelibs14-trinity-doc. |
| [14:28] | michelec2: wow |
| [14:28] | michelec2: how could it work locally? I need to look in more detail... I would have expected missing files when I tested in that case. |
| [14:31] | michelec2: unless I miss them too and didn't konw what to expect, so didn't notice the missing files :-) |
| [14:32] | michelec2: I will have a look tomorrow morning |
| [14:35] | michelec2: actually I just had a look |
| [14:35] | michelec2: in /opt/trinity/share/doc/tde/HTML/en/common all the modified files (except top-trinity.jpg) are present |
| [14:36] | michelec2: ah I see tabs.css has a different date |
| [14:36] | michelec2: I may have copied it manually long ago. let me see the actual deb. package |
| [14:39] | michelec2: confirmed. those two files (tabs.css and top-trinity.jpg are missing) |
| [14:40] | michelec2: tabs.css is used by doc/common/mainheader.html and by doc/common/header.html |
| [14:40] | michelec2: and same for top-trinity.jpg |
| [14:41] | Slávek: # grep 404 /var/log/apache2/access.log | grep "common/" | sed "s|.*/\(common/[^\" ]*\).*|\1|" | sort -u
common/tabs.css common/tde.css common/top-trinity.jpg |
| [14:41] | michelec2: those two files are in tdelibs-data-trinity, so I suggest we add tabs.css and top-trinity.jpg to the same package |
| [14:42] | Slávek: # zgrep 404 /var/log/apache2/access.log* | grep "common/" | sed "s|.*/\(common/[^\" ]*\).*|\1|" | sort -u
common/doxygen.css common/favicon.ico common/flat.css common/print.css common/tabs.css common/tde.css common/template.js common/top-trinity.jpg |
| [14:42] | michelec2: tde.css is in tdelibs-data-trinity |
| [14:43] | michelec2: all the files you listed above are in tdelibs-data-trinity, except tabs.css, top-trinity.kpg and template.js |
| [14:44] | Slávek: Yes, maybe the grep returns some older matches. |
| [14:45] | michelec2: template.js was not affected by the tdelibs commit. It is actually in no package, so we may need to add it |
| [14:45] | michelec2: let me see where it is used |
| [14:45] | michelec2: template.js is not part of tdelibs source code at all :-) |
| [14:46] | Slávek: It is possible that it was a misconception from an attacker. |
| [14:46] | michelec2: actually there is no template.js file in whole TDE code |
| [14:46] | michelec2: (y) |
| [14:47] | michelec2: so we only need to add those two missing files: tabs.css and top-trinity.jpg |
| [14:48] | Slávek: ok, so it can be added into tdelibs-data-trinity. |
| [14:48] | michelec2: I will prepare a PR tomorrow to add them to |
| [14:48] | michelec2: tdelibs-data-trinity |
| [14:48] | Slávek: (Y) |
| [14:48] | michelec2: unless you want to do it while I am sleeping |
| [14:50] | michelec2 has left |
tde-devs@chat.jabb.im < 2022/06/06 > | |
© 2010-2026 Trinity Desktop Project