CDCC
/
OLAS
Watch 3
Star 0
Fork 0
Code Issues 0 Pull Requests 0 Releases 0 Wiki Activity
Browse Source

navigation de program y school

Gabriel Santiago Plaza 2 years ago
parent
b15beb8e2b
commit
c4818b0777
84 changed files with 561 additions and 224 deletions
Split View Show Diff Stats
  1. 6
    2
      app/controllers/TemplatesController.php
  2. 5
    5
      app/routes.php
  3. 2
    2
      app/views/global/feedback.blade.php
  4. 2
    2
      app/views/global/profile.blade.php
  5. 2
    2
      app/views/global/view-learning-outcomes-criteria.blade.php
  6. 2
    2
      app/views/global/view-objectives-criteria.blade.php
  7. 2
    2
      app/views/global/view-three-year-plan.blade.php
  8. 0
    0
      app/views/local/managers/admins/_new_navigation.blade.php
  9. 2
    2
      app/views/local/managers/admins/appraisal-program.blade.php
  10. 2
    2
      app/views/local/managers/admins/assessment_reports.blade.php
  11. 2
    2
      app/views/local/managers/admins/criteria.blade.php
  12. 2
    2
      app/views/local/managers/admins/learning-outcome.blade.php
  13. 2
    2
      app/views/local/managers/admins/learning-outcome_new.blade.php
  14. 2
    2
      app/views/local/managers/admins/learning-outcomes-criteria.blade.php
  15. 2
    2
      app/views/local/managers/admins/learning-outcomes-grad-undergrad.blade.php
  16. 2
    2
      app/views/local/managers/admins/learning-outcomes.blade.php
  17. 2
    2
      app/views/local/managers/admins/learning-outcomes_new.blade.php
  18. 2
    2
      app/views/local/managers/admins/new-course-show.blade.php
  19. 2
    2
      app/views/local/managers/admins/new-learning-outcome.blade.php
  20. 2
    2
      app/views/local/managers/admins/new-learning-outcomes.blade.php
  21. 2
    2
      app/views/local/managers/admins/new-report-all.blade.php
  22. 2
    2
      app/views/local/managers/admins/new-report.blade.php
  23. 3
    3
      app/views/local/managers/admins/new_assessment_report.blade.php
  24. 2
    2
      app/views/local/managers/admins/transformativeAction.blade.php
  25. 65
    65
      app/views/local/managers/admins/users.blade (4.29.2015 1.43.03 PM).php
  26. 2
    2
      app/views/local/managers/admins/view_template.blade.php
  27. 173
    0
      app/views/local/managers/pCoords/_new_navigation.blade.php
  28. 2
    2
      app/views/local/managers/pCoords/assessment_report.blade.php
  29. 2
    2
      app/views/local/managers/pCoords/assessment_reports.blade.php
  30. 3
    3
      app/views/local/managers/pCoords/new_assessment_report.blade.php
  31. 1
    1
      app/views/local/managers/pCoords/overview.blade.php
  32. 160
    0
      app/views/local/managers/sCoords/_new_navigation.blade.php
  33. 2
    2
      app/views/local/managers/sCoords/assessment_report.blade.php
  34. 2
    2
      app/views/local/managers/sCoords/assessment_reports.blade.php
  35. 1
    1
      app/views/local/managers/sCoords/criteria.blade.php
  36. 3
    3
      app/views/local/managers/sCoords/new_assessment_report.blade.php
  37. 1
    1
      app/views/local/managers/sCoords/objectives.blade.php
  38. 1
    1
      app/views/local/managers/sCoords/overview.blade.php
  39. 2
    2
      app/views/local/managers/shared/annual-plans.blade.php
  40. 2
    2
      app/views/local/managers/shared/annual_report.blade.php
  41. 2
    2
      app/views/local/managers/shared/annual_select.blade.php
  42. 2
    2
      app/views/local/managers/shared/create_annual_plan.blade.php
  43. 2
    2
      app/views/local/managers/shared/create_five_year_plan.blade.php
  44. 2
    2
      app/views/local/managers/shared/criteria.blade.php
  45. 2
    2
      app/views/local/managers/shared/edit_five_year_plan.blade.php
  46. 2
    2
      app/views/local/managers/shared/edit_objectives_FOR_DELETION.blade.php
  47. 2
    2
      app/views/local/managers/shared/grouped_course.blade.php
  48. 2
    2
      app/views/local/managers/shared/index_annual_plans.blade.php
  49. 2
    2
      app/views/local/managers/shared/index_five_year_plans.blade.php
  50. 2
    2
      app/views/local/managers/shared/limited-course.blade.php
  51. 2
    2
      app/views/local/managers/shared/objectives.blade.php
  52. 2
    2
      app/views/local/managers/shared/print_course.blade.php
  53. 2
    2
      app/views/local/managers/shared/program.blade.php
  54. 2
    2
      app/views/local/managers/shared/program_report.blade.php
  55. 1
    1
      app/views/local/managers/shared/program_student_result.blade.php
  56. 2
    2
      app/views/local/managers/shared/programs.blade.php
  57. 2
    2
      app/views/local/managers/shared/rubric_list.blade.php
  58. 2
    2
      app/views/local/managers/shared/rubrics-old.blade.php
  59. 2
    2
      app/views/local/managers/shared/rubrics.blade.php
  60. 2
    2
      app/views/local/managers/shared/rubrics_new.blade.php
  61. 1
    1
      app/views/local/managers/shared/school-uhs.blade.php
  62. 1
    1
      app/views/local/managers/shared/school.blade.php
  63. 1
    1
      app/views/local/managers/shared/school_student_result.blade.php
  64. 2
    2
      app/views/local/managers/shared/show_five_year_plan.blade.php
  65. 2
    2
      app/views/local/managers/shared/view-annual-plans.blade.php
  66. 2
    2
      app/views/local/managers/shared/view_formative.blade.php
  67. 2
    2
      app/views/local/managers/shared/view_rubric_limited.blade.php
  68. 2
    2
      app/views/local/professors/activity.blade.php
  69. 2
    2
      app/views/local/professors/assessment(before change to handsontable).blade.php
  70. 2
    2
      app/views/local/professors/assessment.blade.php
  71. 2
    2
      app/views/local/professors/assessment_contenteditable.blade.php
  72. 2
    2
      app/views/local/professors/assessment_report.blade.php
  73. 2
    2
      app/views/local/professors/assessment_reports.blade.php
  74. 2
    2
      app/views/local/professors/compare_activities.blade.php
  75. 2
    2
      app/views/local/professors/course.blade.php
  76. 2
    2
      app/views/local/professors/edit_assessment.blade.php
  77. 2
    2
      app/views/local/professors/general_studies_overview.blade.php
  78. 3
    3
      app/views/local/professors/new_assessment_report.blade.php
  79. 2
    2
      app/views/local/professors/overview.blade.php
  80. 2
    2
      app/views/local/professors/program.blade.php
  81. 2
    2
      app/views/local/professors/rubrics.blade.php
  82. 2
    2
      app/views/local/professors/student.blade.php
  83. 2
    2
      app/views/local/professors/view_assessment.blade.php
  84. 2
    2
      app/views/local/professors/viewrubric.blade.php

