diff options
Diffstat (limited to '')
| -rw-r--r-- | template/assemblies/feedback.phtml | 98 | ||||
| -rw-r--r-- | template/assemblies/player/audio.phtml | 11 | ||||
| -rw-r--r-- | template/assemblies/player/dash.phtml | 4 | ||||
| -rw-r--r-- | template/assemblies/player/video.phtml | 1 | ||||
| -rw-r--r-- | template/assemblies/schedule.phtml | 10 |
5 files changed, 76 insertions, 48 deletions
diff --git a/template/assemblies/feedback.phtml b/template/assemblies/feedback.phtml index d50daf4..b0b8a20 100644 --- a/template/assemblies/feedback.phtml +++ b/template/assemblies/feedback.phtml @@ -1,16 +1,52 @@ <form action="<?=h($conference->getFeedbackURl())?>" target="feedback-target" method="post" role="form" class="feedback-form"> + + <div class="container-fluid"> + <div class="row"> + + <div class="col-sm-6 col"> + <div class="form-group"> + <label for="issuetext">Message / Symptoms*</label> + <textarea rows="2" value="" name="issuetext" id="issuetext" class="form-control" style="resize: vertical;" + ></textarea> + </div> + </div> + + <div class="col-sm-6 col"> + <div class="form-group"> + <label for="stream">Stream</label> + <select class="form-control" name="stream" id="stream"> + <option></option> + <? foreach($conference->getRooms() as $roomiter): ?> + <? if(!$roomiter->hasFeedback()) continue ?> + <? foreach($roomiter->getSelections() as $selection): ?> + <option + <? if( + isset($room) && isset($stream) && + $roomiter->getSlug() == $room->getSlug() && + $selection->getSelection() == $stream->getSelection() + ): ?>selected<? endif ?> + value="<?=h($roomiter->getSlug().'-'.$selection->getSelection())?>" + > + <?=h($roomiter->getDisplay())?> – <?=h($selection->getDisplay())?> + </option> + <? endforeach ?> + <? endforeach ?> + </select> + </div> + </div> + + </div> + <div class="row"> + <div class="col-sm-4 col"> - <div class="form-group"> + <label> </label> + <div class="form-group mt-1"> <label for="net">Network Connection</label> <select class="form-control" name="net" id="net"> <option></option> - <option>EDGE</option> - <option>3G</option> - <option>LTE</option> - <option>DSL <2000</option> - <option>DSL 2000-6000</option> - <option>DSL >6000</option> - <option>VDSL</option> + <option>Mobile</option> + <option>DSL Light</option> + <option>DSL/Cable</option> <option>Public Hotspot</option> <option>WiFi on site</option> <option>Ethernet on site</option> @@ -47,28 +83,6 @@ <option>Something else</option> </select> </div> - - <div class="form-group"> - <label for="stream">Stream</label> - <select class="form-control" name="stream" id="stream"> - <option></option> - <? foreach($conference->getRooms() as $roomiter): ?> - <? if(!$roomiter->hasFeedback()) continue ?> - <? foreach($roomiter->getSelections() as $selection): ?> - <option - <? if( - isset($room) && isset($stream) && - $roomiter->getSlug() == $room->getSlug() && - $selection->getSelection() == $stream->getSelection() - ): ?>selected<? endif ?> - value="<?=h($roomiter->getSlug().'-'.$selection->getSelection())?>" - > - <?=h($roomiter->getDisplay())?> – <?=h($selection->getDisplay())?> - </option> - <? endforeach ?> - <? endforeach ?> - </select> - </div> </div> <div class="col-sm-4 col"> @@ -107,7 +121,7 @@ </div> <div class="checkbox"> <label> - <input type="checkbox" name="issues[]" value="Hickups/Jerking" /> Hickups/Jerking + <input type="checkbox" name="issues[]" value="Hickups/Discontinously" /> Hickups/Discontinously </label> </div> <div class="checkbox"> @@ -130,16 +144,26 @@ <input type="checkbox" name="issues[]" value="Artifacts" /> Artifacts </label> </div> + <div class="checkbox"> + <label> + <input type="checkbox" name="issues[]" value="AV Async" /> Audio/Video async + </label> + </div> </div> - <div class="form-group"> - <label for="issuetext">Something else was good/bad</label> - <input type="text" value="" name="issuetext" id="issuetext" class="form-control" /> - </div> + </div> +</div> + <div class="row"> - <div class="form-group"> - <input class="btn btn-primary" type="submit" value="Submit" /> + <div class="col col-sm-8"> +</div> + <div class="col col-sm-4"> + <div class="form-group"> + <input class="btn btn-primary" type="submit" value="Submit" /> + </div> </div> + + </div> </div> </form> diff --git a/template/assemblies/player/audio.phtml b/template/assemblies/player/audio.phtml index 087b61c..c3594eb 100644 --- a/template/assemblies/player/audio.phtml +++ b/template/assemblies/player/audio.phtml @@ -1,8 +1,9 @@ -<audio - autoplay="autoplay" +<video preload="auto" - style="width: 300px;" - class="mejs" + controls="controls" + autoplay="autoplay" + style="max-height: 400px; max-width:100vw; display: block; margin: auto;" + poster="<?=h($stream->getPoster())?>" > <source src="<?=h($stream->getAudioUrl('mp3'))?>" @@ -12,4 +13,4 @@ src="<?=h($stream->getAudioUrl('opus'))?>" type="audio/opus" /> -</audio> +</video> diff --git a/template/assemblies/player/dash.phtml b/template/assemblies/player/dash.phtml index 8e43864..7cc1e38 100644 --- a/template/assemblies/player/dash.phtml +++ b/template/assemblies/player/dash.phtml @@ -2,7 +2,8 @@ <script type="text/javascript" src="<?=h($assets)?>clapprio/level-selector.min.js"></script> <script type="text/javascript" src="<?=h($assets)?>clapprio/audio-selector.min.js"></script> -<div class="dashContainer"> + +<div class="dashContainer" style="min-height: 100px" > <div id="player"></div> </div> @@ -44,6 +45,7 @@ return new Clappr.Player({ sources: sources, width: "100%", + poster: "<?=h($stream->getPoster())?>", plugins: [DashShakaPlayback, LevelSelector, AudioSelector], shakaConfiguration: { abr: { diff --git a/template/assemblies/player/video.phtml b/template/assemblies/player/video.phtml index ff5039b..3eae170 100644 --- a/template/assemblies/player/video.phtml +++ b/template/assemblies/player/video.phtml @@ -10,6 +10,7 @@ preload="auto" width="<?=h($stream->getVideoWidth())?>" height="<?=h($stream->getVideoHeight())?>" + poster="<?=h($stream->getPoster())?>" style="width: 100%; height: 100%;" class="mejs" > diff --git a/template/assemblies/schedule.phtml b/template/assemblies/schedule.phtml index 461353c..a519c23 100644 --- a/template/assemblies/schedule.phtml +++ b/template/assemblies/schedule.phtml @@ -8,7 +8,7 @@ <? $fromstart = 0; ?> <? foreach($events as $event): ?> <div - class="block <?=h(@$event['special'] ?: 'event')?>" + class="block <?=h(@$event['special'] ?: 'event')?> <?=h((@$event['optout']) ? 'optout' : '')?>" style="width: <?=h(round($event['duration'] / $schedule->getScale()))?>px; left: <?=h(round($fromstart / $schedule->getScale()))?>px" data-start="<?=intval($event['start'])?>" data-end="<?=intval($event['end'])?>" @@ -30,7 +30,7 @@ <? if(@$event['special'] == 'daychange'): ?> - <h3><?=h($event['title'])?></h3> + <h3><?=h($event['title'])?></h3> <? elseif(@$event['special'] == 'gap'): ?> @@ -46,12 +46,12 @@ – <?=h(strftime('%H:%M', $event['end']))?> in - <?=h($scheduleRoom ? $scheduleRoom->getDisplay() : $roomname) ?> + <?=h($scheduleRoom ? $scheduleRoom->getDisplayShort() : $roomname) ?> </h4> <h3> - <?=h($event['title'])?> + <?=h($event['title'])?><? if (@$event['optout']): ?><i> (no stream)</i><? endif ?> </h3> - <? if($event['speaker']): ?> + <? if(! empty(trim($event['speaker']))): ?> <h5>by <?=h($event['speaker'])?></h5> <? endif ?> <? endif ?> |