/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to codeigniter/application/controllers/start.php

  • Committer: Gustav Hatvigsson
  • Date: 2013-05-28 11:46:41 UTC
  • mfrom: (83.2.19 pvp)
  • Revision ID: gustav.hartvigsson@gmail.com-20130528114641-jc7sbw7ffajiwnix
Merged Bigestans:s changes:
* Merged trunk AND
* Modified js/login.js and js/bannermenu.js, specifically functions related to the login popup!
Continuing work on viewstudents

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/start.php
68
68
                        //Creates an array with the necessary css- and jsfiles needed for the views that are about to be shown.
69
69
                        $headTagData = array(
70
70
                                'cssFiles' => array('bannermenu', 'startview'),
71
 
                                'jsFiles' => array('bannermenu')
 
71
                                'jsFiles' => array('bannermenu', 'login')
72
72
                        );
73
73
                        
74
74
                        //Puts the array above in <head></head>