Skip to content

Commit 5fc0da2

Browse files
committed
code cleanup
1 parent a66812e commit 5fc0da2

2 files changed

Lines changed: 4 additions & 24 deletions

File tree

src/Templates/Siimple2Template.php

Lines changed: 1 addition & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,31 +2,13 @@
22

33
namespace Tamtamchik\SimpleFlash\Templates;
44

5-
use Tamtamchik\SimpleFlash\BaseTemplate;
65
use Tamtamchik\SimpleFlash\TemplateInterface;
76

87
/**
98
* Class Siimple2Template.
109
* Uses default Semantic UI markdown for flash messages.
1110
*/
12-
class Siimple2Template extends BaseTemplate implements TemplateInterface
11+
class Siimple2Template extends SiimpleTemplate implements TemplateInterface
1312
{
14-
protected $prefix = '';
15-
protected $postfix = '<br />';
1613
protected $wrapper = '<div class="siimple-alert siimple-alert--%s">%s</div>';
17-
18-
/**
19-
* Override base function to suite Bootstrap 3 alert naming.
20-
*
21-
* @param $messages - message text
22-
* @param $type - message type: success, info, warning, error
23-
*
24-
* @return string
25-
*/
26-
public function wrapMessages($messages, $type)
27-
{
28-
$type = ($type == 'success') ? 'done' : $type;
29-
30-
return sprintf($this->getWrapper(), $type, $messages);
31-
}
3214
}

src/Templates/Uikit3Template.php

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,15 @@
22

33
namespace Tamtamchik\SimpleFlash\Templates;
44

5-
use Tamtamchik\SimpleFlash\BaseTemplate;
65
use Tamtamchik\SimpleFlash\TemplateInterface;
76

87
/**
98
* Class Uikit3Template.
109
* Uses default Semantic UI markdown for flash messages.
1110
*/
12-
class Uikit3Template extends BaseTemplate implements TemplateInterface
11+
class Uikit3Template extends Uikit2Template implements TemplateInterface
1312
{
14-
protected $prefix = '<p>';
15-
protected $postfix = '</p>';
16-
protected $wrapper = '<div class="uk-alert uk-alert-%s" data-uk-alert>%s</div>';
13+
protected $wrapper = '<div uk-alert class="uk-alert-%s">%s</div>';
1714

1815
/**
1916
* Override base function to suite Bootstrap 3 alert naming.
@@ -26,6 +23,7 @@ class Uikit3Template extends BaseTemplate implements TemplateInterface
2623
public function wrapMessages($messages, $type)
2724
{
2825
$type = ($type == 'error') ? 'danger' : $type;
26+
$type = ($type == 'info') ? 'primary' : $type;
2927

3028
return sprintf($this->getWrapper(), $type, $messages);
3129
}

0 commit comments

Comments
 (0)