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

  • Committer: Gustav Hartvigsson
  • Date: 2013-05-15 17:20:30 UTC
  • mfrom: (66.1.1 lenasys)
  • Revision ID: gustav.hartvigsson@gmail.com-20130515172030-hrqwr1cys2pijajj
Merged changes to the Codeviewer

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/models/codeviewer/codeviewer_model.php
19
19
                $outarr = array();
20
20
                foreach ($query->result() as $row) { //creats array with array consisting of columnNr and code file.
21
21
                        $output = "";
 
22
                        $output .= '<div class="classcontainer">';
22
23
                        if($row->fileType == 'Code') {
23
 
                                $output .= '<div class="editorinfo">'.$row->codeLanguage.'&nbsp;&nbsp;&nbsp;&nbsp;'.$row->fileName.'</div>';
 
24
                                $output .= '<div class="editorinfo"><span class="codeLanguage">'.$row->codeLanguage.'</span><span class="codeFilename">'.$row->fileName.'</span></div>';
24
25
                                $output .= '<div id="ace_'.str_replace(".", "", $row->fileName).'" class="ace">';
25
26
                                $output .= $row->dataBlob;
26
27
                                $output .= '</div>';
45
46
                                }
46
47
                                */
47
48
                                $output .= '</script>';
48
 
                                $outarr[] = array($row->columnNr,$output);
49
49
                        } else if($row->fileType == 'Text') {
 
50
                                $output .= '<div class="editorinfo"><span class="codeFilename">Description</span></div>';
 
51
                                $output .= '<div class="textContainer">';
50
52
                                $output .= $row->dataBlob;
51
 
                                $outarr[] = array($row->columnNr,$output);
 
53
                                $output .= '</div>';
52
54
                        }
 
55
                        $output .= '</div>';
 
56
                        $outarr[] = array($row->columnNr,$output);
53
57
 
54
58
                }
55
59