Merge pull request #1 from louis-coding/patch-1

Patch 1
buzcarter · Mar 12, 2015 · 1758ba0 · 1758ba0
2 parents d49cf96 + bb6c648
commit 1758ba0
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 14 deletions.
diff --git a/src/js/editor/ugsEditorPlus.submenuUi.js b/src/js/editor/ugsEditorPlus.submenuUi.js
@@ -204,7 +204,7 @@ ugsEditorPlus.submenuUi = (function(){
 		'zoomDiagrams' : ['Tiny', 'Small', 'Medium', 'Large', 'Stupid Large'],
 		'layout' : ['Reference diagrams on left', 'Reference diagrams at top', 'No reference diagrams'],
 		'placement' : ['Chord names inline with lyrics', 'Chord names above lyrics', 'Names & diagrams above lyrics'],
-		'tuning' : ['Soprano (GCEA) tuning', 'Baritone (DBEA) tuning']
+		'tuning' : ['Standard (GCEA) tuning', 'Baritone (DGBE) tuning']
 	};
 
 	/**
@@ -247,4 +247,4 @@ ugsEditorPlus.submenuUi = (function(){
 	// ---------------------------------------
 	return _public;
 
-}());
+}());
diff --git a/src/js/scriptasaurus/ukeGeeks.definitions.js b/src/js/scriptasaurus/ukeGeeks.definitions.js
@@ -34,8 +34,8 @@ ukeGeeks.definitions = (function() {
 	 * @type JSON
 	 */
 	_public.instrument = {
-		sopranoUke: 0, // GCEA
-		baritoneUke: 5 // DGBA -- Baritone's "A" fingering is the Soprano's "D"
+		sopranoUke: 0, // GCEA -- standard tuning G4 (or G3)-C4-E4-A4
+		baritoneUke: 5 // DGBE -- 5 steps lower than standard Soprano tuning: D3-G3-B3-E4
 	};
 
 	/* PUBLIC METHODS
@@ -192,4 +192,4 @@ ukeGeeks.definitions = (function() {
 	};
 
 	return _public;
-}());
+}());
diff --git a/src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js b/src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js
@@ -7,7 +7,7 @@
 ukeGeeks.definitions.sopranoUkuleleGcea = [
 	// Required: Instruement Name and Tuning (string names)
 	// -------------------------------------------------------
-	'{instrument: Soprano Ukulele}',
+	'{instrument: Standard Ukulele}',
 	'{tuning: G C E A}',
 	//  Ab returns G#
 	//  A
@@ -210,4 +210,4 @@ ukeGeeks.definitions.sopranoUkuleleGcea = [
 	'{define: G/F# frets 0 2 2 2}',
 	'{define: G/F frets 0 2 1 2}',
 	'{define: G7/B frets 0 2 1 2}'
-];
+];
diff --git a/ugsphp/settings.json_example b/ugsphp/settings.json_example
@@ -1,5 +1,6 @@
 {
 	// Remove the double-slashes (the "//" are JavaScript line comment markers) preceeding any option you wish to change
+	// Make sure you don't have a trailing comma after the last enabled option
 
 	/* If true the Edit Song box is shown when the page loads; false hides it.
 	 * Allowed values: true, false
@@ -61,4 +62,4 @@
 	 * Allowed values (string or array of strings): as an  array of strings: ["A", "G"] or comma delimited list: "A, G"
 	 */
 	// "commonChords": ["A", "B", "C", "D", "E", "F", "G", "Am"]
-}
+}
diff --git a/ugsphp/views/song-editable.php b/ugsphp/views/song-editable.php
@@ -44,7 +44,7 @@ function GetDisplayStyle($value){
 		</article>
 	</article>
 	<footer>
-		<p>Note: <span id="footTuningInfo">Standard <strong>GCEA</strong> Soprano Ukulele</span> Tuning. <small>Powered by <a href="http://ukegeeks.com/" title="Uke Geeks for free ukulele JavaScript tools">UkeGeeks' Scriptasaurus</a> &bull; ukegeeks.com</small></p>
+		<p>Note: <span id="footTuningInfo"><strong>GCEA</strong> Standard Ukulele</span> Tuning. <small>Powered by <a href="http://ukegeeks.com/" title="Uke Geeks for free ukulele JavaScript tools">UkeGeeks' Scriptasaurus</a> &bull; ukegeeks.com</small></p>
 	</footer>
 </section>
 <!-- EDIT SONG (DIALOG) -->
@@ -159,10 +159,10 @@ function GetDisplayStyle($value){
 					<li><a href="#up_6">+6 <em>F#</em></a></li>
 				</ul>
 			</dd>
-			<dt><label for="tuningPicker"><span>Soprano ukulele tuning</span> <em>&#9658;</em></label></dt>
+			<dt><label for="tuningPicker"><span>Standard ukulele tuning</span> <em>&#9658;</em></label></dt>
 			<dd id="tuningPicker" data-action="tuning">
 				<ul class="pseudoSelect">
-					<li class="checked"><a href="#soprano">Soprano</a></li>
+					<li class="checked"><a href="#soprano">Standard</a></li>
 					<li><a href="#baritone">Baritone</a></li>
 				</ul>
 			</dd>
@@ -311,4 +311,4 @@ function GetDisplayStyle($value){
 });
 </script>
 </body>
-</html>
+</html>
diff --git a/ugsphp/views/song.php b/ugsphp/views/song.php
@@ -56,9 +56,9 @@
 	</div>
 </section>
 <footer>
-	<p>Note: Standard <strong>GCEA</strong> Soprano Ukulele Tuning. <small>Powered by UkeGeeks' Scriptasaurus &bull; ukegeeks.com</small></p>
+	<p>Note: <strong>GCEA</strong> Standard Ukulele Tuning. <small>Powered by UkeGeeks' Scriptasaurus &bull; ukegeeks.com</small></p>
 </footer>
 <script type="text/javascript" src="<?php echo($model->StaticsPrefix); ?>/js/ukeGeeks.scriptasaurus.min.js"></script>
 <script type="text/javascript" src="<?php echo($model->StaticsPrefix); ?>/js/startup.js"></script>
 </body>
-</html>
+</html>