@@ -19,15 +19,15 @@ |
||
19 | 19 | /** |
20 | 20 | * |
21 | 21 | */ |
22 | - const COLOR_AQUA = 'aqua'; |
|
22 | + const COLOR_AQUA = 'aqua'; |
|
23 | 23 | /** |
24 | 24 | * |
25 | 25 | */ |
26 | - const COLOR_GREEN = 'green'; |
|
26 | + const COLOR_GREEN = 'green'; |
|
27 | 27 | /** |
28 | 28 | * |
29 | 29 | */ |
30 | - const COLOR_RED = 'red'; |
|
30 | + const COLOR_RED = 'red'; |
|
31 | 31 | /** |
32 | 32 | * |
33 | 33 | */ |
@@ -51,11 +51,11 @@ |
||
51 | 51 | * @param null $sentAt |
52 | 52 | * @param UserInterface $to |
53 | 53 | */ |
54 | - function __construct(UserInterface $from = null, $subject= '', $sentAt = null, UserInterface $to = null) |
|
54 | + function __construct(UserInterface $from = null, $subject = '', $sentAt = null, UserInterface $to = null) |
|
55 | 55 | { |
56 | 56 | $this->to = $to; |
57 | 57 | $this->subject = $subject; |
58 | - $this->sentAt = $sentAt ? : new \DateTime(); |
|
58 | + $this->sentAt = $sentAt ?: new \DateTime(); |
|
59 | 59 | $this->from = $from; |
60 | 60 | } |
61 | 61 |
@@ -25,7 +25,7 @@ |
||
25 | 25 | protected function findTemplate(Request $request, $format, $code, $debug) |
26 | 26 | { |
27 | 27 | |
28 | - if(strpos($request->getPathInfo(), '/admin') !== 0) { |
|
28 | + if (strpos($request->getPathInfo(), '/admin') !== 0) { |
|
29 | 29 | return parent::findTemplate($request, $format, $code, $debug); |
30 | 30 | } |
31 | 31 |
@@ -58,7 +58,7 @@ |
||
58 | 58 | $list = array(); |
59 | 59 | if ($active) { |
60 | 60 | $list[] = $active; |
61 | - while(null !== ($item = $active->getActiveChild())) { |
|
61 | + while (null !== ($item = $active->getActiveChild())) { |
|
62 | 62 | $list[] = $item; |
63 | 63 | $active = $item; |
64 | 64 | } |
@@ -43,7 +43,7 @@ |
||
43 | 43 | } |
44 | 44 | |
45 | 45 | public function formAction() { |
46 | - $form =$this->createForm( new FormDemoModelType()); |
|
46 | + $form = $this->createForm(new FormDemoModelType()); |
|
47 | 47 | return $this->render('ChamiloThemeBundle:Default:form.html.twig', array( |
48 | 48 | 'form' => $form->createView() |
49 | 49 | )); |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | function __construct($container, $resolverClass = null) |
37 | 37 | { |
38 | 38 | $this->container = $container; |
39 | - $this->resolverClass = $resolverClass?: 'Chamilo\ThemeBundle\Util\DependencyResolver'; |
|
39 | + $this->resolverClass = $resolverClass ?: 'Chamilo\ThemeBundle\Util\DependencyResolver'; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | public function registerScript($id, $src, $deps = array(), $location = "bottom") |
@@ -53,7 +53,7 @@ discard block |
||
53 | 53 | } |
54 | 54 | |
55 | 55 | public function registerStyle($id, $src, $deps = array()) { |
56 | - if(!isset($this->stylesheets[$id])) { |
|
56 | + if (!isset($this->stylesheets[$id])) { |
|
57 | 57 | $this->stylesheets[$id] = array( |
58 | 58 | 'src' => $src, |
59 | 59 | 'deps' => $deps, |
@@ -64,14 +64,14 @@ discard block |
||
64 | 64 | public function getScripts($location = 'bottom') { |
65 | 65 | |
66 | 66 | $unsorted = array(); $srcList = array(); $assetList = array(); |
67 | - foreach($this->javascripts as $id => $scriptDefinition) { |
|
68 | - if($scriptDefinition['location'] == $location) { |
|
67 | + foreach ($this->javascripts as $id => $scriptDefinition) { |
|
68 | + if ($scriptDefinition['location'] == $location) { |
|
69 | 69 | $unsorted[$id] = $scriptDefinition; |
70 | 70 | } |
71 | 71 | } |
72 | 72 | |
73 | 73 | $queue = $this->getResolver()->register($unsorted)->resolveAll(); |
74 | - foreach($queue as $def){ |
|
74 | + foreach ($queue as $def) { |
|
75 | 75 | $srcList[] = $def['src']; |
76 | 76 | } |
77 | 77 | return $srcList; |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | public function getStyles() { |
81 | 81 | $srcList = array(); |
82 | 82 | $queue = $this->getResolver()->register($this->stylesheets)->resolveAll(); |
83 | - foreach($queue as $def){ |
|
83 | + foreach ($queue as $def) { |
|
84 | 84 | $srcList[] = $def['src']; |
85 | 85 | } |
86 | 86 | return $srcList; |
@@ -25,7 +25,7 @@ discard block |
||
25 | 25 | |
26 | 26 | //$container->setParameter('avanzu_admin_theme.bower_bin', $config['bower_bin']); |
27 | 27 | |
28 | - $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__ . '/../Resources/config')); |
|
28 | + $loader = new Loader\XmlFileLoader($container, new FileLocator(__DIR__.'/../Resources/config')); |
|
29 | 29 | $loader->load('services.xml'); |
30 | 30 | } |
31 | 31 | |
@@ -54,10 +54,10 @@ discard block |
||
54 | 54 | return; |
55 | 55 | |
56 | 56 | $jsAssets = '@ChamiloThemeBundle/Resources/'; |
57 | - $lteJs = $jsAssets . 'public/vendor/adminlte/js/'; |
|
57 | + $lteJs = $jsAssets.'public/vendor/adminlte/js/'; |
|
58 | 58 | $cssAssets = 'bundles/avanzuadmintheme/'; |
59 | - $lteCss = $cssAssets . 'vendor/adminlte/css/'; |
|
60 | - $lteFont = $cssAssets . 'vendor/adminlte/fonts/'; |
|
59 | + $lteCss = $cssAssets.'vendor/adminlte/css/'; |
|
60 | + $lteFont = $cssAssets.'vendor/adminlte/fonts/'; |
|
61 | 61 | |
62 | 62 | if (isset($bundles['AsseticBundle']) && 0) { |
63 | 63 | $container->prependExtensionConfig( |
@@ -69,97 +69,97 @@ discard block |
||
69 | 69 | 'assets' => array( |
70 | 70 | 'common_js' => array( |
71 | 71 | 'inputs' => array( |
72 | - $jsAssets . 'public/vendor/jquery/dist/jquery.js', |
|
73 | - $jsAssets . 'public/vendor/jquery-ui/jquery-ui.js', |
|
74 | - $jsAssets . 'public/vendor/underscore/underscore.js', |
|
75 | - $jsAssets . 'public/vendor/backbone/backbone.js', |
|
76 | - $jsAssets . 'public/vendor/marionette/lib/backbone.marionette.js', |
|
77 | - $jsAssets . 'public/vendor/bootstrap/dist/js/bootstrap.min.js', |
|
78 | - $jsAssets . 'public/vendor/bootbox/bootbox.js', |
|
79 | - $jsAssets . 'public/js/dialogs.js', |
|
80 | - $jsAssets . 'public/js/namespace.js', |
|
72 | + $jsAssets.'public/vendor/jquery/dist/jquery.js', |
|
73 | + $jsAssets.'public/vendor/jquery-ui/jquery-ui.js', |
|
74 | + $jsAssets.'public/vendor/underscore/underscore.js', |
|
75 | + $jsAssets.'public/vendor/backbone/backbone.js', |
|
76 | + $jsAssets.'public/vendor/marionette/lib/backbone.marionette.js', |
|
77 | + $jsAssets.'public/vendor/bootstrap/dist/js/bootstrap.min.js', |
|
78 | + $jsAssets.'public/vendor/bootbox/bootbox.js', |
|
79 | + $jsAssets.'public/js/dialogs.js', |
|
80 | + $jsAssets.'public/js/namespace.js', |
|
81 | 81 | ), |
82 | 82 | ), |
83 | 83 | 'tools_js' => array( |
84 | 84 | 'inputs' => array( |
85 | 85 | '@common_js', |
86 | - $jsAssets . 'public/vendor/momentjs/moment.js', |
|
87 | - $jsAssets . 'public/vendor/holderjs/holder.js', |
|
88 | - $jsAssets . 'public/vendor/spinjs/spin.js', |
|
86 | + $jsAssets.'public/vendor/momentjs/moment.js', |
|
87 | + $jsAssets.'public/vendor/holderjs/holder.js', |
|
88 | + $jsAssets.'public/vendor/spinjs/spin.js', |
|
89 | 89 | ), |
90 | 90 | ), |
91 | 91 | 'admin_lte_js' => array( |
92 | 92 | 'inputs' => array( |
93 | - $lteJs . 'plugins/bootstrap-slider/bootstrap-slider.js', |
|
94 | - $lteJs . 'plugins/datatables/jquery.dataTables.js', |
|
95 | - $lteJs . 'plugins/datatables/dataTables.bootstrap.js', |
|
96 | - $lteJs . 'plugins/slimScroll/jquery.slimscroll.js', |
|
97 | - $jsAssets . 'public/js/adminLTE.js', |
|
93 | + $lteJs.'plugins/bootstrap-slider/bootstrap-slider.js', |
|
94 | + $lteJs.'plugins/datatables/jquery.dataTables.js', |
|
95 | + $lteJs.'plugins/datatables/dataTables.bootstrap.js', |
|
96 | + $lteJs.'plugins/slimScroll/jquery.slimscroll.js', |
|
97 | + $jsAssets.'public/js/adminLTE.js', |
|
98 | 98 | ) |
99 | 99 | ), |
100 | 100 | 'admin_lte_css' => array( |
101 | 101 | 'inputs' => array( |
102 | 102 | |
103 | 103 | // $lteCss . 'jQueryUI/jquery-ui-1.10.3.custom.css', |
104 | - $cssAssets . 'vendor/bootstrap/dist/css/bootstrap.min.css', |
|
105 | - $lteCss . 'bootstrap-slider/slider.css', |
|
106 | - $lteCss . 'datatables/dataTables.bootstrap.css', |
|
107 | - $cssAssets . 'vendor/fontawesome/css/font-awesome.min.css', |
|
108 | - $cssAssets . 'vendor/ionicons/css/ionicons.min.css', |
|
109 | - $lteCss . 'AdminLTE.css', |
|
104 | + $cssAssets.'vendor/bootstrap/dist/css/bootstrap.min.css', |
|
105 | + $lteCss.'bootstrap-slider/slider.css', |
|
106 | + $lteCss.'datatables/dataTables.bootstrap.css', |
|
107 | + $cssAssets.'vendor/fontawesome/css/font-awesome.min.css', |
|
108 | + $cssAssets.'vendor/ionicons/css/ionicons.min.css', |
|
109 | + $lteCss.'AdminLTE.css', |
|
110 | 110 | //$lteFont . 'fontawesome-webfont.eot', |
111 | 111 | // $lteFont . 'ionicons.eot', |
112 | 112 | ) |
113 | 113 | ), |
114 | 114 | 'admin_lte_forms_js' => array( |
115 | 115 | 'inputs' => array( |
116 | - $lteJs . 'plugins/colorpicker/bootstrap-colorpicker.js', |
|
117 | - $lteJs . 'plugins/daterangepicker/daterangepicker.js', |
|
118 | - $lteJs . 'plugins/timepicker/bootstrap-timepicker.js', |
|
119 | - $lteJs . 'plugins/input-mask/jquery.inputmask.js', |
|
116 | + $lteJs.'plugins/colorpicker/bootstrap-colorpicker.js', |
|
117 | + $lteJs.'plugins/daterangepicker/daterangepicker.js', |
|
118 | + $lteJs.'plugins/timepicker/bootstrap-timepicker.js', |
|
119 | + $lteJs.'plugins/input-mask/jquery.inputmask.js', |
|
120 | 120 | // $lteJs.'plugins/input-mask/*', |
121 | 121 | ) |
122 | 122 | ), |
123 | 123 | 'admin_lte_forms_css' => array( |
124 | 124 | 'inputs' => array( |
125 | - $lteCss . 'colorpicker/bootstrap-colorpicker.css', |
|
126 | - $lteCss . 'daterangepicker/daterangepicker-bs3.css', |
|
127 | - $lteCss . 'timepicker/bootstrap-timepicker.css', |
|
125 | + $lteCss.'colorpicker/bootstrap-colorpicker.css', |
|
126 | + $lteCss.'daterangepicker/daterangepicker-bs3.css', |
|
127 | + $lteCss.'timepicker/bootstrap-timepicker.css', |
|
128 | 128 | ) |
129 | 129 | ), |
130 | 130 | 'admin_lte_wysiwyg' => array( |
131 | 131 | 'inputs' => array( |
132 | - $lteJs . 'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js', |
|
132 | + $lteJs.'plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.js', |
|
133 | 133 | ) |
134 | 134 | ), |
135 | 135 | 'admin_lte_wysiwyg_css' => array( |
136 | 136 | 'inputs' => array( |
137 | - $lteCss . 'bootstrap-wysihtml5/bootstrap3-wysihtml5.css', |
|
137 | + $lteCss.'bootstrap-wysihtml5/bootstrap3-wysihtml5.css', |
|
138 | 138 | ) |
139 | 139 | ), |
140 | 140 | 'admin_lte_morris' => array( |
141 | 141 | 'inputs' => array( |
142 | - $lteJs . 'plugins/morris/morris.js', |
|
142 | + $lteJs.'plugins/morris/morris.js', |
|
143 | 143 | ) |
144 | 144 | ), |
145 | 145 | 'admin_lte_morris_css' => array( |
146 | 146 | 'inputs' => array( |
147 | - $lteCss . 'morris/morris.css', |
|
147 | + $lteCss.'morris/morris.css', |
|
148 | 148 | ) |
149 | 149 | ), |
150 | 150 | 'admin_lte_flot' => array( |
151 | 151 | 'inputs' => array( |
152 | - $lteJs . 'plugins/flot/*', |
|
152 | + $lteJs.'plugins/flot/*', |
|
153 | 153 | ) |
154 | 154 | ), |
155 | 155 | 'admin_lte_calendar' => array( |
156 | 156 | 'inputs' => array( |
157 | - $jsAssets . 'public/vendor/fullcalendar/dist/fullcalendar.min.js', |
|
157 | + $jsAssets.'public/vendor/fullcalendar/dist/fullcalendar.min.js', |
|
158 | 158 | ) |
159 | 159 | ), |
160 | 160 | 'admin_lte_calendar_css' => array( |
161 | 161 | 'inputs' => array( |
162 | - $lteCss . 'fullcalendar/fullcalendar.css', |
|
162 | + $lteCss.'fullcalendar/fullcalendar.css', |
|
163 | 163 | ) |
164 | 164 | ), |
165 | 165 | 'avatar_img' => array( |
@@ -24,8 +24,8 @@ discard block |
||
24 | 24 | |
25 | 25 | function __construct($manager, $cssBase = null, $lteAdmin = null) |
26 | 26 | { |
27 | - $this->cssBase = $cssBase?:'bundles/avanzuadmintheme/'; |
|
28 | - $this->lteAdmin = $lteAdmin?:'vendor/AdminLTE/css/'; |
|
27 | + $this->cssBase = $cssBase ?: 'bundles/avanzuadmintheme/'; |
|
28 | + $this->lteAdmin = $lteAdmin ?: 'vendor/AdminLTE/css/'; |
|
29 | 29 | $this->manager = $manager; |
30 | 30 | } |
31 | 31 | |
@@ -41,7 +41,7 @@ discard block |
||
41 | 41 | $mng->registerStyle('datatables', $css.'/datatables/dataTables.bootstrap.css', array('bootstrap')); |
42 | 42 | $mng->registerStyle('fontawesome', $css.'/font-awesome.css'); |
43 | 43 | $mng->registerStyle('ionicons', $css.'/ionicons.css'); |
44 | - $mng->registerStyle('admin-lte', $css.'/AdminLTE.css', array('bootstrap-slider', 'fontawesome', 'ionicons','datatables')); |
|
44 | + $mng->registerStyle('admin-lte', $css.'/AdminLTE.css', array('bootstrap-slider', 'fontawesome', 'ionicons', 'datatables')); |
|
45 | 45 | $mng->registerStyle('bs-colorpicker', $css.'/colorpicker/bootstrap-colorpicker.css', array('admin-lte')); |
46 | 46 | $mng->registerStyle('daterangepicker', $css.'/daterangepicker/daterangepicker-bs3.css', array('admin-lte')); |
47 | 47 | $mng->registerStyle('timepicker', $css.'/timepicker/bootstrap-timepicker.css', array('admin-lte')); |
@@ -28,11 +28,11 @@ |
||
28 | 28 | { |
29 | 29 | $request = $event->getRequest(); |
30 | 30 | $uri = $request->getPathInfo(); |
31 | - if(!preg_match('!'.$this->indicator.'!', $uri)) { |
|
31 | + if (!preg_match('!'.$this->indicator.'!', $uri)) { |
|
32 | 32 | return; |
33 | 33 | } |
34 | 34 | |
35 | - if(false == ($user = $this->getUser())){ |
|
35 | + if (false == ($user = $this->getUser())) { |
|
36 | 36 | return; |
37 | 37 | } |
38 | 38 |