@@ -92,7 +92,7 @@ discard block |
||
92 | 92 | $this->baseDomain = App::$Properties->get('baseDomain'); |
93 | 93 | } |
94 | 94 | // build script url |
95 | - $this->scriptUrl = App::$Request->getScheme() . '://' . $this->baseDomain; |
|
95 | + $this->scriptUrl = App::$Request->getScheme().'://'.$this->baseDomain; |
|
96 | 96 | if (App::$Properties->get('basePath') !== '/') { |
97 | 97 | $this->scriptUrl .= rtrim(App::$Properties->get('basePath'), '/'); |
98 | 98 | } |
@@ -104,27 +104,27 @@ discard block |
||
104 | 104 | |
105 | 105 | $this->baseUrlNoLang = $this->baseUrl; |
106 | 106 | if (App::$Request->languageInPath() && App::$Request->getLanguage() !== null) { |
107 | - $this->baseUrl .= '/' . App::$Request->getLanguage(); |
|
107 | + $this->baseUrl .= '/'.App::$Request->getLanguage(); |
|
108 | 108 | } |
109 | 109 | |
110 | 110 | // add cron initiation from user if enabled |
111 | 111 | if ((bool)App::$Properties->get('userCron') && env_name === 'Front') { |
112 | - $this->addPlainCode('js', 'if(Math.random() > 0.8) { $.get("' . $this->scriptUrl . '/cron.php?rand=" + Math.random()); }'); |
|
112 | + $this->addPlainCode('js', 'if(Math.random() > 0.8) { $.get("'.$this->scriptUrl.'/cron.php?rand=" + Math.random()); }'); |
|
113 | 113 | } |
114 | 114 | |
115 | 115 | // build vendor libs alias |
116 | - $this->vendorNamedLibrary['js']['jquery'] = $this->scriptUrl . '/vendor/bower/jquery/dist/jquery.min.js'; |
|
117 | - $this->vendorNamedLibrary['css']['bootstrap'] = $this->scriptUrl . '/vendor/bower/bootstrap/dist/css/bootstrap.min.css'; |
|
118 | - $this->vendorNamedLibrary['js']['bootstrap'] = $this->scriptUrl . '/vendor/bower/bootstrap/dist/js/bootstrap.min.js'; |
|
119 | - $this->vendorNamedLibrary['css']['fa'] = $this->scriptUrl . '/vendor/bower/components-font-awesome/css/font-awesome.min.css'; |
|
120 | - $this->vendorNamedLibrary['js']['jquery-ui'] = $this->scriptUrl . '/vendor/bower/jquery-ui/jquery-ui.min.js'; |
|
121 | - $this->vendorNamedLibrary['css']['jquery-ui'] = $this->scriptUrl . '/vendor/bower/jquery-ui/themes/base/jquery-ui.min.css'; |
|
116 | + $this->vendorNamedLibrary['js']['jquery'] = $this->scriptUrl.'/vendor/bower/jquery/dist/jquery.min.js'; |
|
117 | + $this->vendorNamedLibrary['css']['bootstrap'] = $this->scriptUrl.'/vendor/bower/bootstrap/dist/css/bootstrap.min.css'; |
|
118 | + $this->vendorNamedLibrary['js']['bootstrap'] = $this->scriptUrl.'/vendor/bower/bootstrap/dist/js/bootstrap.min.js'; |
|
119 | + $this->vendorNamedLibrary['css']['fa'] = $this->scriptUrl.'/vendor/bower/components-font-awesome/css/font-awesome.min.css'; |
|
120 | + $this->vendorNamedLibrary['js']['jquery-ui'] = $this->scriptUrl.'/vendor/bower/jquery-ui/jquery-ui.min.js'; |
|
121 | + $this->vendorNamedLibrary['css']['jquery-ui'] = $this->scriptUrl.'/vendor/bower/jquery-ui/themes/base/jquery-ui.min.css'; |
|
122 | 122 | |
123 | 123 | $themeAll = App::$Properties->get('theme'); |
124 | 124 | if (!isset($themeAll[env_name]) || Str::length($themeAll[env_name]) < 1) { |
125 | 125 | $themeAll[env_name] = 'default'; |
126 | 126 | } |
127 | - $this->currentViewUrl = $this->scriptUrl . '/Apps/View/' . env_name . '/' . $themeAll[env_name]; |
|
127 | + $this->currentViewUrl = $this->scriptUrl.'/Apps/View/'.env_name.'/'.$themeAll[env_name]; |
|
128 | 128 | } |
129 | 129 | |
130 | 130 | /** |