Bläddra i källkod

loading screen re-added

unknown 9 år sedan
förälder
incheckning
e8b7c3198d
3 ändrade filer med 20 tillägg och 14 borttagningar
  1. 11 0
      app/app.css
  2. 5 0
      app/templates/loading.html
  3. 4 14
      app/templates/room.html

+ 11 - 0
app/app.css

@@ -470,6 +470,17 @@ footer a:hover{
 .pl-container h4{
   text-decoration: underline;
 }
+#spinner {
+  font-size: 200px;
+  color: bisque;
+}
+
+#spinner-container {
+  margin-left: auto;
+  margin-right: auto;
+  width: 200px;
+  margin-top: 10%;
+}
 #croom_container {
   margin-left: auto;
   margin-right: auto;

+ 5 - 0
app/templates/loading.html

@@ -0,0 +1,5 @@
+<template name="loading">
+    <div id="spinner-container">
+        <i class="fa fa-spinner fa-pulse" id="spinner"></i>
+    </div>
+</template>

+ 4 - 14
app/templates/room.html

@@ -1,6 +1,7 @@
 <template name="room">
     <div class="landing">
         <h1 class="room-name">{{{type}}}</h1>
+      {{#if loaded}}
         <h2 class="room-title">{{{title}}}</h2>
         <h2 class="room-artist">{{{artist}}}</h2>
         <div id="seeker-container">
@@ -14,20 +15,9 @@
 
         <div width="960" height="540" id="player">
         </div>
-        <h1 class="room-name">{{{type}}}</h1>
-        <h2 class="room-title">{{{title}}}</h2>
-        <h2 class="room-artist">{{{artist}}}</h2>
-        <div id="seeker-container">
-            <div id="seeker-bar"></div>
-        </div>
-        {{> playlist}}
-        <input type="text" id="song-input">
-        <button type="button" id="search-song" class="button">Search</button>
-        <div id="song-results"></div>
-        <!--src="http://www.youtube.com/embed/XGSy3_Czz8k?autoplay=1&controls=0&autohide=1">-->
-
-        <div width="960" height="540" id="player">
-        </div>
+      {else}
+        {{> loading}}
+      {{/if}}
         <ul class="bg-bubbles">
             <li></li>
             <li></li>