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

  • Committer: Gustav Hatvigsson
  • Date: 2013-05-13 13:53:15 UTC
  • mfrom: (58.1.2 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130513135315-v4fpzy00ni76v2gi
Merged some changes to the Codeviewer

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
        * This shows the codeviewer page
16
16
        */
17
17
        public function show($cid, $category, $subcategory, $example){
 
18
        /*      $headData['list'] = array('headTag', 'header', 'layout_view');
 
19
                $this->load->view('headTag', $headData);
 
20
                $this->load->helper('form');
 
21
                $this->load->model('user');
 
22
                $userInfo = array(
 
23
                        'userType' => $this->user->getUserType(),
 
24
                        'userName' => $this->user->getUserName()
 
25
                );
 
26
        */
18
27
                $this->load->model('codeviewer/Codeviewer_model');
19
28
 
20
29
                $editorHTML = $this->Codeviewer_model->getCode($cid, $category, $subcategory, $example);
25
34
                // Do note that application/views should not be in the first argument of view()
26
35
                // The second argument is data to be shown in the view. "editors" => "test" would
27
36
                // generate an $editors variable in the view containing "test"
 
37
                // $this->load->view('header', $userInfo);
28
38
                $this->load->view('codeviewer/codeviewer', array("editors" => $editorHTML, "documentation" => $doc));
29
39
        }
30
 
}
 
 
b'\\ No newline at end of file'
 
40
}