diff --git a/application/config/config.php b/application/config/config.php index 5757bfcf..4e79001f 100644 --- a/application/config/config.php +++ b/application/config/config.php @@ -468,6 +468,7 @@ $config['head']['default']['js'] = array( "___path.framework.frontend.web___/js/vendor/parsley/i18n/messages.ru.js", "___path.framework.frontend.web___/js/vendor/jquery.livequery.js", "___path.framework.frontend.web___/js/vendor/fotorama/fotorama.js", + "___path.framework.frontend.web___/js/vendor/nprogress/nprogress.js", /* Core */ "___path.framework.frontend.web___/js/core/main.js", diff --git a/application/frontend/skin/developer/settings/config/config.php b/application/frontend/skin/developer/settings/config/config.php index 81cb7db6..6d3acb4a 100644 --- a/application/frontend/skin/developer/settings/config/config.php +++ b/application/frontend/skin/developer/settings/config/config.php @@ -34,6 +34,7 @@ $aCss=array( "___path.framework.frontend.web___/js/vendor/prettyphoto/css/prettyphoto.css", "___path.framework.frontend.web___/js/vendor/notifier/jquery.notifier.css", "___path.framework.frontend.web___/js/vendor/fotorama/fotorama.css", + "___path.framework.frontend.web___/js/vendor/nprogress/nprogress.css", "___path.skin.assets.web___/css/grid.css", "___path.skin.assets.web___/css/forms.css", "___path.skin.assets.web___/css/common.css", diff --git a/framework b/framework index abb3f1f8..28a6b6f3 160000 --- a/framework +++ b/framework @@ -1 +1 @@ -Subproject commit abb3f1f88006bfa1f713cebf77754d88d2f6d878 +Subproject commit 28a6b6f3897ddcc48efa5f00ce384485a61ae49b