diff --git a/plugin/bbb/admin.php b/plugin/bbb/admin.php index 60fa2d12be5..4bd39249aff 100644 --- a/plugin/bbb/admin.php +++ b/plugin/bbb/admin.php @@ -105,7 +105,7 @@ $tpl->assign('meetings', $meetings); $tpl->assign('search_form', $form->returnForm()); -$content = $tpl->fetch('bbb/admin.tpl'); +$content = $tpl->fetch('bbb/view/admin.tpl'); if ($meetings) { $actions = Display::toolbarButton( diff --git a/plugin/bbb/lib/bbb_plugin.class.php b/plugin/bbb/lib/bbb_plugin.class.php index 5bfe9dc34c0..bd979c33508 100755 --- a/plugin/bbb/lib/bbb_plugin.class.php +++ b/plugin/bbb/lib/bbb_plugin.class.php @@ -270,28 +270,30 @@ public function getUrlInterfaceLinks($conferenceUrl) /** * @param string $conferenceUrl * - * @return string + * @return array */ public function getFlashUrl($conferenceUrl) { - return Display::url( - $this->get_lang('EnterConferenceFlash'), - $conferenceUrl.'&interface='.self::INTERFACE_FLASH, - ['target' => '_blank', 'class' => 'btn btn-primary btn-large'] - ); + $data = [ + 'text' => $this->get_lang('EnterConferenceFlash'), + 'url' => $conferenceUrl . '&interface=' . self::INTERFACE_FLASH, + 'icon' => 'resources/img/64/videoconference_flash.png' + ]; + return $data; } /** * @param string $conferenceUrl * - * @return string + * @return array */ public function getHtmlUrl($conferenceUrl) { - return Display::url( - $this->get_lang('EnterConferenceHTML5'), - $conferenceUrl.'&interface='.self::INTERFACE_HTML5, - ['target' => '_blank', 'class' => 'btn btn-primary btn-large'] - ); + $data = [ + 'text' => $this->get_lang('EnterConferenceHTML5'), + 'url' => $conferenceUrl . '&interface=' . self::INTERFACE_HTML5, + 'icon' => 'resources/img/64/videoconference_html5.png' + ]; + return $data; } } diff --git a/plugin/bbb/listing.php b/plugin/bbb/listing.php index 67a7712860a..32af4f14547 100755 --- a/plugin/bbb/listing.php +++ b/plugin/bbb/listing.php @@ -262,7 +262,7 @@ $tpl->assign('warning_inteface_msg', $warningIntefaceMessage); $tpl->assign('show_client_options', $showClientOptions); -$listing_tpl = 'bbb/listing.tpl'; +$listing_tpl = 'bbb/view/listing.tpl'; $content = $tpl->fetch($listing_tpl); $actionLinks = ''; if (api_is_platform_admin()) { diff --git a/plugin/bbb/resources/img/128/videoconference_flash.png b/plugin/bbb/resources/img/128/videoconference_flash.png new file mode 100644 index 00000000000..e6d9f4e7ca8 Binary files /dev/null and b/plugin/bbb/resources/img/128/videoconference_flash.png differ diff --git a/plugin/bbb/resources/img/128/videoconference_html5.png b/plugin/bbb/resources/img/128/videoconference_html5.png new file mode 100644 index 00000000000..e3cdeffe4a4 Binary files /dev/null and b/plugin/bbb/resources/img/128/videoconference_html5.png differ diff --git a/plugin/bbb/resources/img/64/videoconference_flash.png b/plugin/bbb/resources/img/64/videoconference_flash.png new file mode 100644 index 00000000000..753144fc6d8 Binary files /dev/null and b/plugin/bbb/resources/img/64/videoconference_flash.png differ diff --git a/plugin/bbb/resources/img/64/videoconference_html5.png b/plugin/bbb/resources/img/64/videoconference_html5.png new file mode 100644 index 00000000000..4b1dde01f5a Binary files /dev/null and b/plugin/bbb/resources/img/64/videoconference_html5.png differ diff --git a/plugin/bbb/resources/img/svg/videoconference_flash.svg b/plugin/bbb/resources/img/svg/videoconference_flash.svg new file mode 100644 index 00000000000..e544a70c444 --- /dev/null +++ b/plugin/bbb/resources/img/svg/videoconference_flash.svg @@ -0,0 +1,282 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugin/bbb/resources/img/svg/videoconference_html5.svg b/plugin/bbb/resources/img/svg/videoconference_html5.svg new file mode 100644 index 00000000000..7b84c93ccd6 --- /dev/null +++ b/plugin/bbb/resources/img/svg/videoconference_html5.svg @@ -0,0 +1,327 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugin/bbb/view/admin.tpl b/plugin/bbb/view/admin.tpl new file mode 100644 index 00000000000..078f032f1f4 --- /dev/null +++ b/plugin/bbb/view/admin.tpl @@ -0,0 +1,48 @@ +{{ search_form }} + + + + + + + + + + + + + + {% for meeting in meetings %} + + {% if meeting.visibility == 0 %} + + {% else %} + + {% endif %} + + + + + + + + {% endfor %} + +
{{ 'CreatedAt'|get_lang }}{{ 'Status'|get_lang }}{{ 'Records'|get_plugin_lang('BBBPlugin') }}{{ 'Course'|get_lang }}{{ 'Session'|get_lang }}{{ 'Participants'|get_lang }}{{ 'Actions'|get_lang }}
{{ meeting.created_at }}{{ meeting.created_at }} + {% if meeting.status == 1 %} + {{ 'MeetingOpened'|get_plugin_lang('BBBPlugin') }} + {% else %} + {{ 'MeetingClosed'|get_plugin_lang('BBBPlugin') }} + {% endif %} + + {% if meeting.record == 1 %} + {# Record list #} + {{ meeting.show_links }} + {% else %} + {{ 'NoRecording'|get_plugin_lang('BBBPlugin') }} + {% endif %} + {{ meeting.course ?: '-' }}{{ meeting.session ?: '-' }} + {{ meeting.participants ? meeting.participants|join('
') : '-' }} + 		+ {{ meeting.action_links }} +
diff --git a/plugin/bbb/view/listing.tpl b/plugin/bbb/view/listing.tpl new file mode 100644 index 00000000000..2d751338b84 --- /dev/null +++ b/plugin/bbb/view/listing.tpl @@ -0,0 +1,176 @@ + +
+{% if bbb_status == true %} +
+ {{ form }} + {% if show_join_button == true %} + {% if show_client_options %} +
+
+
+
+
+ +
+ {{ enter_conference_links.0.text }} + +
+ +
+
+ + +
+
+
+ +
+
+
+
+
+
+ +
+ {{ enter_conference_links.1.text }} + +
+ +
+
+ + + +
+
+
+
+
+
+ {% else %} + {{ enter_conference_links.0 }} +
+ {{ 'UrlMeetingToShare'| get_plugin_lang('BBBPlugin') }} +
+
+
+ + +
+
+
+ {% endif %} +

+ + {{ 'XUsersOnLine'| get_plugin_lang('BBBPlugin') | format(users_online) }} + +

+ {{ warning_inteface_msg }} + {% if max_users_limit > 0 %} + {% if conference_manager == true %} +

{{ 'MaxXUsersWarning' | get_plugin_lang('BBBPlugin') | format(max_users_limit) }}

+ {% elseif users_online >= max_users_limit/2 %} +

{{ 'MaxXUsersWarning' | get_plugin_lang('BBBPlugin') | format(max_users_limit) }}

+ {% endif %} + {% endif %} +
+ {% elseif max_users_limit > 0 %} + {% if conference_manager == true %} +

{{ 'MaxXUsersReachedManager' | get_plugin_lang('BBBPlugin') | format(max_users_limit) }}

+ {% elseif users_online > 0 %} +

{{ 'MaxXUsersReached' | get_plugin_lang('BBBPlugin') | format(max_users_limit) }}

+ {% endif %} + {% endif %} +
+ +
+
+

{{ 'RecordList'| get_plugin_lang('BBBPlugin') }}

+
+ + + + + + + + + {% if allow_to_edit %} + + {% endif %} + + + {% for meeting in meetings %} + + + {% if meeting.visibility == 0 %} + + {% else %} + + {% endif %} + + + + {% if allow_to_edit %} + + {% endif %} + + + {% endfor %} +
{{ 'CreatedAt'| get_plugin_lang('BBBPlugin') }}{{ 'Status'| get_lang }}{{ 'Records'| get_plugin_lang('BBBPlugin') }}{{ 'Actions'| get_lang }}
{{ meeting.created_at }}{{ meeting.created_at }} + {% if meeting.status == 1 %} + {{ 'MeetingOpened'|get_plugin_lang('BBBPlugin') }} + {% else %} + {{ 'MeetingClosed'|get_plugin_lang('BBBPlugin') }} + {% endif %} + + {% if meeting.record == 1 %} + {# Record list #} + {{ meeting.show_links }} + {% else %} + {{ 'NoRecording'|get_plugin_lang('BBBPlugin') }} + {% endif %} + + {% if meeting.status == 1 %} + + {{ 'CloseMeeting'|get_plugin_lang('BBBPlugin') }} + + {% else %} + {{ meeting.action_links }} + {% endif %} +
+
+{% else %} +
+ {{ 'ServerIsNotRunning' | get_plugin_lang('BBBPlugin') | return_message('warning') }} +
+{% endif %} +