/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/ManageCourses.php

  • Committer: elof.bigestans at gmail
  • Date: 2013-05-27 12:01:10 UTC
  • mfrom: (105 lenasys_b)
  • mto: This revision was merged to the branch mainline in revision 107.
  • Revision ID: elof.bigestans@gmail.com-20130527120110-05decmi92i3qjupg
* Merged trunk
* Added new files relating to login functionality 
* Added login and logout functions to start controller

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/ManageCourses.php
41
41
                
42
42
                // Arrays
43
43
                $headTagData = array(
44
 
                        'cssFiles' => array('manageCoursesBody', 'bannermenu', 'popup'),
 
44
                        'cssFiles' => array('manageCoursesBody', 'popup'),
45
45
                        'jsFiles' => array('examplesBody', 'userControls', 'manageCourses')
46
46
                );
47
47
 
52
52
 
53
53
                // Loads head views, supplying CSS and JS data
54
54
                $this->load->view('headTag', array('headTagData' => $headTagData));
55
 
                $this->load->view('bannermenu', $userInfo);
 
55
                //$this->load->view('bannermenu', $userInfo);
56
56
 
57
57
                // Check user login and display message if not logged in
58
58
                if(!$this->user->isLoggedIn() || $this->user->getUserType() != "Teacher") {