+ 6
- 2
app/controllers/TemplatesController.php View File 

@@ -285,7 +285,10 @@ class TemplatesController extends \BaseController
285 285 
 				//TODO esto yo no lo hice
286 286 
 			case 3:
287 287 
 				$template->school_id = Auth::user()->programs[0]->school->id;
288 
-				$template->program_id = Auth::user()->programs[0]->id;
288 
+				//Comenté esto porque siempre va a estar el program_id
289 
+				//TODO
290 
+				if ($template->program_id == NULL)
291 
+					$template->program_id = Auth::user()->programs[0]->id;
289 292 
 				break;
290 293 
 		}
291 294 
 
@@ -459,7 +462,8 @@ class TemplatesController extends \BaseController
459 462
460 463 
 			case 3:
461 464 
 				$template->school_id = Auth::user()->programs[0]->school->id;
462 
-				$template->program_id = Auth::user()->programs[0]->id;
465 
+				if ($template->program_id == NULL)
466 
+					$template->program_id = Auth::user()->programs[0]->id;
463 467 
 				break;
464 468 
 		}
465 469

+ 5
- 5
app/routes.php View File 

@@ -31,8 +31,8 @@ Route::model('five_year_plan', 'FiveYearPlan');
31 31 
 View::composer(array(
32 32 
     'local.professors._navigation',
33 33 
     'local.managers.admins._navigation',
34 
-    'local.managers.sCoords._navigation',
35 
-    'local.managers.pCoords._navigation',
34 
+    'local.managers.sCoords._new_navigation',
35 
+    'local.managers.pCoords._new_navigation',
36 36 
 ), function ($view) {
37 37 
     // Get user's courses' numbers
38 38 
     $courses = Auth::user()->courses;
 
@@ -44,8 +44,8 @@ View::composer(array(
44 44 
 View::composer(array(
45 45 
     'local.professors.*',
46 46 
     'local.managers.admins._navigation',
47 
-    'local.managers.sCoords._navigation',
48 
-    'local.managers.pCoords._navigation',
47 
+    'local.managers.sCoords._new_navigation',
48 
+    'local.managers.pCoords._new_navigation',
49 49 
     'local.managers.shared.limited-course',
50 50 
     'local.managers.shared.school',
51 51 
     'local.managers.shared.school-uhs',
 
@@ -607,4 +607,4 @@ Route::group(array('before' => 'auth|has_access'), function () {
607 607
608 608 
         Route::get('general-studies-overview', 'ProfessorsController@generalStudiesOverview');
609 609 
     });
610 
-});
610 
+});

+ 2
- 2
app/views/global/feedback.blade.php View File 

@@ -3,9 +3,9 @@
3 3 
     @if($user->role==1)
4 4 
         @include('local.managers.admins._navigation')
5 5 
     @elseif($user->role==2)
6 
-        @include('local.managers.sCoords._navigation')
6 
+        @include('local.managers.sCoords._new_navigation')
7 7 
     @elseif($user->role==3)
8 
-        @include('local.managers.pCoords._navigation')
8 
+        @include('local.managers.pCoords._new_navigation')
9 9 
     @else
10 10 
         @include('local.professors._navigation')
11 11 
     @endif

+ 2
- 2
app/views/global/profile.blade.php View File 

@@ -3,9 +3,9 @@
3 3 
     @if($user->role==1)
4 4 
         @include('local.managers.admins._navigation')
5 5 
     @elseif($user->role==2)
6 
-        @include('local.managers.sCoords._navigation')
6 
+        @include('local.managers.sCoords._new_navigation')
7 7 
     @elseif($user->role==3)
8 
-        @include('local.managers.pCoords._navigation')
8 
+        @include('local.managers.pCoords._new_navigation')
9 9 
     @else
10 10 
         @include('local.professors._navigation')
11 11 
     @endif

+ 2
- 2
app/views/global/view-learning-outcomes-criteria.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
       @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-      @include('local.managers.sCoords._navigation')
7 
+      @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-      @include('local.managers.pCoords._navigation')
9 
+      @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif(Auth::user()->role==4)
11 11 
       @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/global/view-objectives-criteria.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
       @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-      @include('local.managers.sCoords._navigation')
7 
+      @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-      @include('local.managers.pCoords._navigation')
9 
+      @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif(Auth::user()->role==4)
11 11 
       @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/global/view-three-year-plan.blade.php View File 

@@ -2,9 +2,9 @@
2 2
3 3 
 @section('navigation')
4 4 
     @if(Auth::user()->role==2)
5 
-      @include('local.managers.sCoords._navigation')
5 
+      @include('local.managers.sCoords._new_navigation')
6 6 
     @elseif(Auth::user()->role==3)
7 
-      @include('local.managers.pCoords._navigation')
7 
+      @include('local.managers.pCoords._new_navigation')
8 8 
     @endif
9 9 
 @stop
10 10

+ 0
- 0
app/views/local/managers/admins/_new_navigation.blade.php View File


+ 2
- 2
app/views/local/managers/admins/appraisal-program.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/assessment_reports.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/criteria.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12 
 @section('main')

+ 2
- 2
app/views/local/managers/admins/learning-outcome.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/learning-outcome_new.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/learning-outcomes-criteria.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/learning-outcomes-grad-undergrad.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/learning-outcomes.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/learning-outcomes_new.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/new-course-show.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/admins/new-learning-outcome.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/new-learning-outcomes.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/new-report-all.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/admins/new-report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 3
- 3
app/views/local/managers/admins/new_assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12 
 
@@ -105,7 +105,7 @@
105 105 
                                             <h3 style="text-align: center"> Course: {{ $course->code }}
106 106 
                                                 {{ $course->number }}-{{ $section->section }} </h3>
107 107 
                                         @endif
108 
-                                        <h4>Non-Diagnostic Activities</h4>
108 
+
109 109 
                                         @foreach ($section->publishedActivities as $index4 => $activity)
110 110 
                                             <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>
111 111 
                                             <p style="display: inline;">{{ $activity->name }}

+ 2
- 2
app/views/local/managers/admins/transformativeAction.blade.php View File 

@@ -2,9 +2,9 @@
2 2
3 3 
 @section('navigation')
4 4 
     @if($role==2)
5 
-        @include('local.managers.sCoords._navigation')
5 
+        @include('local.managers.sCoords._new_navigation')
6 6 
     @elseif($role==3)
7 
-        @include('local.managers.pCoords._navigation')
7 
+        @include('local.managers.pCoords._new_navigation')
8 8 
     @else
9 9 
         @include('local.professors._navigation')
10 10 
     @endif

+ 65
- 65
app/views/local/managers/admins/users.blade (4.29.2015 1.43.03 PM).php View File 

@@ -1,7 +1,7 @@
1 1 
 @extends('layouts.master')
2 2
3 3 
 @section('navigation')
4 
-    @include('local.managers.admins._navigation')
4 
+@include('local.managers.admins._navigation')
5 5 
 @stop
6 6
7 7 
 @section('main')
 
@@ -22,30 +22,30 @@
22 22
23 23 
             </tbody>
24 24 
             @foreach ($users as $user)
25 
-                <tr>
26 
-                    <td>{{ $user->surnames }}, {{ $user->first_name }}</td>
27 
-                    <td>
25 
+            <tr>
26 
+                <td>{{ $user->surnames }}, {{ $user->first_name }}</td>
27 
+                <td>
28 28 
                     @if(count($user->school))
29 
-                        {{ $user->school->name }}
29 
+                    {{ $user->school->name }}
30 30 
                     @endif
31 
-                    </td>
32 
-                    <td>
31 
+                </td>
32 
+                <td>
33 33 
                     @if(count($user->program))
34 
-                        {{ $user->program->name }}
34 
+                    {{ $user->program->name }}
35 35 
                     @endif
36 
-                    </td>
37 
-                    <td class="email">{{ $user->email }}</td>
38 
-                    <td>
39 
-                        <select name="role" class="role form-control">
40 
-                            <option value="1" <?php if($user->role==1) echo 'selected="selected"'?>>Administrator</option>
41 
-                            <option value="2" <?php if($user->role==2) echo 'selected="selected"'?>>School Coordinator</option>
42 
-                            <option value="3" <?php if($user->role==3) echo 'selected="selected"'?>>Program Coordinator</option>
43 
-                            <option value="4" <?php if($user->role==4) echo 'selected="selected"'?>>Professor</option>
44 
-                        </select>
45 
-                    </td>
46 
-
47 
-
48 
-                </tr>
36 
+                </td>
37 
+                <td class="email">{{ $user->email }}</td>
38 
+                <td>
39 
+                    <select name="role" class="role form-control">
40 
+                        <option value="1" <?php if ($user->role == 1) echo 'selected="selected"' ?>>Administrator</option>
41 
+                        <option value="2" <?php if ($user->role == 2) echo 'selected="selected"' ?>>School Coordinator</option>
42 
+                        <option value="3" <?php if ($user->role == 3) echo 'selected="selected"' ?>>Program Coordinator</option>
43 
+                        <option value="4" <?php if ($user->role == 4) echo 'selected="selected"' ?>>Professor</option>
44 
+                    </select>
45 
+                </td>
46 
+
47 
+
48 
+            </tr>
49 49 
             @endforeach
50 50 
         </table>
51 51 
         {{ $users->links() }}
 
@@ -59,50 +59,50 @@
59 59
60 60 
 $(document).ready(function()
61 61 
 {
62 
-    // --------------------------------------------------------------------------
63 
-    // Page load
64 
-    // --------------------------------------------------------------------------
65 
-
66 
-    $('#submit_roles').on('click', function()
67 
-    {
68 
-        var userBundle = new Array();
69 
-        $('tbody tr').each(function()
70 
-        {
71 
-            var user = new Object();
72 
-            user.email= $(this).find('.email').text();
73 
-            user.role= $(this).find('.role').find(':selected').val();
74 
-
75 
-            var clone = jQuery.extend({}, user);
76 
-            userBundle.push(clone);
77 
-        });
78 
-
79 
-        alert(JSON.stringify(userBundle));
80 
-
81 
-        // Save activity to the database
82 
-        $.post
83 
-        (
84 
-            "{{ URL::action('UsersController@update') }}",
85 
-            {
86 
-                users: JSON.stringify(userBundle),
87 
-                submit_roles: true
88 
-            },
89 
-            function(data)
90 
-            {
91 
-                location.reload();
92 
-            }
93 
-        );
94 
-
95 
-    });
96 
-
97 
-    // --------------------------------------------------------------------------
98 
-    // Functions
99 
-    // --------------------------------------------------------------------------
100 
-
101 
-
102 
-
103 
-    // --------------------------------------------------------------------------
104 
-    // Events
105 
-    // --------------------------------------------------------------------------
62 
+// --------------------------------------------------------------------------
63 
+// Page load
64 
+// --------------------------------------------------------------------------
65 
+
66 
+$('#submit_roles').on('click', function()
67 
+{
68 
+var userBundle = new Array();
69 
+$('tbody tr').each(function()
70 
+{
71 
+var user = new Object();
72 
+user.email= $(this).find('.email').text();
73 
+user.role= $(this).find('.role').find(':selected').val();
74 
+
75 
+var clone = jQuery.extend({}, user);
76 
+userBundle.push(clone);
77 
+});
78 
+
79 
+alert(JSON.stringify(userBundle));
80 
+
81 
+// Save activity to the database
82 
+$.post
83 
+(
84 
+"{{ URL::action('UsersController@update') }}",
85 
+{
86 
+users: JSON.stringify(userBundle),
87 
+submit_roles: true
88 
+},
89 
+function(data)
90 
+{
91 
+location.reload();
92 
+}
93 
+);
94 
+
95 
+});
96 
+
97 
+// --------------------------------------------------------------------------
98 
+// Functions
99 
+// --------------------------------------------------------------------------
100 
+
101 
+
102 
+
103 
+// --------------------------------------------------------------------------
104 
+// Events
105 
+// --------------------------------------------------------------------------
106 106
107 107
108 108 
 });

+ 2
- 2
app/views/local/managers/admins/view_template.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
         @if(Auth::user()->role==1)
5 5 
             @include('local.managers.admins._navigation')
6 6 
         @elseif(Auth::user()->role==2)
7 
-            @include('local.managers.sCoords._navigation')
7 
+            @include('local.managers.sCoords._new_navigation')
8 8 
         @elseif(Auth::user()->role==3)
9 
-            @include('local.managers.pCoords._navigation')
9 
+            @include('local.managers.pCoords._new_navigation')
10 10 
         @endif
11 11 
 @stop
12 12

+ 173
- 0
app/views/local/managers/pCoords/_new_navigation.blade.php View File 

@@ -0,0 +1,173 @@
1 
+<div class="navbar navbar-inverse navbar-static-top">
2 
+    <div class="container-fluid">
3 
+        <!--<div class="navbar-header">
4 
+      {{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Online Learning Assessment System · Program Coordinator', [], ['class' => 'navbar-brand']) }}
5 
+    </div>-->
6 
+        <ul class="nav navbar-nav navbar-right">
7 
+            <li>{{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Overview') }}</li>
8 
+
9 
+            <li class="dropdown">
10 
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
11 
+                    aria-expanded="false">Objectives<span class="caret"></span></a>
12 
+                    <ul class="dropdown-menu" role="menu">
13 
+                        <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
14 
+                        <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'View Objectives and Criteria') }}</li>
15 
+                    </ul>
16 
+            </li>
17 
+
18 
+            <!--Three Year Plan-->
19 
+
20 
+            <li class='dropdown'>
21 
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
22 
+                    year Plans<span class="caret"></span></a>
23 
+                <ul class='dropdown-menu' role='menu'>
24 
+                    <h6 class="dropdown-header">Create/Edit Three Year Plan For: </h6>
25 
+                    @foreach (Auth::user()->programs as $program)
26 
+                        <li><a
27 
+                                href="{{ URL::action('ThreeYearPlanController@threeYearsReport', [$program->id]) }}">{{ $program->name }}</a>
28 
+                        </li>
29 
+                    @endforeach
30 
+                </ul>
31 
+            </li>
32 
+            <!--Criteria-->
33 
+
34 
+            <li class='dropdown'>
35 
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false">
36 
+                    Criteria<span class="caret"></span></a>
37 
+                <ul class='dropdown-menu' role='menu'>
38 
+
39 
+                    <li>{{ HTML::linkAction('CriteriaController@edit', 'Create/Edit Criteria') }}</li>
40 
+                    <li>{{ HTML::linkAction('CriteriaController@index', 'view Criteria') }}</li>
41 
+
42 
+                </ul>
43 
+            </li>
44 
+            <!--Transformative Actions -->
45 
+            <li class ='dropdown'>
46 
+                <a href = "#" class = 'dropdown-toggle' data-toggle='dropdown' role = 'button' aria-expanded="false">
47 
+                    Transformative Actions <span class = "caret"></span></a>
48 
+                <ul class = 'dropdown-menu' role = 'menu'>
49 
+                    <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Create/Edit Tranformative Actions') }}
50 
+
51 
+
52 
+                    <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'View Formative Actions') }}
53 
+
54 
+                </ul>
55 
+            </li>
56 
+
57 
+            <!-- Annual Plans-->
58 
+            <li class='dropdown'>
59 
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual Plans<span class="caret"></span></a>
60 
+                <ul class='dropdown-menu' role='menu'>
61 
+                    <h6 class="dropdown-header">Create/Edit Annual Plan For: </h6>
62 
+                    @foreach (Auth::user()->programs as $program)
63 
+                    <li><a
64 
+                        href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">{{ $program->name }}</a>
65 
+                </li>
66 
+                    @endforeach
67 
+                    <h6 class = "dropdown-header">View Annual Plan from:</h6>
68 
+                    @foreach (Auth::user()->programs as $program)
69 
+                    <li><a
70 
+                        href="{{ URL::action('AnnualPlansController@viewAllPlans', [$program->id]) }}">{{ $program->name }}</a>
71 
+                </li>
72 
+                    @endforeach
73 
+                </ul>
74 
+            </li>
75 
+
76 
+            <!-- Rubrics -->
77 
+
78 
+
79 
+
80 
+
81 
+            <li class="dropdown">
82 
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
83 
+                    aria-expanded="false">Rubrics<span class="caret"></span></a>
84 
+                <ul class="dropdown-menu" role="menu">
85 
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Create/Edit Rubrics') }}</li>
86 
+                    <li>{{ HTML::linkAction('TemplatesController@index', 'View Rubric List') }}</li>
87 
+                </ul>
88 
+            </li>
89 
+
90 
+
91 
+
92 
+            <li class = "dropdown">
93 
+                <a  href="#" class = "dropdown-toggle" data-toggle = "dropdown" role = "button" aria-expanded="false"
94 
+                >Program Results<span class = "caret"></span></a>
95 
+                <ul class="dropdown-menu" role="menu">
96 
+
97 
+                    <h6 class = 'dropdown-header'>Program Results For:</h6>
98 
+                    @foreach(Auth::user()->programs as $program)
99 
+                    <li><a
100 
+                            href="{{ URL::action('OutcomesController@programAssessmentReport', $program->id) }}">{{$program->name}}
101 
+                            </a></li>
102 
+                    @endforeach
103 
+                </ul>
104 
+            </li>
105 
+
106 
+
107 
+
108 
+
109 
+
110 
+            @if (count(Auth::user()->courses))
111 
+
112 
+                <li class="dropdown">
113 
+
114 
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
115 
+                        aria-expanded="false">My Courses<span class="caret"></span></a>
116 
+                    <ul class="dropdown-menu" role="menu">
117 
+                        <li> {{ HTML::linkAction('ProfessorsController@overview', 'View My Courses', null) }}</li>
118 
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'View My Courses\' Results') }}
119 
+
120 
+                        </li>
121 
+                        <h6 class ="dropdown-header">Sections: </h6>
122 
+                        @foreach (Auth::user()->courses as $course)
123 
+                        <li> {{ HTML::linkAction('CoursesController@show', $course->code . $course->number . '-' . $course->section . ' (' . $course->semester->code . ')', ['id' => $course->id]) }}
124 
+                        </li>
125 
+                    @endforeach
126 
+                    </ul>
127 
+                </li>
128 
+            @endif
129 
+
130 
+
131 
+
132 
+
133 
+            <li class = "dropdown">
134 
+                <a  href="#" class = "dropdown-toggle" data-toggle = "dropdown" role = "button" aria-expanded="false"
135 
+                >Annual Report<span class = "caret"></span></a>
136 
+                <ul class="dropdown-menu" role="menu">
137 
+
138 
+                    <h6 class = 'dropdown-header'>Create/Edit Annual Report For:</h6>
139 
+                    @foreach(Auth::user()->programs as $program)
140 
+                    <li><a href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{$program->name}}</a></li>
141 
+                    @endforeach
142 
+                </ul>
143 
+            </li>
144 
+
145 
+
146 
+
147 
+
148 
+
149 
+        <li class="dropdown">
150 
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
151 
+                    class="caret"></span></a>
152 
+            <ul class="dropdown-menu" role="menu">
153 
+                <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
154 
+                <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
155 
+                <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
156 
+                <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
157 
+                <li><a
158 
+                        href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a>
159 
+                </li>
160 
+            </ul>
161 
+        </li>
162 
+        <li class="dropdown">
163 
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span
164 
+                    class="caret"></span></a>
165 
+            <ul class="dropdown-menu" role="menu">
166 
+                <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
167 
+                <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
168 
+            </ul>
169 
+        </li>
170 
+        <li>
171 
+            </ul>
172 
+    </div>
173 
+</div>

