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

  • Committer: a11emmjo
  • Date: 2013-05-26 14:29:27 UTC
  • mfrom: (103 lenasys_b)
  • mto: This revision was merged to the branch mainline in revision 104.
  • Revision ID: a11emmjo@student.his.se-20130526142927-6jq83th03oizbnbw
Updated branch.

Updated getActiveCourse in user-model, and fixed so bannermenu- and cms-view uses it.
Removed links from bannermenu-view.
Fixed so cms is loaded in home-controller when user is logged in.
Added function for expand collapse courses in bannermenu-view.

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/ajax.php
17
17
                public function popup($popupName) {
18
18
                        $this->load->view('popup/'.$popupName);
19
19
                }
 
20
 
 
21
                function showPopup($popupName) {
 
22
                        $headTagData = array(
 
23
                                'cssFiles' => array('bannermenu', 'popup')
 
24
                        );
 
25
 
 
26
                        $userInfo = array(
 
27
                                'userType' => $this->user->getUserType(), // Loads different header for teacher/student
 
28
                                'userName' => $this->user->getUserName()
 
29
                        );
 
30
 
 
31
                        // Loads head views, supplying CSS and JS data
 
32
                        $this->load->view('headTag', array('headTagData' => $headTagData));
 
33
                        $this->load->view('bannermenu', $userInfo);
 
34
 
 
35
                        $this->load->view('popup/'.$popupName);
 
36
                }
20
37
                
21
38
                /*
22
39
                 *      This function return TRUE if the user is logged in and FALSE otherwise.