tslocum
/
tinyib
7
8
Fork 2
Code Issues 32 Pull Requests 1 Activity

Make CSS styles configurable #222

Merged
tslocum merged 3 commits from Tortle/tortleib:css-config into master 2021-06-03 00:07:32 +00:00
Conversation 0 Commits 3 Files Changed 3
Tortle commented 2021-05-30 03:08:03 +00:00

Enable skins by dropping a CSS file in /css and adding the name to settings.php.

Enable skins by dropping a CSS file in /css and adding the name to settings.php.
Tortle added 1 commit 2021-05-30 03:08:04 +00:00
tslocum reviewed 2021-06-02 06:15:58 +00:00
inc/html.php Outdated
@ -628,0 +650,4 @@
if (count($tinyib_skins) > 1) {
$options = ['<option value="">' . $txt_style . '</option>'];
foreach($tinyib_skins as $display_name => $value) {
$options[] = '<option value="' . $value . '">'. $display_name . '</option>';
tslocum commented 2021-06-02 06:15:58 +00:00
Owner

Escape $value with htmlentities($var, ENT_QUOTES) and $displayname with htmlentities($var).

Escape $value with `htmlentities($var, ENT_QUOTES)` and $displayname with `htmlentities($var)`.
Tortle marked this conversation as resolved
tslocum requested changes 2021-06-02 06:32:40 +00:00
tslocum left a comment
Owner

Thanks for submitting this. Please include a default value for existing installations by adding TINYIB_DEFAULTSTYLE to inc/defines.php.

Thanks for submitting this. Please include a default value for existing installations by adding TINYIB_DEFAULTSTYLE to inc/defines.php.
inc/html.php Outdated
@ -43,6 +43,24 @@ function pageHeader() {
EOF;
}
function stylesheets() {
tslocum commented 2021-06-02 06:23:26 +00:00
Owner

Rename to pageStylesheets.

Rename to pageStylesheets.
Tortle marked this conversation as resolved
inc/html.php Outdated
@ -46,0 +47,4 @@
global $tinyib_skins;
$global_stylesheet = '<link rel="stylesheet" type="text/css" href="css/global.css">';
$default_stylesheet = '<link rel="stylesheet" type="text/css" href="css/' . $tinyib_skins[TINYIB_DEFAULTSKIN] . '.css" title="' . TINYIB_DEFAULTSKIN . '" id="mainStylesheet">';
tslocum commented 2021-06-02 06:18:15 +00:00
Owner

Escape $tinyib_skins[TINYIB_DEFAULTSKIN] with htmlentities($var, ENT_QUOTES).

Escape $tinyib_skins[TINYIB_DEFAULTSKIN] with `htmlentities($var, ENT_QUOTES)`.
Tortle marked this conversation as resolved
inc/html.php
@ -46,0 +48,4 @@
$global_stylesheet = '<link rel="stylesheet" type="text/css" href="css/global.css">';
$default_stylesheet = '<link rel="stylesheet" type="text/css" href="css/' . $tinyib_skins[TINYIB_DEFAULTSKIN] . '.css" title="' . TINYIB_DEFAULTSKIN . '" id="mainStylesheet">';
$stylesheets = [$global_stylesheet, $default_stylesheet];
tslocum commented 2021-06-02 06:22:51 +00:00
Owner

Create a string $return which is appended to and returned instead of an array.

Create a string `$return` which is appended to and returned instead of an array.
Tortle marked this conversation as resolved
inc/html.php Outdated
@ -46,0 +55,4 @@
continue;
}
$stylesheets[] = '<link rel="alternate stylesheet" type="text/css" href="css/' . $value . '.css" title="' . $display_name . '">';
tslocum commented 2021-06-02 06:16:38 +00:00
Owner

Escape $value and $display_name with htmlentities($var, ENT_QUOTES).

Escape $value and $display_name with `htmlentities($var, ENT_QUOTES)`.
Tortle marked this conversation as resolved
inc/html.php
@ -46,0 +58,4 @@
$stylesheets[] = '<link rel="alternate stylesheet" type="text/css" href="css/' . $value . '.css" title="' . $display_name . '">';
}
return join($stylesheets, '');
tslocum commented 2021-06-02 06:21:36 +00:00
Owner

Use implode.

Use implode.
Tortle marked this conversation as resolved
settings.default.php Outdated
@ -90,2 +90,4 @@
'YouTube' => 'https://www.youtube.com/oembed?url=TINYIBEMBED&format=json');
// CSS skins
tslocum commented 2021-06-02 06:29:13 +00:00
Owner

Replace with the following comment:

// Stylesheets (located in css)
//   Format: File name excluding extension => Title
Replace with the following comment: ``` // Stylesheets (located in css) // Format: File name excluding extension => Title ```
Tortle marked this conversation as resolved
settings.default.php Outdated
@ -91,1 +91,4 @@
// CSS skins
define('TINYIB_DEFAULTSKIN', 'Futaba');
tslocum commented 2021-06-02 06:21:07 +00:00
Owner

Define via filename instead: 'futaba'.

Define via filename instead: 'futaba'.
tslocum commented 2021-06-02 06:30:53 +00:00
Owner

Rename setting to TINYIB_DEFAULTSTYLE.

Rename setting to TINYIB_DEFAULTSTYLE.
Tortle marked this conversation as resolved
settings.default.php Outdated
@ -92,0 +92,4 @@
// CSS skins
define('TINYIB_DEFAULTSKIN', 'Futaba');
$tinyib_skins = array('Futaba' => 'futaba',
tslocum commented 2021-06-02 06:20:25 +00:00
Owner

Reverse order: 'futaba' => 'Futaba'.

Reverse order: 'futaba' => 'Futaba'.
tslocum commented 2021-06-02 06:31:41 +00:00
Owner

Rename variable to $tinyib_stylesheets.

Rename variable to $tinyib_stylesheets.
Tortle marked this conversation as resolved
Tortle added 1 commit 2021-06-02 21:10:08 +00:00
Tortle added 1 commit 2021-06-02 21:10:24 +00:00
Tortle requested review from tslocum 2021-06-02 21:13:19 +00:00
tslocum merged commit 32ae4efbcf into master 2021-06-03 00:07:32 +00:00
Tortle deleted branch css-config 2021-06-03 00:25:17 +00:00
Sign in to join this conversation.
Reviewers
No reviewers
tslocum
Labels
Clear labels   
bug

Something is not working   
duplicate

This issue or pull request already exists   
enhancement

New feature   
help wanted

Need some help   
invalid

Something is wrong   
question

More information is needed   
wontfix

This won't be fixed
No Label
bug
duplicate
enhancement
help wanted
invalid
question
wontfix
Milestone
Clear milestone
No items
No Milestone
Assignees
Clear assignees
No Assignees
2 Participants
Notifications
Due Date
The due date is invalid or out of range. Please use the format 'yyyy-mm-dd'.

No due date set.

Dependencies

No dependencies set.

Reference: tslocum/tinyib#222
There is no content yet.
Delete Branch "Tortle/tortleib:css-config"

Deleting a branch is permanent. Although the deleted branch may exist for a short time before cleaning up, in most cases it CANNOT be undone. Continue?