+ 2
- 2
app/views/local/managers/pCoords/assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/pCoords/assessment_reports.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 3
- 3
app/views/local/managers/pCoords/new_assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12 
 
@@ -91,7 +91,7 @@
91 91 
                             @foreach ($sections_evaluating as $index3 => $section)
92 92 
                                 <h3 style="text-align: center"> Course: {{ $course->code }}
93 93 
                                     {{ $course->number }}-{{ $section->section }} </h3>
94 
-                                    <h4>Non Diagnostic Activities</h4>
94 
+
95 95 
                                 @foreach ($section->publishedActivities as $index4 => $activity)
96 96
97 97 
                                     <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>

+ 1
- 1
app/views/local/managers/pCoords/overview.blade.php View File 

@@ -1,7 +1,7 @@
1 1 
 @extends('layouts.master')
2 2
3 3 
 @section('navigation')
4 
-    @include('local.managers.pCoords._navigation')
4 
+    @include('local.managers.pCoords._new_navigation')
5 5 
 @stop
6 6
7 7 
 @section('main')

+ 160
- 0
app/views/local/managers/sCoords/_new_navigation.blade.php View File 

@@ -0,0 +1,160 @@
1 
+<div class="navbar navbar-inverse navbar-static-top">
2 
+    <div class="container-fluid">
3 
+        <!--<div class="navbar-header">
4 
+      {{ HTML::linkAction('ProgramCoordinatorsController@overview', 'Online Learning Assessment System · Program Coordinator', [], ['class' => 'navbar-brand']) }}
5 
+    </div>-->
6 
+        <ul class="nav navbar-nav navbar-right">
7 
+            <li>{{ HTML::linkAction('SchoolCoordinatorsController@overview', 'Overview') }}</li>
8 
+
9 
+            <li class="dropdown">
10 
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
11 
+                    aria-expanded="false">Objectives<span class="caret"></span></a>
12 
+                    <ul class="dropdown-menu" role="menu">
13 
+                        <li>{{ HTML::linkAction('Objective2Controller@edit', 'Create/Edit Objectives') }}</li>
14 
+                        <li>{{ HTML::linkAction('CriteriaController@objectivesIndex', 'View Objectives and Criteria') }}</li>
15 
+                    </ul>
16 
+            </li>
17 
+
18 
+            <!--Three Year Plan-->
19 
+
20 
+            <li class='dropdown'>
21 
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Three
22 
+                    year Plans<span class="caret"></span></a>
23 
+                <ul class='dropdown-menu' role='menu'>
24 
+                    <h6 class="dropdown-header">Create/Edit Three Year Plan For: </h6>
25 
+                    @foreach (Auth::user()->school->programs as $program)
26 
+                        <li><a
27 
+                                href="{{ URL::action('ThreeYearPlanController@threeYearsReport', [$program->id]) }}">{{ $program->name }}</a>
28 
+                        </li>
29 
+                    @endforeach
30 
+                </ul>
31 
+            </li>
32 
+            <!--Criteria-->
33 
+
34 
+            <li class='dropdown'>
35 
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false">
36 
+                    Criteria<span class="caret"></span></a>
37 
+                <ul class='dropdown-menu' role='menu'>
38 
+
39 
+                    <li>{{ HTML::linkAction('CriteriaController@edit', 'Create/Edit Criteria') }}</li>
40 
+                    <li>{{ HTML::linkAction('CriteriaController@index', 'view Criteria') }}</li>
41 
+
42 
+                </ul>
43 
+            </li>
44 
+            <!--Transformative Actions -->
45 
+            <li class ='dropdown'>
46 
+                <a href = "#" class = 'dropdown-toggle' data-toggle='dropdown' role = 'button' aria-expanded="false">
47 
+                    Transformative Actions <span class = "caret"></span></a>
48 
+                <ul class = 'dropdown-menu' role = 'menu'>
49 
+                    <li>{{ HTML::linkAction('TransformativeActionsController@editTA', 'Create/Edit Tranformative Actions') }}
50 
+
51 
+
52 
+                    <li>{{ HTML::linkAction('TransformativeActionsController@viewFormativeActions', 'View Formative Actions') }}
53 
+
54 
+                </ul>
55 
+            </li>
56 
+
57 
+            <!-- Annual Plans-->
58 
+            <li class='dropdown'>
59 
+                <a href='#' class='dropdown-toggle' data-toggle='dropdown' role='button' aria-expanded="false"> Annual Plans<span class="caret"></span></a>
60 
+                <ul class='dropdown-menu' role='menu'>
61 
+                    <h6 class="dropdown-header">Create/Edit Annual Plan For: </h6>
62 
+                    @foreach (Auth::user()->school->programs as $program)
63 
+                    <li><a
64 
+                        href="{{ URL::action('AnnualPlansController@showPlan', [$program->id]) }}">{{ $program->name }}</a>
65 
+                </li>
66 
+                    @endforeach
67 
+                    <h6 class = "dropdown-header">View Annual Plan from:</h6>
68 
+                    @foreach (Auth::user()->school->programs as $program)
69 
+                    <li><a
70 
+                        href="{{ URL::action('AnnualPlansController@viewAllPlans', [$program->id]) }}">{{ $program->name }}</a>
71 
+                </li>
72 
+                    @endforeach
73 
+                </ul>
74 
+            </li>
75 
+
76 
+            <!-- Rubrics -->
77 
+
78 
+
79 
+
80 
+
81 
+            <li class="dropdown">
82 
+                <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
83 
+                    aria-expanded="false">Rubrics<span class="caret"></span></a>
84 
+                <ul class="dropdown-menu" role="menu">
85 
+                    <li>{{ HTML::linkAction('TemplatesController@newTemplate_new', 'Create/Edit Rubrics') }}</li>
86 
+                    <li>{{ HTML::linkAction('TemplatesController@index', 'View Rubric List') }}</li>
87 
+                </ul>
88 
+            </li>
89 
+
90 
+
91 
+            <li>{{ HTML::linkAction('OutcomesController@schoolAssessmentReport', 'School Results') }}</li>
92 
+
93 
+
94 
+
95 
+
96 
+
97 
+            @if (count(Auth::user()->courses))
98 
+
99 
+                <li class="dropdown">
100 
+
101 
+                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button"
102 
+                        aria-expanded="false">My Courses<span class="caret"></span></a>
103 
+                    <ul class="dropdown-menu" role="menu">
104 
+                        <li> {{ HTML::linkAction('ProfessorsController@overview', 'View My Courses', null) }}</li>
105 
+                        <li>{{ HTML::linkAction('OutcomesController@professorAssessmentReport', 'View My Courses\' Results') }}
106 
+
107 
+                        </li>
108 
+                        <h6 class ="dropdown-header">Sections: </h6>
109 
+                        @foreach (Auth::user()->courses as $course)
110 
+                        <li> {{ HTML::linkAction('CoursesController@show', $course->code . $course->number . '-' . $course->section . ' (' . $course->semester->code . ')', ['id' => $course->id]) }}
111 
+                        </li>
112 
+                    @endforeach
113 
+                    </ul>
114 
+                </li>
115 
+            @endif
116 
+
117 
+
118 
+
119 
+
120 
+            <li class = "dropdown">
121 
+                <a  href="#" class = "dropdown-toggle" data-toggle = "dropdown" role = "button" aria-expanded="false"
122 
+                >Annual Report<span class = "caret"></span></a>
123 
+                <ul class="dropdown-menu" role="menu">
124 
+
125 
+                    <h6 class = 'dropdown-header'>Create/Edit Annual Report For:</h6>
126 
+                    @foreach(Auth::user()->school->programs as $program)
127 
+                    <li><a href="{{ URL::action('OutcomesController@annualReport', $program->id) }}">{{$program->name}}</a></li>
128 
+                    @endforeach
129 
+                </ul>
130 
+            </li>
131 
+
132 
+
133 
+
134 
+
135 
+
136 
+        <li class="dropdown">
137 
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Help<span
138 
+                    class="caret"></span></a>
139 
+            <ul class="dropdown-menu" role="menu">
140 
+                <li>{{ HTML::linkAction('FeedbackController@create', 'Feedback') }}</li>
141 
+                <!-- <li><a href="{{ asset('files/OLAS-intro.pdf') }}">Introduction to OLAS</a></li> -->
142 
+                <li><a href="{{ asset('files/intro-avaluo.pdf') }}">Introduction to Assessment</a></li>
143 
+                <!-- <li><a href="{{ asset('files/OLAS-coords.pdf') }}">OLAS for Coordinators</a></li> -->
144 
+                <li><a
145 
+                        href="http://oeae.uprrp.edu/wp-content/uploads/2019/01/Brochure-de-OLAS-rev.-agosto-2018.pdf">Brochure</a>
146 
+                </li>
147 
+            </ul>
148 
+        </li>
149 
+        <li class="dropdown">
150 
+            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-expanded="false">Account<span
151 
+                    class="caret"></span></a>
152 
+            <ul class="dropdown-menu" role="menu">
153 
+                <li>{{ HTML::linkAction('UsersController@edit', 'Profile') }}</li>
154 
+                <li>{{ HTML::linkAction('AuthController@logout', 'Log out (' . Auth::user()->email . ')') }}</li>
155 
+            </ul>
156 
+        </li>
157 
+        <li>
158 
+            </ul>
159 
+    </div>
160 
+</div>

