Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Move direct stream link and help button #102

Open
wants to merge 1 commit into
base: develop-5.1
Choose a base branch
from
Open

Move direct stream link and help button #102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion resources/lang/en/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"direct" => "Direct Stream Link",
"m3u" => "Stream .m3u Playlist",
"pls" => "Stream .pls Playlist",
"help" => "Help"
"help" => "?"
],
"dj" => "DJ",
"listeners" => "Listeners",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/es/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"direct" => "Link Stream Directo",
"m3u" => "Stream como lista .m3u",
"pls" => "Stream como lista .pls",
"help" => "Ayuda"
"help" => "?"
],
"dj" => "DJ",
"listeners" => "Oyentes",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/id/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"direct" => "Tautan Stream Langsung",
"m3u" => "Stream .m3u Playlist",
"pls" => "Stream .pls Playlist",
"help" => "Bantuan"
"help" => "?"
],
"dj" => "DJ",
"listeners" => "Pendengar",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/it/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"direct" => "Link Diretto Stream",
"m3u" => "File di Stream.m3u",
"pls" => "File di Stream .pls",
"help" => "Aiuto"
"help" => "?"
],
"dj" => "DJ",
"listeners" => "Ascoltatori",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/jp/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"direct" => "放送リンク",
"m3u" => ".m3u ファイル形式",
"pls" => ".pls ファイル形式",
"help" => "ヘルプ"
"help" => "?"
],
"dj" => "DJ",
"listeners" => "受け手数",
Expand Down
2 changes: 1 addition & 1 deletion resources/lang/nl/stream.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
"direct" => "Directe streamlink",
"m3u" => "Als afspeellijst (.m3u)",
"pls" => "Als afspeellijst (.pls)",
"help" => "Help"
"help" => "?"
],
"dj" => "DJ",
"listeners" => "Luisteraars",
Expand Down
1 change: 1 addition & 0 deletions resources/views/christmas/home.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
<div class="container main">
<!-- Content (Dynamic)
=================== -->
@include("partials.help-main")
<div class="container top-pusher">
</div>
<div class="col-md-2"></div>
Expand Down
2 changes: 1 addition & 1 deletion resources/views/default/home.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@

<!-- Content (Dynamic)
=================== -->
@include("partials.help-main")
<div class="container content top-content">

<div class="row dynamic-row">
Expand Down Expand Up @@ -34,7 +35,6 @@
<div class="col-md-6">
@include("partials.player-options")
</div>
@include("partials.help-main")

</div><!-- /.row#stream-info -->

Expand Down
5 changes: 2 additions & 3 deletions resources/views/partials/player-options.blade.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
<button class="btn btn-primary btn-block disabled" id="stream-play" data-loading-text="{{{ trans("stream.loading") }}}"><i class="fa fa-spinner fa-spin"></i></button>
<button class="btn btn-primary btn-block" id="stream-stop" data-loading-text="{{{ trans("stream.loading") }}}" style="display: none; margin-top: 0;">{{{ trans("stream.stop") }}}</button>
<a class="btn btn-default" href="https://stream.r-a-d.io/main.mp3" target="_blank" style="width: 80%; margin: 5px 0;">{{{ trans("stream.links.direct") }}}</a>
<a class="btn btn-default" href="#help" data-toggle="modal" data-target="#help" style="width: 18%;">{{{ trans("stream.links.help") }}}</a>
<div class="btn-group btn-block" style="width:100%">
<button type="button" class="btn btn-default dropdown-toggle btn-block" data-toggle="dropdown">
{{{ trans("stream.options") }}} <span class="caret"></span>
</button>
<ul class="dropdown-menu" role="menu" style="width: 100%">
<li><a href="https://stream.r-a-d.io/main.mp3">{{{ trans("stream.links.direct") }}}</a></li>
<li><a href="/assets/main.mp3.m3u">{{{ trans("stream.links.m3u") }}}</a></li>
<li><a href="/assets/main.pls">{{{ trans("stream.links.pls") }}}</a></li>
<li class="divider"></li>
Expand All @@ -23,7 +24,5 @@
@endif
@endif
@endforeach
<li class="divider"></li>
<li><a href="#help" data-toggle="modal" data-target="#help">{{{ trans("stream.links.help") }}}</a></li>
</ul>
</div>