Commit d2af2a94 authored by Raph El's avatar Raph El

Merge branch 'master' into qa

parents c31b1aec a61b303f
......@@ -528,9 +528,9 @@ var Login = {
var ListPath = [
//tka todo : should be loaded on demand
//'/plugins/jquery.dynForm.js',
'/plugins/jquery-validation/dist/jquery.validate.min.js',
//'/plugins/jquery-validation/dist/jquery.validate.min.js',
'/plugins/jQuery-Knob/js/jquery.knob.js',
'/plugins/jQuery-Smart-Wizard/js/jquery.smartWizard.js',
//'/plugins/jQuery-Smart-Wizard/js/jquery.smartWizard.js',
//'/plugins/jquery.dynSurvey/jquery.dynSurvey.js',
//'/plugins/select2/select2.min.js' ,
......@@ -539,14 +539,14 @@ var Login = {
// '/plugins/bootbox/bootbox.min.js' ,
// '/plugins/blockUI/jquery.blockUI.js' ,
'/plugins/bootstrap-fileupload/bootstrap-fileupload.min.js' ,
'/plugins/bootstrap-fileupload/bootstrap-fileupload.min.css',
'/plugins/jquery-cookieDirective/jquery.cookiesdirective.js' ,
'/plugins/ladda-bootstrap/dist/spin.min.js' ,
'/plugins/ladda-bootstrap/dist/ladda.min.js' ,
'/plugins/ladda-bootstrap/dist/ladda.min.css',
'/plugins/ladda-bootstrap/dist/ladda-themeless.min.css',
'/plugins/animate.css/animate.min.css'
//'/plugins/bootstrap-fileupload/bootstrap-fileupload.min.js' ,
//'/plugins/bootstrap-fileupload/bootstrap-fileupload.min.css',
//'/plugins/jquery-cookieDirective/jquery.cookiesdirective.js' ,
//'/plugins/ladda-bootstrap/dist/spin.min.js' ,
//'/plugins/ladda-bootstrap/dist/ladda.min.js' ,
//'/plugins/ladda-bootstrap/dist/ladda.min.css',
//'/plugins/ladda-bootstrap/dist/ladda-themeless.min.css',
//'/plugins/animate.css/animate.min.css'
];
lazyLoadMany( ListPath,
......
......@@ -119,9 +119,9 @@
adminPanel.params.subView = true;
}
jQuery(document).ready(function() {
mylog.log("---admin/index.php");
if(superAdmin == "" && sourceAdmin == "" && !authorizedAdmin){
urlCtrl.loadByHash("");
mylog.log("---admin/index.php", authorizedAdmin, !authorizedAdmin);
if(!authorizedAdmin){
//urlCtrl.loadByHash("");
bootbox.dialog({message:'<div class="alert-danger text-center"><strong><?php echo Yii::t("common","You are not authorized to acces adminastrator panel ! <br/>Connect you or contact us in order to become admin system") ?></strong></div>'});
}
adminPanel.init();
......
......@@ -3,7 +3,7 @@
$cssAnsScriptFiles = array(
'/assets/css/welcome.css'
);
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFiles, Yii::app()->theme->baseUrl);
//HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFiles, Yii::app()->theme->baseUrl);
?>
<section class="bg-white inline-block pull-left col-xs-12 no-padding" id="bg-homepage">
......
......@@ -3,7 +3,7 @@
$cssAnsScriptFiles = array(
'/assets/css/welcome.css'
);
HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFiles, Yii::app()->theme->baseUrl);
//HtmlHelper::registerCssAndScriptsFiles($cssAnsScriptFiles, Yii::app()->theme->baseUrl);
?>
<section class="bg-white inline-block pull-left no-padding" id="bg-homepage">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment