pull/3293/head
Alex Aragón 6 years ago
parent abd8b64446
commit 52501616e4
  1. 2
      plugin/googlemeet/lang/spanish.php
  2. 25
      plugin/googlemeet/meets.php
  3. 18
      plugin/googlemeet/resources/css/style.css
  4. 15
      plugin/googlemeet/src/googlemeet_plugin.class.php
  5. 9
      plugin/googlemeet/view/start.tpl

@ -20,5 +20,7 @@ $strings['InstantMeetURLHelp'] = "Es la URL para iniciar una reunión instantán
$strings['AccessMeeting'] = "Accede a la reunión";
$strings['MeetingDescription'] = "Descripción";
$strings['MeetingDescriptionHelp'] = "(Opcional) Añade una breve descripción sobre la reunión.";
$strings['MeetColor'] = "Color Meet";
$strings['MeetColorHelp'] = "(Opcional)";

@ -76,6 +76,22 @@ if ($enable) {
]
);
try {
$form->addElement(
'color',
'meet_color',
[
$plugin->get_lang('MeetColor'),
$plugin->get_lang('MeetColorHelp'),
],
[
'value' => '#1CC88A'
]
);
} catch (HTML_QuickForm_Error $e) {
echo $e;
}
$form->addHtmlEditor(
'meet_description',
[
@ -150,7 +166,14 @@ if ($enable) {
'title' => $plugin->get_lang('InstantMeetURLHelp'),
]
);
$form->addElement(
'color',
'meet_color',
[
$plugin->get_lang('MeetColor'),
$plugin->get_lang('MeetColorHelp')
]
);
$form->addHtmlEditor(
'meet_description',
[

@ -26,6 +26,9 @@
border: 0;
box-shadow: 0 0 2rem 0 rgba(136,152,170,.15);
}
.card-meet:hover{
border-left: .25rem solid #cdcdcd !important;
}
.card-meet .card-body {
padding: 1rem 1.5rem;
}
@ -72,9 +75,7 @@
align-items: center;
justify-content: center;
}
.bg-gradient-green {
background: linear-gradient(87deg,#2dce89 0,#2dcecc 100%)!important;
}
.text-white {
color: #fff!important;
}
@ -95,4 +96,15 @@
}
.float-right {
float: right;
}
.btn-add-meet{
color: #fff;
border-color: #1cc88a;
background-color: #1cc88a;
font-weight: bold;
}
.btn-add-meet:hover {
color: #fff;
border-color: #17a673;
background-color: #169b6b;
}

@ -9,8 +9,6 @@
class GoogleMeetPlugin extends Plugin
{
const TABLE_MEET_COURSES = 'plugin_meet_courses';
const TABLE_MEET_LIST = 'plugin_meet_room';
const SETTING_TITLE = 'tool_title';
const SETTING_ENABLED = 'google_meet_enabled';
@ -67,8 +65,8 @@ class GoogleMeetPlugin extends Plugin
meet_name VARCHAR(250) NULL,
meet_url VARCHAR(250) NULL,
meet_description VARCHAR(250) NULL,
meet_color VARCHAR(7) NULL,
type_meet INT NOT NULL,
user_id INT NULL NOT NULL,
cd_id INT NULL NOT NULL,
start_time DATETIME NULL,
end_time DATETIME NULL,
@ -95,7 +93,6 @@ class GoogleMeetPlugin extends Plugin
$this->deleteCourseToolLinks();
$tablesToBeDeleted = [
self::TABLE_MEET_COURSES,
self::TABLE_MEET_LIST,
];
@ -144,14 +141,13 @@ class GoogleMeetPlugin extends Plugin
$table = Database::get_main_table(self::TABLE_MEET_LIST);
$idCourse = api_get_course_int_id();
$idUser = api_get_user_id();
$params = [
'meet_name' => $values['meet_name'],
'meet_url' => $values['meet_url'],
'type_meet' => $values['type_meet'],
'meet_description' => $values['meet_description'],
'user_id' => $idUser,
'meet_color' => $values['meet_color'],
'cd_id' => $idCourse,
'start_time' => null,
'end_time' => null,
@ -202,8 +198,8 @@ class GoogleMeetPlugin extends Plugin
'meet_name' => $row['meet_name'],
'meet_url' => $row['meet_url'],
'meet_description' => $row['meet_description'],
'meet_color' => $row['meet_color'],
'type_meet' => $row['type_meet'],
'user_id' => $row['user_id'],
'cd_id' => $row['cd_id'],
'start_time' => $row['start_time'],
'end_time' => $row['end_time'],
@ -234,8 +230,8 @@ class GoogleMeetPlugin extends Plugin
'meet_name' => $row['meet_name'],
'meet_url' => $row['meet_url'],
'meet_description' => $row['meet_description'],
'meet_color' => $row['meet_color'],
'type_meet' => $row['type_meet'],
'user_id' => $row['user_id'],
'cd_id' => $row['cd_id'],
'start_time' => $row['start_time'],
'end_time' => $row['end_time'],
@ -254,14 +250,13 @@ class GoogleMeetPlugin extends Plugin
$table = Database::get_main_table(self::TABLE_MEET_LIST);
$idCourse = api_get_course_int_id();
$idUser = api_get_user_id();
$params = [
'meet_name' => $values['meet_name'],
'meet_url' => $values['meet_url'],
'type_meet' => $values['type_meet'],
'meet_description' => $values['meet_description'],
'user_id' => $idUser,
'meet_color' => $values['meet_color'],
'cd_id' => $idCourse,
'start_time' => null,
'end_time' => null,

@ -8,7 +8,7 @@
<div class="tools text-center">
{% if is_admin or is_teacher %}
<a href="{{ url_add_room }}" class="btn btn-primary">
<a href="{{ url_add_room }}" class="btn btn-success btn-add-meet">
<i class="fa fa-video-camera" aria-hidden="true"></i>
{{ 'ManageMeetAccounts'|get_plugin_lang('GoogleMeetPlugin') }}
</a>
@ -20,11 +20,11 @@
{% for meet in meets %}
<div class="col-md-4">
<div class="info-meet">
<div class="card card-meet">
<div class="card card-meet" style="border-left: .25rem solid {{ meet.meet_color }};">
<div class="card-body">
<div class="row-meet">
<div class="col-auto">
<div class="icon icon-shape bg-gradient-green text-white rounded-circle shadow">
<div style="background: {{ meet.meet_color }}" class="icon icon-shape text-white rounded-circle shadow">
<i class="fa fa-video-camera" aria-hidden="true"></i>
</div>
</div>
@ -38,17 +38,18 @@
</a>
</div>
<div class="float-right">
{% if is_admin or is_teacher %}
<div class="btn-group btn-group-xs" role="group" aria-label="...">
<a class="btn btn-sm btn-default" href="meets.php?action=edit&id_meet={{ meet.id }}&{{ _p.web_cid_query }}">
<i class="fa fa-pencil" aria-hidden="true"></i>
</a>
<a class="btn btn-sm btn-default"
target="_blank"
onclick="javascript:if(!confirm('{{ 'AreYouSureToDelete' | get_lang }}')) return false;"
href="meets.php?action=delete&id_meet={{ meet.id }}&{{ _p.web_cid_query }}">
<i class="fa fa-trash-o" aria-hidden="true"></i>
</a>
</div>
{% endif %}
</div>
</div>

Loading…
Cancel
Save