Theming #624

trinity-1686a · 2019-06-21T08:53:42Z

elegaanz 评论于

2019-06-21 08:53:42 +00:00

(从 github.com 迁移)

Custom CSS for blogs
Custom themes for instance
New dark theme
UI for admin to upload new theme (or delete them)
UI to choose your theme

Instance level themes are just CSS files, stored in static/css (see Instance::list_themes).

TODO:

Federate blog themes
Escape url()/import
Add a way to avoid conflicts between blog and instance themes
UI to disable blog CSS (the option is already in the database, just need to add a checkbox in the settings)
SQlite migrations
Documentation

Fixes #354, #403

- Custom CSS for blogs - Custom themes for instance - New dark theme - UI for admin to upload new theme (or delete them) - UI to choose your theme ![image](https://user-images.githubusercontent.com/16254623/59910472-de7f1e00-9409-11e9-9d24-6e369f960608.png) Instance level themes are just CSS files, stored in `static/css` (see `Instance::list_themes`). TODO: - [x] Federate blog themes - [x] Escape url()/import - [x] Add a way to avoid conflicts between blog and instance themes - [x] UI to disable blog CSS (the option is already in the database, just need to add a checkbox in the settings) - [x] SQlite migrations - [x] Documentation Fixes #354, #403

codecov[bot] 评论于

2019-06-21 17:46:54 +00:00

(从 github.com 迁移)

Codecov Report

Merging #624 into master will decrease coverage by 0.32%.
The diff coverage is 12%.

@@           Coverage Diff            @@
##           master   #624      +/-   ##
========================================
- Coverage   35.33%    35%   -0.33%     
========================================
  Files          68     68              
  Lines        7915   7938      +23     
  Branches     1894   1888       -6     
========================================
- Hits         2797   2779      -18     
- Misses       4341   4381      +40     
- Partials      777    778       +1

# [Codecov](https://codecov.io/gh/Plume-org/Plume/pull/624?src=pr&el=h1) Report > Merging [#624](https://codecov.io/gh/Plume-org/Plume/pull/624?src=pr&el=desc) into [master](https://codecov.io/gh/Plume-org/Plume/commit/fb60236a54893d690a8ddba34f597e4820431154?src=pr&el=desc) will **decrease** coverage by `0.32%`. > The diff coverage is `12%`. ```diff @@ Coverage Diff @@ ## master #624 +/- ## ======================================== - Coverage 35.33% 35% -0.33% ======================================== Files 68 68 Lines 7915 7938 +23 Branches 1894 1888 -6 ======================================== - Hits 2797 2779 -18 - Misses 4341 4381 +40 - Partials 777 778 +1 ```

igalic (从 github.com 迁移) 评审于 2019-06-22 12:44:51 +00:00

igalic (从 github.com 迁移) 留下了一条评论

❓

migrations/postgres/2019-06-19-141114_themes/up.sql

					
				@ -0,0 +1,4 @@

				-- Your SQL goes here

				ALTER TABLE blogs ADD COLUMN theme VARCHAR;

				ALTER TABLE users ADD COLUMN preferred_theme VARCHAR;

igalic (从 github.com 迁移) 评论于

2019-06-22 12:33:04 +00:00

this should be a cookie setting

I really hope this is a cookie setting.

this should be a cookie setting I really hope this is a cookie setting.

elegaanz (从 github.com 迁移) 评审于 2019-06-22 13:52:50 +00:00

migrations/postgres/2019-06-19-141114_themes/up.sql

					
				@ -0,0 +1,4 @@

				-- Your SQL goes here

				ALTER TABLE blogs ADD COLUMN theme VARCHAR;

				ALTER TABLE users ADD COLUMN preferred_theme VARCHAR;

elegaanz (从 github.com 迁移) 评论于

2019-06-22 13:52:49 +00:00

Why should it be a cookie setting? Storing it in the database as the advantage of having it synced across devices (and also it will never expire).

igalic (从 github.com 迁移) 评审于 2019-06-22 21:01:40 +00:00

migrations/postgres/2019-06-19-141114_themes/up.sql

					
				@ -0,0 +1,4 @@

				-- Your SQL goes here

				ALTER TABLE blogs ADD COLUMN theme VARCHAR;

				ALTER TABLE users ADD COLUMN preferred_theme VARCHAR;

igalic (从 github.com 迁移) 评论于

2019-06-22 21:01:40 +00:00

you'd have to sync it to the cookie, but that way it'd be easier & quicker to access.

elegaanz (从 github.com 迁移) 评审于 2019-06-22 21:09:59 +00:00

migrations/postgres/2019-06-19-141114_themes/up.sql

					
				@ -0,0 +1,4 @@

				-- Your SQL goes here

				ALTER TABLE blogs ADD COLUMN theme VARCHAR;

				ALTER TABLE users ADD COLUMN preferred_theme VARCHAR;

elegaanz (从 github.com 迁移) 评论于

2019-06-22 21:09:59 +00:00

The whole user struct is already loaded for every page anyway, I'm not sure it is going to make a real difference 🤷‍♀️

The whole user struct is already loaded for every page anyway, I'm not sure it is going to make a real difference :woman_shrugging:

trinity-1686a 评论于

2019-06-27 09:19:45 +00:00

管理员

is it still ready for review considering the design flaw pointed regarding arbitrary css security?

elegaanz 评论于

2019-06-27 12:34:31 +00:00

(从 github.com 迁移)

No, I'm implementing another approach, I think I will be able to push it this evening.

elegaanz 评论于

2019-06-27 16:17:38 +00:00

(从 github.com 迁移)

If you want to review this PR, the new version is there. Admins should now approve remote blog themes, but they may contain anything. Once a theme is approved, it is also available for use on this instance. Admins can also upload themes if they have SSH acces to their instance: they just need to create a folder called "blog-SOMETHING" in static/css, and add the theme files inside.

I will update the docs too.

If you want to review this PR, the new version is there. Admins should now approve remote blog themes, but they may contain anything. Once a theme is approved, it is also available for use on this instance. Admins can also upload themes if they have SSH acces to their instance: they just need to create a folder called "blog-SOMETHING" in `static/css`, and add the theme files inside. I will update the docs too.

trwnh 评论于

2019-06-28 07:09:48 +00:00

(从 github.com 迁移)

Does it really make sense to have admins approve remote blog themes? Using remote resources on the local site seems fragile and prone to many more errors in the future. I think it makes more sense to limit themes to site-wide and local-user.

More generally, this is an issue that has to do with the way articles federate in Plume -- the HTML is delivered and cached to many different sites that may have varying CSS. Federating CSS as well is, I think, out-of-scope of ActivityPub (although there is nothing preventing this). In any case, it is much simpler to say that users should view the original URL if they wish to read the article with the original CSS.

Does it really make sense to have admins approve remote blog themes? Using remote resources on the local site seems fragile and prone to many more errors in the future. I think it makes more sense to limit themes to site-wide and local-user. More generally, this is an issue that has to do with the way articles federate in Plume -- the HTML is delivered and cached to many different sites that may have varying CSS. Federating CSS as well is, I think, out-of-scope of ActivityPub (although there is nothing preventing this). In any case, it is much simpler to say that users should view the original URL if they wish to read the article with the original CSS.

👍 1

trinity-1686a 评论于

2019-07-02 10:31:51 +00:00

管理员

I'm not sure this is an actual concern but how does it play with caching? Where are the file stored and are they given a unique name (hash based?)?

elegaanz 评论于

2019-07-03 11:45:37 +00:00

(从 github.com 迁移)

The themes are stored in static/css so they should integrate with the current caching system I think?

The themes are stored in `static/css` so they should integrate with the current caching system I think?

trinity-1686a 评论于

2019-07-03 12:26:02 +00:00

管理员

I think they are cached, but not evicted when modified, so client might think the file was not updated when it was. Adding a timestamp, a hash, a random string or anything to the name (myfile-DEADBEEF1312.css) would fix it

I think they are cached, but not evicted when modified, so client might think the file was not updated when it was. Adding a timestamp, a hash, a random string or anything to the name (`myfile-DEADBEEF1312.css`) would fix it

👍 1

elegaanz 评论于

2019-07-03 13:07:11 +00:00

(从 github.com 迁移)

I think it is going to be quite difficult, because in the current implementation, the main theme file should be named theme.css, and it may load other files of the theme, so we would have to find a way to detect the main theme file even if it has a hash in its name, and to edit all url()/@import inside of it to make sure other files are correctly loaded too… Maybe we can just set a default cache duration of one week or something like that, with a HTTP header? Or is it a problem not to have the latest theme update for a few days?

I think it is going to be quite difficult, because in the current implementation, the main theme file should be named `theme.css`, and it may load other files of the theme, so we would have to find a way to detect the main theme file even if it has a hash in its name, and to edit all `url()`/`@import` inside of it to make sure other files are correctly loaded too… Maybe we can just set a default cache duration of one week or something like that, with a HTTP header? Or is it a problem not to have the latest theme update for a few days?

trinity-1686a 评论于

2019-07-03 13:13:15 +00:00

管理员

Even 7 days is quiet long and will definitely be reported as a bug at some point. I'm at work currently, maybe we can discuss of it later on riot?

👍 2

elegaanz 评论于

2019-07-03 17:59:47 +00:00

(从 github.com 迁移)

OK, feel free to ping me when you want to talk about it :)

