Skip to content

Explosive Note #203

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Explosive Note #203

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b152a2c
updated plugin to include explosive note
robertmooijman Aug 22, 2019
701f228
chnaged a wrong icon for important note
robertmooijman Aug 22, 2019
d1e0def
Merge pull request #1 from lagersmit/added_explosive_note
robertmooijman Aug 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,13 @@ function handle_toolbar(Doku_Event $event, $param) {
'icon' => '../../plugins/wrap/images/note/16/important.png',
'open' => '<'.$syntaxDiv.' center round important 60%>\n',
'close' => '\n</'.$syntaxDiv.'>\n',
),
array(
'type' => 'format',
'title' => $this->getLang('explosive'),
'icon' => '../../plugins/wrap/images/note/16/explosive.png',
'open' => '<'.$syntaxDiv.' center round explosive 60%>\n',
'close' => '\n</'.$syntaxDiv.'>\n',
),
array(
'type' => 'format',
Expand Down
1 change: 1 addition & 0 deletions all.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ Screen and Print Styles for the Wrap Plugin
.wrap_box.wrap__emuhead em strong em.u,
.wrap_info.wrap__emuhead em strong em.u,
.wrap_important.wrap__emuhead em strong em.u,
.wrap_explosive.wrap__emuhead em strong em.u,
.wrap_alert.wrap__emuhead em strong em.u,
.wrap_tip.wrap__emuhead em strong em.u,
.wrap_help.wrap__emuhead em strong em.u,
Expand Down
4 changes: 2 additions & 2 deletions helper.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
class helper_plugin_wrap extends DokuWiki_Plugin {
static protected $boxes = array ('wrap_box', 'wrap_danger', 'wrap_warning', 'wrap_caution', 'wrap_notice', 'wrap_safety',
'wrap_info', 'wrap_important', 'wrap_alert', 'wrap_tip', 'wrap_help', 'wrap_todo',
'wrap_download', 'wrap_hi', 'wrap_spoiler');
'wrap_download', 'wrap_hi', 'wrap_spoiler','wrap_explosive');
static protected $paragraphs = array ('wrap_leftalign', 'wrap_rightalign', 'wrap_centeralign', 'wrap_justify');
static protected $column_count = 0;
static $box_left_pos = 0;
Expand Down Expand Up @@ -775,7 +775,7 @@ protected function getODTCommonStyleName ($class_string) {
'wrap_download' => 'Download', 'wrap_hi' => 'Highlighted', 'wrap_spoiler' => 'Spoiler',
'wrap_leftalign' => 'Left aligned', 'wrap_rightalign' => 'Right aligned',
'wrap_centeralign' => 'Centered', 'wrap_justify' => 'Justify', 'wrap_em' => 'Emphasised',
'wrap_lo' => 'Less significant');
'wrap_lo' => 'Less significant', 'wrap_explosive' => 'Explosive',);
$classes = explode(' ', $class_string);
$name = '';
foreach ($classes as $class) {
Expand Down
Binary file added images/note/16/explosive.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added images/note/48/explosive.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions print.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,14 +11,14 @@ Print Styles for the Wrap Plugin (additional to all.css)

div.wrap_box,
div.wrap_danger, div.wrap_warning, div.wrap_caution, div.wrap_notice, div.wrap_safety,
div.wrap_info, div.wrap_important, div.wrap_alert, div.wrap_tip, div.wrap_help, div.wrap_todo, div.wrap_download {
div.wrap_info, div.wrap_important, div.wrap_explosive, div.wrap_alert, div.wrap_tip, div.wrap_help, div.wrap_todo, div.wrap_download {
border: 2px solid #999;
padding: 1em 1em .5em;
margin-bottom: 1.5em;
}
span.wrap_box,
span.wrap_danger, span.wrap_warning, span.wrap_caution, span.wrap_notice, span.wrap_safety,
span.wrap_info, span.wrap_important, span.wrap_alert, span.wrap_tip, span.wrap_help, span.wrap_todo, span.wrap_download {
span.wrap_info, span.wrap_important, span.wrap_explosive, span.wrap_alert, span.wrap_tip, span.wrap_help, span.wrap_todo, span.wrap_download {
border: 1px solid #999;
padding: 0 .3em;
}
Expand Down
12 changes: 11 additions & 1 deletion style.less
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ span.wrap_safety {
/* general styles for all note divs */
div.wrap_info,
div.wrap_important,
div.wrap_explosive,
div.wrap_alert,
div.wrap_tip,
div.wrap_help,
Expand All @@ -51,6 +52,7 @@ div.wrap_download {
/* general styles for all note spans */
span.wrap_info,
span.wrap_important,
span.wrap_explosive,
span.wrap_alert,
span.wrap_tip,
span.wrap_help,
Expand All @@ -67,6 +69,7 @@ span.wrap_download {
to make this look good without adjusting the images themselves */
[dir=rtl] div.wrap_info,
[dir=rtl] div.wrap_important,
[dir=rtl] div.wrap_explosive,
[dir=rtl] div.wrap_alert,
[dir=rtl] div.wrap_tip,
[dir=rtl] div.wrap_help,
Expand All @@ -77,6 +80,7 @@ span.wrap_download {
}
[dir=rtl] span.wrap_info,
[dir=rtl] span.wrap_important,
[dir=rtl] span.wrap_explosive,
[dir=rtl] span.wrap_alert,
[dir=rtl] span.wrap_tip,
[dir=rtl] span.wrap_help,
Expand All @@ -98,6 +102,12 @@ span.wrap_info { background-image: url(images/note/16/info.png); }
div.wrap_important { background-image: url(images/note/48/important.png); }
span.wrap_important { background-image: url(images/note/16/important.png); }

/*____________ explosive ____________*/
.wrap_explosive { background-color: #ffd39f; }
.wrap__dark.wrap_important { background-color: #6c3b00; }
div.wrap_explosive { background-image: url(images/note/48/explosive.png); }
span.wrap_explosive { background-image: url(images/note/16/explosive.png); }

/*____________ alert ____________*/
.wrap_alert { background-color: #ffbcaf; }
.wrap__dark.wrap_alert { background-color: #6b1100; }
Expand All @@ -119,7 +129,7 @@ span.wrap_help { background-image: url(images/note/16/help.png); }
/*____________ todo ____________*/
.wrap_todo { background-color: #c2efdd; }
.wrap__dark.wrap_todo { background-color: #17573e; }
div.wrap_todo { background-image: url(images/note/48/todo.png); }
div.wrap_todo { background-image: url(images/note/48/explosive.png); }
Copy link

@phy25 phy25 Aug 22, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This may be unintended?

Suggested change
div.wrap_todo { background-image: url(images/note/48/explosive.png); }
div.wrap_todo { background-image: url(images/note/48/todo.png); }

span.wrap_todo { background-image: url(images/note/16/todo.png); }

/*____________ download ____________*/
Expand Down