windhamdavid 8 years ago
parent
commit
20eddfa93d
5 changed files with 23 additions and 5 deletions
  1. 1 1
      gulpfile.js
  2. 1 0
      src/css/main.css
  3. BIN
      src/img/pirate.jpg
  4. 13 4
      src/index.html
  5. 8 0
      src/js/radio.js

+ 1 - 1
gulpfile.js

@@ -95,7 +95,7 @@ var watchTask = function() {
     .pipe(gulp.dest('./app/js/templates'));
     .pipe(gulp.dest('./app/js/templates'));
   gulp.src(['./src/js/amplitude-v2.2.0.js', './src/js/chat.js', './src/js/radio.js'])
   gulp.src(['./src/js/amplitude-v2.2.0.js', './src/js/chat.js', './src/js/radio.js'])
     .pipe(concat('radio.min.js'))
     .pipe(concat('radio.min.js'))
-    //.pipe(uglify())
+    .pipe(uglify())
     .pipe(gulp.dest('./app/js'));
     .pipe(gulp.dest('./app/js'));
   console.log('WATCH: Watch Complete');
   console.log('WATCH: Watch Complete');
 };
 };

+ 1 - 0
src/css/main.css

@@ -40,6 +40,7 @@ header {
 
 
 #auth-modal {
 #auth-modal {
   background: #000;
   background: #000;
+  background-image: url(img/pirate.jpg) no-repeat #000;
   color: #fff;
   color: #fff;
 }
 }
 #auth-modal .modal-content{
 #auth-modal .modal-content{

BIN
src/img/pirate.jpg


+ 13 - 4
src/index.html

@@ -329,20 +329,29 @@
               <div class="modal-dialog" role="document">
               <div class="modal-dialog" role="document">
                 <div class="modal-content">
                 <div class="modal-content">
                   <div class="modal-header">
                   <div class="modal-header">
-                    <h4 class="modal-title"><span class="glyphicon glyphicon-flag" aria-hidden="true"></span> On Air</h4>
+                    <h4 class="modal-title"> You kids get off my &nbsp;<span class="glyphicon glyphicon-cloud" aria-hidden="true"></span></h4>
                   </div>
                   </div>
                   <div class="modal-body">
                   <div class="modal-body">
-                     <h5>Get Off My Lawn!</h5>
+                     <h5>Just some basic rules here:</h5>
                      <ol>
                      <ol>
                         <li>This site is for demonstration purposes.</li>
                         <li>This site is for demonstration purposes.</li>
                         <li>There is no reason to be here unless I am.</li>
                         <li>There is no reason to be here unless I am.</li>
                         <li>If you don't know me, you shouldn't be here.</li>
                         <li>If you don't know me, you shouldn't be here.</li>
                         <li>Do Not Share this URL with Anyone.</li>
                         <li>Do Not Share this URL with Anyone.</li>
-                        <li>Do Not Post this URL Anywhere (that means you Dad... no Facebook!)</li>
                      </ol>                     
                      </ol>                     
                   </div>
                   </div>
                   <div class="modal-footer">
                   <div class="modal-footer">
-                     <button type="submit" class="btn btn-success" data-dismiss="modal" data-toggle="modal" data-target="#modal_setnick">Understood</button>
+                     <form role="form" id="auth" class="form">
+                        <div class="form-group">
+                           <div class="checkbox">
+                              <label><input type="checkbox" id="terms" data-error="really? So you don't agree?" required>I have read and agree</label>
+                              <div class="help-block with-errors"></div>
+                           </div>
+                        </div>
+                        <div class="form-group">
+                           <button type="submit" class="btn btn-success">Understood</button>
+                        </div>
+                     </form>
                   </div>
                   </div>
                 </div>
                 </div>
               </div>
               </div>

+ 8 - 0
src/js/radio.js

@@ -194,6 +194,14 @@ interval = setInterval(radioTitle,20000); // every 20 seconds or stop polling
 
 
 $(document).ready(function() {
 $(document).ready(function() {
   $('#auth-modal').modal('show');
   $('#auth-modal').modal('show');
+  $('#auth').validator().on('submit', function (e) {
+    if (e.isDefaultPrevented()) {
+    } else {
+      e.preventDefault();
+      $('#auth-modal').modal('hide');
+      $('#modal_setnick').modal('show');
+    }
+  }); 
   $('#nick').validator();
   $('#nick').validator();
   var socket = io.connect(window.location.host);
   var socket = io.connect(window.location.host);
   var getNickname = function() {
   var getNickname = function() {