Skip to content

Commit

Permalink
Merge branch 'v3.0.0-beta-development' of https://github.com/sanjeevb…
Browse files Browse the repository at this point in the history 
…igstep/Agora-WordPress into v3.0.0-beta-development
  • Loading branch information
@sanjeevbigstep
sanjeevbigstep committed Aug 2, 2021
2 parents 35949ad + 0c44459 commit 30618c0
Show file tree
Hide file tree
Showing 6 changed files with 138 additions and 92 deletions.
39 changes: 39 additions & 0 deletions admin/css/wp-agora-io-admin.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -521,4 +521,43 @@ td.recordings.column-recordings {

.modal-body #layout-image-content{
text-align: center;
}

.agora_recording_shortcode_section {
display: flex;
align-items: center;
margin-bottom: 20px;
}

.agora_recording_shortcode_section div#agora_recording_shortcode {
background: rgba(0,0,0,0.7);
margin: 0 10px 0 0;
padding: 9px 10px;
color: #fff;
border-radius: 5px;
line-height: 0.8;
}

.agora_recording_shortcode_section .agora-copy-recording-shortcode-btn{line-height: 0.8;
padding: 6px 10px;}

.agora_io_video_recording_container .agora_io_video_container>video {
height: 100%;
width: 100%;
}

.agora_io_video_recording_container .agora_io_video_container {
flex: 0 0 25%;
max-width: 25%;
padding-right: 25px;
box-sizing: border-box;
margin-top: 25px;
}

.agora_io_video_recording_container {
display: flex;
flex-wrap: wrap;
}
.agora_recording_videos_section {
clear: both;
}
19 changes: 11 additions & 8 deletions admin/views/agora-admin-recording-listings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,15 @@
<h3><strong>Channel Name:</strong> <?php echo $channel_name; ?></h3>

<div class="agora_recordings_filter_section">



<div class="agora_recording_shortcode_section">
<div id="agora_recording_shortcode"></div>
<button class="agora-copy-recording-shortcode-btn">Copy</button>
</div>
</div>

<div class="agora_recordings_filter_inner_section agora_recording_type_section">
<label for="agora_recording_type">Recording Type</label>
<select class="create_recordings_shortcode" name="agora_recording_type" id="agora_recording_type" onchange="updateRecordingTypeOptions(this.value)">
Expand All @@ -33,16 +42,10 @@

<div id="agoraio_users_list" class="agora_recordings_filter_inner_section agora_recording_users_list_section"></div>

<div class="agora_recordings_filter_inner_section agora_recording_type_section">
<div class="agora_recordings_filter_inner_section agora_recording_type_section">
<button id="generateRecShortcodeBtn">Generate shortcode</button>
</div>

</div>
</div>

<div class="agora_recording_shortcode_section">
<div id="agora_recording_shortcode"></div>
<button class="agora-copy-recording-shortcode-btn">Copy</button>
</div>

<div class="agora_recording_videos_section">
</div>
Expand Down
156 changes: 79 additions & 77 deletions admin/views/agora-admin-settings.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -152,83 +152,7 @@
</div>
</div>

<div class="card">
<h2 class="title">Global Settings</h2>
<br class="clear" />
<div class="inside">
<div class="flex app-setting" id="globalColors">
<div class="col label">
<table class="form-table">
<tr>
<th scope="row"><label for="unselectedVideoControlsButtonsColor"><?php _e('Video Controls Buttons Color Unselected', 'agoraio') ?></label></th>
<td>
<input
id="unselectedVideoControlsButtonsColor"
name="unselectedVideoControlsButtonsColor"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['unselectedVideoControlsButtonsColor'] ?>"
data-default-color="#1E73BE">
</td>
</tr>
<tr>
<th scope="row"><label for="selectedVideoControlsButtonsColor"><?php _e('Video Controls Buttons Color Selected', 'agoraio') ?></label></th>
<td>
<input
id="selectedVideoControlsButtonsColor"
name="selectedVideoControlsButtonsColor"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['selectedVideoControlsButtonsColor'] ?>"
data-default-color="#1E73BE">
</td>
</tr>
<tr>
<th scope="row"><label for="otherButtonsColor"><?php _e('Other Buttons Color', 'agoraio') ?></label></th>
<td>
<input
id="otherButtonsColor"
name="otherButtonsColor"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['otherButtonsColor'] ?>"
data-default-color="#ffffff">
</td>
</tr>
<tr>
<th scope="row"><label for="backgroundColorVideoMuted"><?php _e('Background Color - Video Muted', 'agoraio') ?></label></th>
<td>
<input
id="backgroundColorVideoMuted"
name="backgroundColorVideoMuted"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['backgroundColorVideoMuted'] ?>"
data-default-color="#ffffff">
</td>
</tr>
<tr>
<th scope="row"><label for="backgroundColorPanels"><?php _e('Background Color - Panels', 'agoraio') ?></label></th>
<td>
<input
id="backgroundColorPanels"
name="backgroundColorPanels"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['backgroundColorPanels'] ?>"
data-default-color="#ffffff">
</td>
</tr>
</table>
</div>

