mirror of
				https://github.com/KevinMidboe/zoff.git
				synced 2025-10-29 18:00:23 +00:00 
			
		
		
		
	Merge branch 'master' into refactor/no-jquery
This commit is contained in:
		@@ -653,6 +653,15 @@ nav, .tabs .tab a,
 | 
				
			|||||||
    background-color: #2D2D2D;
 | 
					    background-color: #2D2D2D;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.sidenav .collapsible-header, .sidenav.fixed .collapsible-header {
 | 
				
			||||||
 | 
					    outline: none !important;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					.sidenav .collapsible li, .sidenav.fixed .collapsible li {
 | 
				
			||||||
 | 
					    color: #2d2d2d;
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
.tabs .tab a{
 | 
					.tabs .tab a{
 | 
				
			||||||
    padding: 0px;
 | 
					    padding: 0px;
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,13 +1,13 @@
 | 
				
			|||||||
<li class="no-padding">
 | 
					
 | 
				
			||||||
    <div class="nav-btn close-settings clickable" title="Close" id="closeSettings">
 | 
					    <div class="nav-btn close-settings clickable" title="Close" id="closeSettings">
 | 
				
			||||||
        <i class="material-icons auto-margin">close</i>
 | 
					        <i class="material-icons auto-margin">close</i>
 | 
				
			||||||
    </div>
 | 
					    </div>
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion">
 | 
					    <ul class="collapsible collapsible-accordion settings-collapsible">
 | 
				
			||||||
        <li>
 | 
					        <li class="no-padding">
 | 
				
			||||||
            <a class="col s9 collapsible-header bold waves-effect admin-settings">
 | 
					            <div class="col s9 collapsible-header bold waves-effect admin-settings">
 | 
				
			||||||
                Channel Settings
 | 
					                Channel Settings
 | 
				
			||||||
                <i class="material-icons">tune</i>
 | 
					                <i class="material-icons">tune</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <form action="#" id="adminForm" onsubmit="return false;">
 | 
					                <form action="#" id="adminForm" onsubmit="return false;">
 | 
				
			||||||
                    <ul>
 | 
					                    <ul>
 | 
				
			||||||
@@ -143,14 +143,10 @@
 | 
				
			|||||||
                </form>
 | 
					                </form>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
        <li class="no-padding">
 | 
					        <li class="no-padding">
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion">
 | 
					            <div class="collapsible-header bold waves-effect">Channel Info
 | 
				
			||||||
        <li>
 | 
					 | 
				
			||||||
            <a class="collapsible-header bold waves-effect">Channel Info
 | 
					 | 
				
			||||||
                <i class="material-icons">info_outline</i>
 | 
					                <i class="material-icons">info_outline</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <ul>
 | 
					                <ul>
 | 
				
			||||||
                    <li>
 | 
					                    <li>
 | 
				
			||||||
@@ -177,15 +173,11 @@
 | 
				
			|||||||
                </ul>
 | 
					                </ul>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
    {{#unless client}}
 | 
					    {{#unless client}}
 | 
				
			||||||
        <li class="no-padding remote-panel hide-on-small-only">
 | 
					        <li class="no-padding remote-panel hide-on-small-only">
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion">
 | 
					            <div class="collapsible-header bold waves-effect">Remote Control
 | 
				
			||||||
        <li>
 | 
					 | 
				
			||||||
            <a class="collapsible-header bold waves-effect">Remote Control
 | 
					 | 
				
			||||||
                <i class="material-icons">settings_remote</i>
 | 
					                <i class="material-icons">settings_remote</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <ul>
 | 
					                <ul>
 | 
				
			||||||
                    <li>
 | 
					                    <li>
 | 
				
			||||||
@@ -211,14 +203,10 @@
 | 
				
			|||||||
                </ul>
 | 
					                </ul>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
        <li class="no-padding offline-panel">
 | 
					        <li class="no-padding offline-panel">
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion">
 | 
					            <div class="collapsible-header bold waves-effect">Local Mode
 | 
				
			||||||
        <li>
 | 
					 | 
				
			||||||
            <a class="collapsible-header bold waves-effect">Local Mode
 | 
					 | 
				
			||||||
                <i class="material-icons">visibility_off</i>
 | 
					                <i class="material-icons">visibility_off</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <ul>
 | 
					                <ul>
 | 
				
			||||||
                    <li>
 | 
					                    <li>
 | 
				
			||||||
@@ -239,15 +227,11 @@
 | 
				
			|||||||
                </ul>
 | 
					                </ul>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <li class="no-padding show-only-mobile mobile-remote-panel">
 | 
					        <li class="no-padding show-only-mobile mobile-remote-panel">
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion">
 | 
					            <div class="collapsible-header bold waves-effect import-a">Remote Controller
 | 
				
			||||||
        <li>
 | 
					 | 
				
			||||||
            <a class="collapsible-header bold waves-effect import-a">Remote Controller
 | 
					 | 
				
			||||||
                <i class="material-icons">settings_remote</i>
 | 
					                <i class="material-icons">settings_remote</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <ul id="remote-mobile-container">
 | 
					                <ul id="remote-mobile-container">
 | 
				
			||||||
                    <li class="white-bg">
 | 
					                    <li class="white-bg">
 | 
				
			||||||
@@ -284,15 +268,11 @@
 | 
				
			|||||||
                </ul>
 | 
					                </ul>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <li class="no-padding import-panel">
 | 
					        <li class="no-padding import-panel">
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion">
 | 
					            <div class="collapsible-header bold waves-effect import-a">Import Playlist
 | 
				
			||||||
        <li>
 | 
					 | 
				
			||||||
            <a class="collapsible-header bold waves-effect import-a">Import Playlist
 | 
					 | 
				
			||||||
                <i class="material-icons">keyboard_arrow_down</i>
 | 
					                <i class="material-icons">keyboard_arrow_down</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <ul>
 | 
					                <ul>
 | 
				
			||||||
                    <li class="white-bg">
 | 
					                    <li class="white-bg">
 | 
				
			||||||
@@ -364,15 +344,11 @@
 | 
				
			|||||||
                </ul>
 | 
					                </ul>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
        <li class="no-padding export-panel">
 | 
					        <li class="no-padding export-panel">
 | 
				
			||||||
    <ul class="collapsible collapsible-accordion white-bg">
 | 
					            <div class="collapsible-header bold waves-effect export-a">Export Playlist
 | 
				
			||||||
        <li>
 | 
					 | 
				
			||||||
            <a class="collapsible-header bold waves-effect export-a">Export Playlist
 | 
					 | 
				
			||||||
                <i class="material-icons">keyboard_arrow_up</i>
 | 
					                <i class="material-icons">keyboard_arrow_up</i>
 | 
				
			||||||
            </a>
 | 
					            </div>
 | 
				
			||||||
            <div class="collapsible-body">
 | 
					            <div class="collapsible-body">
 | 
				
			||||||
                <ul>
 | 
					                <ul>
 | 
				
			||||||
                    <li class="white-bg">
 | 
					                    <li class="white-bg">
 | 
				
			||||||
@@ -421,6 +397,4 @@
 | 
				
			|||||||
                </ul>
 | 
					                </ul>
 | 
				
			||||||
            </div>
 | 
					            </div>
 | 
				
			||||||
        </li>
 | 
					        </li>
 | 
				
			||||||
    </ul>
 | 
					 | 
				
			||||||
</li>
 | 
					 | 
				
			||||||
{{/unless}}
 | 
					{{/unless}}
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user