+ 2
- 2
app/views/local/managers/sCoords/assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/sCoords/assessment_reports.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 1
- 1
app/views/local/managers/sCoords/criteria.blade.php View File 

@@ -1,7 +1,7 @@
1 1 
 @extends('layouts.master')
2 2
3 3 
 @section('navigation')
4 
-    @include('local.managers.sCoords._navigation')
4 
+    @include('local.managers.sCoords._new_navigation')
5 5 
 @stop
6 6 
 @section('main')
7 7

+ 3
- 3
app/views/local/managers/sCoords/new_assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12 
 
@@ -105,7 +105,7 @@
105 105 
                                         <h3 style="text-align: center"> Course: {{ $course->code }}
106 106 
                                             {{ $course->number }}-{{ $section->section }} </h3>
107 107 
                                     @endif
108 
-                                    <h4> Non-Diagnostic Activities</h4>
108 
+
109 109 
                                     @foreach ($section->publishedActivities as $index4 => $activity)
110 110
111 111 
                                         <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>

+ 1
- 1
app/views/local/managers/sCoords/objectives.blade.php View File 

@@ -1,7 +1,7 @@
1 1 
 @extends('layouts.master')
2 2
3 3 
 @section('navigation')
4 
-    @include('local.managers.sCoords._navigation')
4 
+    @include('local.managers.sCoords._new_navigation')
5 5 
 @stop