trinity-1686a 评审于 2019-08-13 13:32:23 +00:00

trinity-1686a 留下了一条评论

管理员

👀

assets/themes/default/_dark_variables.scss

trinity-1686a 评论于

2019-08-13 12:57:36 +00:00

管理员

????

migrations/sqlite/2019-06-21-154916_themes/down.sql

					
				@ -0,0 +83,4 @@

				    last_fetched_date,

				    fqn,

				    summary_html

				FROM users;

trinity-1686a 评论于

2019-08-13 13:06:56 +00:00

管理员

sqlite migration mi amor

plume-models/src/instance.rs

trinity-1686a 评论于

2019-08-13 13:10:31 +00:00

管理员

in case of error, return empty Vec? I think returning a Result<...> would make more sens, to have a proper error in case of.. error

in case of error, return empty `Vec`? I think returning a `Result<...>` would make more sens, to have a proper error in case of.. error

trinity-1686a 评论于

2019-08-13 13:10:39 +00:00

管理员

Same goes

plume-models/src/users.rs

trinity-1686a 评论于

2019-08-13 13:11:20 +00:00

管理员

so this whole function was useless? Some other must be too then

elegaanz (从 github.com 迁移) 评审于 2019-08-13 15:52:10 +00:00

plume-models/src/users.rs

elegaanz (从 github.com 迁移) 评论于

2019-08-13 15:52:09 +00:00

Yes, I would like to do a big code cleanup one day, removing all pub, progressively reintroducing them until it compiles, and remove everything that Rust says is unused.

Yes, I would like to do a big code cleanup one day, removing all `pub`, progressively reintroducing them until it compiles, and remove everything that Rust says is unused.

trinity-1686a 于 2019-08-20 14:27:45 +00:00 批准此合并请求

trinity-1686a 留下了一条评论

管理员

lgtm

登录并参与到对话中。

无评审员

未选择里程碑

暂无项目

未指派成员

2 位参与者

通知

到期时间

到期日期无效或超出范围。请使用“yyyy-mm-dd”格式。

未设置到期时间。

依赖工单

没有设置依赖项。

引用：Plume/Plume#624

行数
列数