</div>
<p>
<a href="#" class="button-primary" id="globalColors-save" style="margin:0 10px">Save</a>
</p>
<span class="error error-messageglobalColors"></span>
</div>
</div>


<div class="card">
<h2 class="title">Chat Support</h2>
Expand Down Expand Up @@ -425,6 +349,84 @@ class="agora-color-picker inputBoxGS"
</script>
<?php /* Drag-drop */ ?>

<div class="card">
<h2 class="title">Global Settings</h2>
<br class="clear" />
<div class="inside">
<div class="flex app-setting" id="globalColors">
<div class="col label">
<table class="form-table">
<tr>
<th scope="row"><label for="unselectedVideoControlsButtonsColor"><?php _e('Video Controls Buttons Color Unselected', 'agoraio') ?></label></th>
<td>
<input
id="unselectedVideoControlsButtonsColor"
name="unselectedVideoControlsButtonsColor"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['unselectedVideoControlsButtonsColor'] ?>"
data-default-color="#1E73BE">
</td>
</tr>
<tr>
<th scope="row"><label for="selectedVideoControlsButtonsColor"><?php _e('Video Controls Buttons Color Selected', 'agoraio') ?></label></th>
<td>
<input
id="selectedVideoControlsButtonsColor"
name="selectedVideoControlsButtonsColor"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['selectedVideoControlsButtonsColor'] ?>"
data-default-color="#1E73BE">
</td>
</tr>
<tr>
<th scope="row"><label for="otherButtonsColor"><?php _e('Other Buttons Color', 'agoraio') ?></label></th>
<td>
<input
id="otherButtonsColor"
name="otherButtonsColor"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['otherButtonsColor'] ?>"
data-default-color="#ffffff">
</td>
</tr>
<tr>
<th scope="row"><label for="backgroundColorVideoMuted"><?php _e('Background Color - Video Muted', 'agoraio') ?></label></th>
<td>
<input
id="backgroundColorVideoMuted"
name="backgroundColorVideoMuted"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['backgroundColorVideoMuted'] ?>"
data-default-color="#ffffff">
</td>
</tr>
<tr>
<th scope="row"><label for="backgroundColorPanels"><?php _e('Background Color - Panels', 'agoraio') ?></label></th>
<td>
<input
id="backgroundColorPanels"
name="backgroundColorPanels"
type="text"
class="agora-color-picker inputBoxGS"
value="<?php echo $agora_options['global_colors']['backgroundColorPanels'] ?>"
data-default-color="#ffffff">
</td>
</tr>
</table>
</div>

</div>
<p>
<a href="#" class="button-primary" id="globalColors-save" style="margin:0 10px">Save</a>
</p>
<span class="error error-messageglobalColors"></span>
</div>
</div>

<script type="text/javascript">
window.AGORA_ADMIN_URL = '<?php echo plugin_dir_url(__DIR__ . '/../index.php'); ?>';
</script>
Expand Down
4 changes: 2 additions & 2 deletions public/css/chat-fab.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -707,10 +707,10 @@
width: auto;
}

.agora-fullscreen .fabs.fabs-chat-left, .agora-fullscreen .fabs.fabs-chat-right{
/*.agora-fullscreen .fabs.fabs-chat-left, .agora-fullscreen .fabs.fabs-chat-right{
top: auto;
transform: translateY(-150%);
}
}*/

/* chat position bottom */
.fabs.fabs-chat-bottom {
Expand Down
8 changes: 5 additions & 3 deletions public/css/wp-agora-styles.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
.agora .screen-users .user {
position: relative;
overflow: hidden;
padding: 3px;
padding: 2px;
background-color: #111;
}
.screen-users .user video {
Expand Down Expand Up @@ -642,7 +642,7 @@
position: absolute;
top: 88px;
left: 7px;
z-index: 9;
z-index: 1;
}

.toast:not(:last-child) {
Expand Down Expand Up @@ -1031,7 +1031,9 @@ button#exit-btn {
/* End files in chat */

/****************video*mute*overlay*******************/
.user .no-video-overlay {
.user .no-video-overlay,
.screenshare-container .no-video-overlay
{
position: absolute;
z-index: 2;
width: calc(100%);
Expand Down
4 changes: 2 additions & 2 deletions public/views/parts/footer-communication.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@
<div class="error-container">
<span id="error-msg" class="text-danger"></span>
</div>
<?php if ($enableChat===true) { require_once('chat-fab.php'); } ?>

</footer>

<?php if ($enableChat===true) { require_once('chat-fab.php'); } ?>
<?php require_once "toast.php" ?>

0 comments on commit 30618c0

Please sign in to comment.