6 6 
 @section('main')
7 7 
     <div class="row">

+ 1
- 1
app/views/local/managers/sCoords/overview.blade.php View File 

@@ -1,5 +1,5 @@
1 1 
 @extends('layouts.master')
2 2
3 3 
 @section('navigation')
4 
-    @include('local.managers.sCoords._navigation')
4 
+    @include('local.managers.sCoords._new_navigation')
5 5 
 @stop

+ 2
- 2
app/views/local/managers/shared/annual-plans.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif(Auth::user()->role == 4)
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/annual_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif(Auth::user()->role == 4)
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/annual_select.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/create_annual_plan.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/create_five_year_plan.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/criteria.blade.php View File 

@@ -5,10 +5,10 @@
5 5 
 @include('local.managers.admins._navigation')
6 6
7 7 
 @elseif(Auth::user()->role == 2)
8 
-@include('local.managers.sCoords._navigation')
8 
+@include('local.managers.sCoords._new_navigation')
9 9
10 10 
     @elseif(Auth::user()->role == 3)
11 
-    @include('local.managers.pCoords._navigation')
11 
+    @include('local.managers.pCoords._new_navigation')
12 12 
     @endif
13 13 
 @stop
14 14 
 @section('main')

+ 2
- 2
app/views/local/managers/shared/edit_five_year_plan.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/edit_objectives_FOR_DELETION.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/grouped_course.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/index_annual_plans.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/index_five_year_plans.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/limited-course.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/objectives.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
 @if(Auth::user()->role==1)
