Updated Notifications and AssetPack plugin
diff --git a/Changes b/Changes
index 185b3bb..d29b526 100755
--- a/Changes
+++ b/Changes
@@ -1,3 +1,6 @@
+0.06 2014-09-08
+ - Updated certain Notifications and AssetPack plugins
+
0.05 2014-07-15
- Improved tutorial support
- Added Exception mail system
diff --git a/Makefile.PL b/Makefile.PL
index f80f72c..96cf8b3 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -14,15 +14,15 @@
},
LICENSE => 'artistic_2',
PREREQ_PM => {
- 'Mojolicious' => '4.92',
+ 'Mojolicious' => '5.00',
'Mojolicious::Plugin::TagHelpers::Pagination' => 0.01,
- 'Mojolicious::Plugin::Notifications' => 0.03,
+ 'Mojolicious::Plugin::Notifications' => 0.04,
'Mojolicious::Plugin::MailException' => 0.18,
'Mojolicious::Plugin::CHI' => 0.09,
'Cache::FastMmap' => 0,
'Mojolicious::Plugin::Number::Commify' => '0.022',
'JSON::XS' => 0.0,
- 'Mojolicious::Plugin::AssetPack' => 0.14,
+ 'Mojolicious::Plugin::AssetPack' => 0.23,
'JavaScript::Minifier::XS' => 0.09,
'CSS::Minifier::XS' => 0.09,
'CSS::Sass' => '0.8.1'
diff --git a/korap.conf b/korap.conf
index fcdf777..02d0fc9 100644
--- a/korap.conf
+++ b/korap.conf
@@ -1,11 +1,9 @@
{
KorAP => {
-# 'api' => 'http://10.0.10.13:8070/api/v1/',
'api-0.1' => 'http://10.0.10.13:8888/api/v0.1/'
},
Notifications => {
Alertify => 1,
- Humane => 1,
JSON => 1
},
Search => {
diff --git a/lib/Korap.pm b/lib/Korap.pm
index b7cb6cf..c57a63a 100644
--- a/lib/Korap.pm
+++ b/lib/Korap.pm
@@ -49,10 +49,11 @@
'/sass/table.scss',
'/sass/pagination.scss',
'/sass/kwic-4.0.scss',
- '/sass/alertify.scss',
'/css/media.css',
'/css/font-awesome.min.css',
- '/css/highlight.css'
+ '/css/highlight.css',
+ # '/sass/alertify.scss',
+ $self->notifications->styles
)
);
@@ -62,7 +63,8 @@
'/js/tutorialCookie.js',
'/js/translateTable.js',
'/js/hint.js',
- '/js/highlight.pack.js'
+ '/js/highlight.pack.js',
+ $self->notifications->scripts
)
);
diff --git a/lib/Mojolicious/Plugin/AssetPack/LibSass.pm b/lib/Mojolicious/Plugin/AssetPack/LibSass.pm
index 6a082a4..ef1bffc 100644
--- a/lib/Mojolicious/Plugin/AssetPack/LibSass.pm
+++ b/lib/Mojolicious/Plugin/AssetPack/LibSass.pm
@@ -19,7 +19,6 @@
my ($as, $text, $file) = @_;
$$text = CSS::Minifier::XS::minify($sass->compile($$text));
});
- $proc->map_type(scss => 'css');
};
1;
diff --git a/templates/layouts/default.html.ep b/templates/layouts/default.html.ep
index 7483c85..c5ab254 100644
--- a/templates/layouts/default.html.ep
+++ b/templates/layouts/default.html.ep
@@ -96,6 +96,6 @@
%= content 'javascript'
%= include 'partial/javascript'
-%= notifications 'Alertify'
+%= notifications 'Alertify', -no_include
</body>
</html>