From 9694f172f649ce3e2b47397460a2624a68882e22 Mon Sep 17 00:00:00 2001
From: Sean Whitton <spwhitton@spwhitton.name>
Date: Fri, 20 Mar 2015 05:41:35 +0000
Subject: new sounds

---
 assets/js/main.js   | 11 ++++++++++-
 src/sariulclocks.hs |  7 ++++++-
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/assets/js/main.js b/assets/js/main.js
index f4d5af2..d10911b 100644
--- a/assets/js/main.js
+++ b/assets/js/main.js
@@ -22,6 +22,12 @@ $.ionSound({
         },
         {
             name: "school_bell",
+        },
+        {
+            name: "why_so_noisy",
+        },
+        {
+            name: "new_cheonjae",
         }
     ],
     // volume: 0.5,
@@ -276,7 +282,7 @@ var activityClock = MyFlipClock($('#activity-countdown'), {
     countdown:true,
     callbacks:{
         stop:function () {
-            $.ionSound.play("cheonjae");
+            $.ionSound.play("new_cheonjae");
         }
     }
 });
@@ -354,6 +360,9 @@ $(document).bind('keydown', 'b', function (){$.ionSound.play("school_bell");});
 
 $(document).ready(function(){
 
+    $('#why-so-noisy').button();
+    $('#why-so-noisy').click(function (){$.ionSound.play("why_so_noisy");});
+
     $('#klaxon').button();
     $('#klaxon').click(function (){$.ionSound.play("klaxon");});
 
diff --git a/src/sariulclocks.hs b/src/sariulclocks.hs
index c8979a2..559b8a7 100644
--- a/src/sariulclocks.hs
+++ b/src/sariulclocks.hs
@@ -42,9 +42,14 @@ navBar = do
                    +++ ulist # "dropdown-menu" ! [strAttr "role" "menu"]
                    << ((li << anchor #= "klaxon" ! [strAttr "href" "#"] << "Klaxon")
                        +++ (li << anchor #= "bell" ! [strAttr "href" "#"] << "Bell")
+                       +++ (li # "divider" << noHtml)
+                       +++ (li # "dropdown-header" << "Sean")
                        +++ (li << anchor #= "one-two-three" ! [strAttr "href" "#"] << "One, two, three")
                       +++ (li << anchor #= "too-noisy" ! [strAttr "href" "#"] << "Too noisy")
-                      +++ (li << anchor #= "sit-down-quickly" ! [strAttr "href" "#"] << "Sit down quickly")))
+                      +++ (li << anchor #= "sit-down-quickly" ! [strAttr "href" "#"] << "Sit down quickly")
+                       +++ (li # "divider" << noHtml)
+                       +++ (li # "dropdown-header" << "은아")
+                      +++ (li << anchor #= "why-so-noisy" ! [strAttr "href" "#"] << "Why are you so noisy?")))
 
 lessonButtons          :: Maybe Class -> Html
 lessonButtons Nothing  = bsButton "start-lesson" "btn btn-info" "Start lesson"
-- 
cgit v1.2.3