5 5 
 @include('local.managers.admins._navigation')
6 6 
 @elseif(Auth::user()->role==2)
7 
-@include('local.managers.sCoords._navigation')
7 
+@include('local.managers.sCoords._new_navigation')
8 8 
 @elseif(Auth::user()->role==3)
9 
-@include('local.managers.pCoords._navigation')
9 
+@include('local.managers.pCoords._new_navigation')
10 10 
 @endif
11 11 
 @stop
12 12 
 @section('main')

+ 2
- 2
app/views/local/managers/shared/print_course.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/program.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
 @if($role==1)
5 5 
 @include('local.managers.admins._navigation')
6 6 
 @elseif($role==2)
7 
-@include('local.managers.sCoords._navigation')
7 
+@include('local.managers.sCoords._new_navigation')
8 8 
 @elseif($role==3)
9 
-@include('local.managers.pCoords._navigation')
9 
+@include('local.managers.pCoords._new_navigation')
10 10 
 @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/program_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::User()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::User()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::User()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 1
- 1
app/views/local/managers/shared/program_student_result.blade.php View File 

@@ -5,7 +5,7 @@
5 5 
     @if($role==1)
6 6 
         @include('local.managers.admins._navigation')
7 7 
     @elseif($role==2)
8 
-        @include('local.managers.sCoords._navigation')
8 
+        @include('local.managers.sCoords._new_navigation')
9 9 
      @endif
