/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/views/bannermenu.php

  • Committer: elof.bigestans at gmail
  • Date: 2013-05-23 09:41:14 UTC
  • mfrom: (90 lenasys_b)
  • mto: This revision was merged to the branch mainline in revision 94.
  • Revision ID: elof.bigestans@gmail.com-20130523094114-302hcf9f3tstajl0
Merged and resolved a conflict in manageCoursesBody.php

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/application/views/bannermenu.php
10
10
                        //$userName
11
11
                        $url = base_url();
12
12
                        
13
 
                        if($userName == '') {
14
 
                                $url += 'controller/metod';
15
 
                        }
16
 
                        else {
 
13
                        //If user is logged in
 
14
                        if($userName != '') {
17
15
                                $url += 'controller/metod';
18
16
                        }
19
17
                        
30
28
                <!-- Determines if the header should contain active course info depending on if the user is logged in or not -->
31
29
                <?php
32
30
                                        //$userName
 
31
                                        //$activeCourseName
 
32
                                        //$activeCourseCode
33
33
                                        $header = '';
34
34
                                        
 
35
                                        //If user is logged in
35
36
                                        if($userName != '') {
36
 
                                                $header = '<span id="bannerHeaderCMSCourseName">Webprogramming</span>&nbsp;-&nbsp;
37
 
                                            <span id="bannerHeaderCMSCourseCode">DA330G</span>';
 
37
                                                $header = '<span id="bannerHeaderCMSCourseName">'.$activeCourseName.'</span>&nbsp;-&nbsp;
 
38
                                            <span id="bannerHeaderCMSCourseCode">'.$activeCourseCode.'</span>';
38
39
                                        }
39
40
                                        
40
41
                                        echo '<div id="bannerHeaderCMS">'.$header.'</div>';
92
93
            <a href="#"><div class="dropdownMenuButton">Courses<span id="dropdownMenuButtonArrow">&nbsp;</span></div></a>
93
94
            <div id="dropdownMenuCourseBlock">
94
95
                <ul>
95
 
                    <a href="#"><li class="dropdownMenuCourseBlockNonActiveCourse">Computor Graphics - DA146G</li></a>
96
 
                    <a href="#"><li class="dropdownMenuCourseBlockNonActiveCourse">Database Construction - IS317G</li></a>
97
 
                    <a href="#"><li class="dropdownMenuCourseBlockNonActiveCourse">Database Systems - IS114G</li></a>
98
 
                    <a href="#"><li class="dropdownMenuCourseBlockNonActiveCourse">Webdevelopment XML API - DV313G</li></a>
99
 
                    <a href="#"><li class="dropdownMenuCourseBlockActiveCourse">Webprogramming - DA330G</li></a>
 
96
                                        <?php
 
97
                                                //$courses
 
98
                                                
 
99
                                                foreach($courses as $course) {
 
100
                                                        echo '<li><a href="#">'
 
101
                                                        .$course->name.' - '.$course->courseID;
 
102
                                                        echo '</a></li>';
 
103
                                                }
 
104
                                        ?>
 
105
                    <li class="dropdownMenuCourseBlockActiveCourse"><a href="#">Webprogramming - DA330G</a></li>
100
106
                </ul>
101
107
                <hr>
102
 
                <ul>
103
 
                    <a href="#"><li class="dropdownMenuCourseBlockNotCourse">Manage Courses</li></a>
104
 
                </ul>
 
108
                <p><a href="#">Manage Courses</a></p>
105
109
            </div>
106
110
            <a href="#"><div class="dropdownMenuButton">Add Instructor</div></a>
107
111
            <a href="#"><div class="dropdownMenuButton">Change Password</div></a>