moved clear button, changed intervals for dom arps

ScaleDictionary.js

@@ -45,6 +45,8 @@ var dictKeys = {
 
 var INTS_FLATS = ['R', '♭9', '9', '♭3', '3', '11', '♭5', '5', '♭13', '13', '♭7', '7'];
 var INTS_SHARP4 = ['R', '♭9', '9', '♭3', '3', '11', '♯11', '5', '♭13', '13', '♭7', '7'];
+var INTS_DOM = ['R', '♭9', '9', '♯9', '3', '11', '♭5', '5', '+5', '13', '♭7', '7'];
+
 var INTS_SHARP4AUG = ['R', '♭9', '9', '♭3', '3', '11', '♯11', '5', '+5', '13', '♭7', '7'];
 var INTS_DIM = ['R', '♭9', '9', '♭3', '3', '11', '♯4', '5', '+5', '♭♭7', '♭7', '7'];
 var INTS_SUPERLOCRIAN = ['R', '♭9', '9', '♭3', '♭4', '11', '♭5', '5', '♭13', '13', '♭7', '7'];
@@ -282,7 +284,7 @@ var INTCLR_DIM = ["i_root", "white","white","i_third","white","white","i_fifth",
 
 var ARP_MAJ =  { "name" : "maj", "intnames": INTS_FLATS, "color" : INTCLR_MAJ };
 var ARP_MAJ7 =  { "name" : "maj7", "intnames": INTS_SHARP4, "color" : INTCLR_MAJ7 };
-var ARP_DOM7 =  { "name" : "7", "intnames": INTS_SHARP4, "color" : INTCLR_DOM7 };
+var ARP_DOM7 =  { "name" : "7", "intnames": INTS_DOM, "color" : INTCLR_DOM7 };
 var ARP_MIN =  { "name" : "min", "intnames": INTS_FLATS, "color" : INTCLR_MIN };
 var ARP_MIN7 =  { "name" : "min7", "intnames": INTS_FLATS, "color" : INTCLR_MIN7 };
 var ARP_MIN7b5 =  { "name" : "min7♭5", "intnames": INTS_FLATS, "color" : INTCLR_MIN7b5 };

boxfrets.js

@@ -372,12 +372,12 @@ var ctrl_updateMessage = function(){
 var ctl_updateIntervalMode = function(boolNewMode){
 
 		if(boolNewMode){
-			$('#modeNoteInt').attr('value', 'Intervals');
+			$('#modeNoteInt').attr('value', 'Notes');
 			INTERVALMODE = true;
 			set_notespans();
 			update_link();
 		} else {
-			$('#modeNoteInt').attr('value', 'Notes');
+			$('#modeNoteInt').attr('value', 'Intervals');
 			INTERVALMODE = false;
 			set_notespans();
 			update_link();

fretboard.css

@@ -12,6 +12,7 @@ table#fretclone { position:absolute; top:100px; left:-5px; border-spacing:8px; }
 table#fretclone tr td { margin: 0 12px; display:inline-block; border:2px solid transparent; background-color:transparent; font-size:18px; font-weight:bold; width:40px;height:24px; text-align:center; z-index:1; border-radius: 14px; }
 table#fretclone tr td:hover { cursor:pointer; border-color: black !important; border-style: dotted !important; }
 
+input  { padding: 0 4px 0 4px;}
 
 a:focus { outline: thin dotted #333; outline: 5px auto -webkit-focus-ring-color; outline-offset: -2px; }
 a:hover, a:active { outline: 0; }
@@ -65,7 +66,7 @@ div.h_ctrl   { display:inline; margin-right: 12px; }
 
 .setRootArmed { background-color:rgb(147,32,32); color: #FFF;}
 
-#clear, #eraser, #brush { font-weight: bold; padding: 2px; }
+#eraser, #brush { font-weight: bold; padding: 2px; }
 
 input.color_button { width:40px; border-radius: 5px; margin-left: 8px; }
 

fretboard.html

@@ -42,27 +42,16 @@
     </div>
 
     <div class= "h_ctrl">
-    <input type="button" id="setRoot" style="width:64px;" name="setRoot" value="Set Root">
+    <input type="button" id="clear" name="clear" value="Clear" />
     </div>
+    <div class= "h_ctrl">
 
     <div class= "h_ctrl">
-    <select name="selKey" id="selKey">
-<!--  		<option value="0">C</option>
-        <option value="1">D&#9837;</option>
-  		<option value="2">D</option>
-        <option value="3">E&#9837;</option>
-        <option value="4">E</option>
-        <option value="5">F</option>
-        <option value="6">G&#9837;</option>
-        <option value="7">G</option>
-        <option value="8">A&#9837;</option>
-        <option value="9">A</option>
-        <option value="10">B&#9837;</option>
-        <option value="11">B</option>
-        <option value="12">C&#9839;</option>
-        <option value="13">F&#9839;</option>
-        <option value="14">G&#9839;</option>-->
+    <input type="button" id="setRoot"  name="setRoot" value="Set Root">
+    </div>
 
+    <div class= "h_ctrl">
+    <select name="selKey" id="selKey">
         <option value="Cnatural">C</option>
         <option value="Dflat">D&#9837;</option>
   		<option value="Dnatural">D</option>
@@ -86,7 +75,7 @@
     </div>
 
     <div class= "h_ctrl">
-    <input type="button" id="modeNoteInt" style="width:98px;" name="ShowNotes" value="Notes">
+    <input type="button" id="modeNoteInt" style="width:98px;" name="ShowNotes" value="Intervals">
     </div>
 
     <div class= "h_ctrl">
@@ -109,12 +98,7 @@
 
     <!-- second button row start -->
     <div class="h_ctrl_cnt">
-    <div class= "h_ctrl">
-
-    <input id="clear" type="button" value="Clear" class="blank" />
-    </div>
-    <div class= "h_ctrl">
-
+     <div class= "h_ctrl">
     <input id="eraser" type="button" value="Eraser" class="blank" />
     </div>