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

  • Committer: Gustav Hatvigsson
  • Date: 2013-05-14 12:42:58 UTC
  • mfrom: (64.1.1 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130514124258-0apqr7uvjukqesef
Mered lots of changes to many files.
Hopefully this will work :-)

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/controllers/layout.php
21
21
class layout extends CI_Controller {
22
22
        
23
23
        public function index() {
24
 
                $headData['list'] = array('headTag', 'header', 'layout_view');
25
 
                $this->load->view('headTag', $headData);
 
24
                $headTagData = array(
 
25
                        'cssFiles' => array('header', 'layout_view'),
 
26
                        'jsFiles' => array('header', 'layout_view', 'userControls')
 
27
                );
 
28
                $this->load->view('headTag', array('headTagData' => $headTagData));
 
29
                
26
30
                $this->load->helper('form');
27
31
                $this->load->model('user');
28
32
                $userInfo = array(