10 10 
 @stop
11 11

+ 2
- 2
app/views/local/managers/shared/programs.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/rubric_list.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if ($role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif($role == 4)
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/rubrics-old.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
         @if(Auth::user()->role==1)
5 5 
             @include('local.managers.admins._navigation')
6 6 
         @elseif(Auth::user()->role==2)
7 
-            @include('local.managers.sCoords._navigation')
7 
+            @include('local.managers.sCoords._new_navigation')
8 8 
         @elseif(Auth::user()->role==3)
9 
-            @include('local.managers.pCoords._navigation')
9 
+            @include('local.managers.pCoords._new_navigation')
10 10 
         @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/rubrics.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
         @if(Auth::user()->role==1)
5 5 
             @include('local.managers.admins._navigation')
6 6 
         @elseif(Auth::user()->role==2)
7 
-            @include('local.managers.sCoords._navigation')
7 
+            @include('local.managers.sCoords._new_navigation')
8 8 
         @elseif(Auth::user()->role==3)
9 
-            @include('local.managers.pCoords._navigation')
9 
+            @include('local.managers.pCoords._new_navigation')
10 10 
         @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/rubrics_new.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
         @if(Auth::user()->role==1)
5 5 
             @include('local.managers.admins._navigation')
6 6 
         @elseif(Auth::user()->role==2)
7 
-            @include('local.managers.sCoords._navigation')
7 
+            @include('local.managers.sCoords._new_navigation')
8 8 
         @elseif(Auth::user()->role==3)
9 
-            @include('local.managers.pCoords._navigation')
9 
+            @include('local.managers.pCoords._new_navigation')
10 10 
         @endif
11 11 
 @stop
12 12

+ 1
- 1
app/views/local/managers/shared/school-uhs.blade.php View File 

@@ -4,7 +4,7 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @endif
9 9 
 @stop
10 10

+ 1
- 1
app/views/local/managers/shared/school.blade.php View File 

@@ -4,7 +4,7 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @endif
9 9 
 @stop
10 10

+ 1
- 1
app/views/local/managers/shared/school_student_result.blade.php View File 

@@ -5,7 +5,7 @@
5 5 
     @if($role==1)
6 6 
         @include('local.managers.admins._navigation')
7 7 
     @elseif($role==2)
8 
-        @include('local.managers.sCoords._navigation')
8 
+        @include('local.managers.sCoords._new_navigation')
9 9 
     @endif
10 10 
 @stop
11 11

+ 2
- 2
app/views/local/managers/shared/show_five_year_plan.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @endif
11 11 
 @stop
12 12

+ 2
- 2
app/views/local/managers/shared/view-annual-plans.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if(Auth::user()->role==1)
5 5 
       @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role==2)
