Minor - Plugin zoom - fix UI, improve code

plugin/zoom/lib/zoom_plugin.class.php

@@ -549,7 +549,7 @@ class ZoomPlugin extends Plugin
     public function getCreateInstantMeetingForm($user, $course, $session)
     {
         $form = new FormValidator('createInstantMeetingForm', 'post', '', '_blank');
-        $form->addButton('startButton', $this->get_lang('StartInstantMeeting'));
+        $form->addButton('startButton', $this->get_lang('StartInstantMeeting'), 'video-camera', 'primary');
         if ($form->validate()) {
             try {
                 $this->startInstantMeeting($this->get_lang('InstantMeeting'), $user, $course, $session);

plugin/zoom/start.php

@@ -1,4 +1,5 @@
 <?php
+
 /* For license terms, see /license.txt */
 
 $course_plugin = 'zoom'; // needed in order to load the plugin lang variables
@@ -17,30 +18,33 @@ $logInfo = [
 Event::registerLog($logInfo);
 
 $plugin = ZoomPlugin::create();
-$tool_name = $plugin->get_lang('ZoomVideoconferences');
+$tool_name = $plugin->get_lang('ZoomVideoConferences');
 $tpl = new Template($tool_name);
+$course = api_get_course_entity();
+$session = api_get_session_entity();
 
-if ($plugin->userIsCourseConferenceManager(api_get_course_entity())) {
+if ($plugin->userIsCourseConferenceManager($course)) {
+    $user = api_get_user_entity(api_get_user_id());
     // user can create a new meeting
     $tpl->assign(
         'createInstantMeetingForm',
         $plugin->getCreateInstantMeetingForm(
-            api_get_user_entity(api_get_user_id()),
+            $user,
-            api_get_course_entity(),
+            $course,
-            api_get_session_entity()
+            $session
         )->returnForm()
     );
     $tpl->assign('scheduleMeetingForm', $plugin->getScheduleMeetingForm(
-        api_get_user_entity(api_get_user_id()),
+        $user,
-        api_get_course_entity(),
+        $course,
-        api_get_session_entity()
+        $session
     )->returnForm());
 }
 
 try {
     $tpl->assign(
         'scheduledMeetings',
-        $plugin->getMeetingRepository()->courseMeetings(api_get_course_entity(), api_get_session_entity())
+        $plugin->getMeetingRepository()->courseMeetings($course, $session)
     );
 } catch (Exception $exception) {
     Display::addFlash(

plugin/zoom/view/start.tpl

@@ -2,36 +2,36 @@
     {{ createInstantMeetingForm }}
 {% endif %}
 
-{% if scheduledMeetings %}
+{% if scheduledMeetings.count %}
     <div class="page-header">
         <h2>{{ 'ScheduledMeetings'|get_lang }}</h2>
     </div>
     <table class="table">
         <tr>
-            <!-- th>{{ 'CreatedAt'|get_lang }}</th -->
+            <th>{{ 'Topic'|get_plugin_lang('ZoomPlugin') }}</th>
+            <th>{{ 'Agenda'|get_plugin_lang('ZoomPlugin') }}</th>
             <th>{{ 'StartTime'|get_lang }}</th>
             <th>{{ 'Duration'|get_lang }}</th>
-            <!-- th>{{ 'Type'|get_lang }}</th -->
+            <th>{{ 'Actions'|get_lang }}</th>
-            <th>{{ 'TopicAndAgenda'|get_plugin_lang('ZoomPlugin') }}</th>
-            <th></th>
         </tr>
         {% for meeting in scheduledMeetings %}
         <tr>
-            <!-- td>{{ meeting.created_at }}</td -->
-            <td>{{ meeting.formattedStartTime }}</td>
-            <td>{{ meeting.formattedDuration }}</td>
-            <!-- td>{{ meeting.typeName }}</td -->
             <td>
-                <strong>{{ meeting.meetingInfoGet.topic }}</strong>
+                {{ meeting.meetingInfoGet.topic }}
-                <p class="small">{{ meeting.meetingInfoGet.agenda|nl2br }}</p>
             </td>
             <td>
-                <a class="btn" href="meeting_from_start.php?meetingId={{ meeting.id }}">
+                {{ meeting.meetingInfoGet.agenda|nl2br }}
-                    {{ 'Details'|get_lang }}
+            </td>
-                </a>
+            <td>{{ meeting.formattedStartTime }}</td>
-                <a class="btn" href="{{ meeting.meetingInfoGet.join_url }}">
+            <td>{{ meeting.formattedDuration }}</td>
+            <td>
+                <a class="btn btn-primary" href="{{ meeting.meetingInfoGet.join_url }}">
                     {{ 'Join'|get_plugin_lang('ZoomPlugin') }}
                 </a>
+
+                <a class="btn btn-default" href="meeting_from_start.php?meetingId={{ meeting.id }}">
+                    {{ 'Details'|get_lang }}
+                </a>
             </td>
         </tr>
         {% endfor %}
@@ -41,6 +41,5 @@
 {% endif %}
 
 {% if scheduleMeetingForm %}
-    <h3>{{ 'ScheduleAMeeting'|get_plugin_lang('ZoomPlugin') }}</h3>
     {{ scheduleMeetingForm }}
 {% endif %}