7 
-      @include('local.managers.sCoords._navigation')
7 
+      @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role==3)
9 
-      @include('local.managers.pCoords._navigation')
9 
+      @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif(Auth::user()->role==4)
11 11 
       @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/view_formative.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @elseif(Auth::user()->role == 4)
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/managers/shared/view_rubric_limited.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
   @if($role==1)
5 5 
     @include('local.managers.admins._navigation')
6 6 
   @elseif($role==2)
7 
-    @include('local.managers.sCoords._navigation')
7 
+    @include('local.managers.sCoords._new_navigation')
8 8 
   @elseif($role==3)
9 
-    @include('local.managers.pCoords._navigation')
9 
+    @include('local.managers.pCoords._new_navigation')
10 10 
   @else
11 11 
     @include('local.professors._navigation')
12 12 
   @endif

+ 2
- 2
app/views/local/professors/activity.blade.php View File 

@@ -9,9 +9,9 @@
9 9 
     @if($role==1)
10 10 
         @include('local.managers.admins._navigation')
11 11 
     @elseif($role==2)
12 
-        @include('local.managers.sCoords._navigation')
12 
+        @include('local.managers.sCoords._new_navigation')
13 13 
     @elseif($role==3)
14 
-        @include('local.managers.pCoords._navigation')
14 
+        @include('local.managers.pCoords._new_navigation')
15 15 
     @else
16 16 
         @include('local.professors._navigation')
17 17 
     @endif

+ 2
- 2
app/views/local/professors/assessment(before change to handsontable).blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/assessment.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/assessment_contenteditable.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/assessment_reports.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/compare_activities.blade.php View File 

@@ -9,9 +9,9 @@
9 9 
     @if ($role == 1)
10 10 
         @include('local.managers.admins._navigation')
11 11 
     @elseif($role == 2)
12 
-        @include('local.managers.sCoords._navigation')
12 
+        @include('local.managers.sCoords._new_navigation')
13 13 
     @elseif($role == 3)
14 
-        @include('local.managers.pCoords._navigation')
14 
+        @include('local.managers.pCoords._new_navigation')
15 15 
     @else
16 16 
         @include('local.professors._navigation')
17 17 
     @endif

+ 2
- 2
app/views/local/professors/course.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/edit_assessment.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/general_studies_overview.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 3
- 3
app/views/local/professors/new_assessment_report.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if (Auth::user()->role == 1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif(Auth::user()->role == 2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif(Auth::user()->role == 3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
 
@@ -97,7 +97,7 @@
97 97 
                         @foreach ($sections_evaluating as $index3 => $section)
98 98 
                             <h3 style="text-align: center"> Course: {{ $course->code }}
99 99 
                                 {{ $course->number }}-{{ $section->section }}</h3>
100 
-                                <h4> Non-diagnostic Activities</h4>
100 
+
101 101 
                             @foreach ($section->publishedActivities as $index4 => $activity)
102 102
103 103 
                                 <h5 style="display: inline;">Activity {{ $index4 + 1 }}: </h5>

+ 2
- 2
app/views/local/professors/overview.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/program.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/rubrics.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
   @if($role==1)
5 5 
     @include('local.managers.admins._navigation')
6 6 
   @elseif($role==2)
7 
-    @include('local.managers.sCoords._navigation')
7 
+    @include('local.managers.sCoords._new_navigation')
8 8 
   @elseif($role==3)
9 
-    @include('local.managers.pCoords._navigation')
9 
+    @include('local.managers.pCoords._new_navigation')
10 10 
   @else
11 11 
     @include('local.professors._navigation')
12 12 
   @endif

+ 2
- 2
app/views/local/professors/student.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/view_assessment.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
     @if($role==1)
5 5 
         @include('local.managers.admins._navigation')
6 6 
     @elseif($role==2)
7 
-        @include('local.managers.sCoords._navigation')
7 
+        @include('local.managers.sCoords._new_navigation')
8 8 
     @elseif($role==3)
9 
-        @include('local.managers.pCoords._navigation')
9 
+        @include('local.managers.pCoords._new_navigation')
10 10 
     @else
11 11 
         @include('local.professors._navigation')
12 12 
     @endif

+ 2
- 2
app/views/local/professors/viewrubric.blade.php View File 

@@ -4,9 +4,9 @@
4 4 
   @if($role==1)
5 5 
     @include('local.managers.admins._navigation')
6 6 
   @elseif($role==2)
7 
-    @include('local.managers.sCoords._navigation')
7 
+    @include('local.managers.sCoords._new_navigation')
8 8 
   @elseif($role==3)
9 
-    @include('local.managers.pCoords._navigation')
9 
+    @include('local.managers.pCoords._new_navigation')
10 10 
   @else
11 11 
     @include('local.professors._navigation')
12 12 
   @endif