Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ugsEditorPlus.actions.js #6

Open
wants to merge 20 commits into
base: master
Choose a base branch
from
Open

Update ugsEditorPlus.actions.js #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
54cc466
Update ugsEditorPlus.submenuUi.js
louis-coding Jul 14, 2014
d49cf96
Update ugsEditorPlus.actions.js
louis-coding Jul 14, 2014
683c4f3
replaced "Soprano" by "Standard"
louis-coding Jul 14, 2014
36e58a7
replaced "Soprano" with "Standard"
louis-coding Jul 14, 2014
ec8aa4d
Standard tuning is not limited to Soprano
louis-coding Jul 14, 2014
16aa815
Standard tuning is not limited to Soprano
louis-coding Jul 14, 2014
f26df37
added comment about trailing comma after last option
louis-coding Jul 14, 2014
bb6c648
updated tuning comments
louis-coding Jul 14, 2014
1758ba0
Merge pull request #1 from louis-coding/patch-1
louis-coding Mar 12, 2015
cd49fd6
Update ugsEditorPlus.actions.js
louis-coding Mar 12, 2015
cd7a336
Update ugsEditorPlus.submenuUi.js
louis-coding Mar 12, 2015
9dcdb04
Update ukeGeeks.definitions.js
louis-coding Mar 12, 2015
ff123e6
Update song-editable.php
louis-coding Mar 12, 2015
c78f5a5
Merge pull request #2 from buzcarter/master
louis-coding Mar 12, 2015
3d1e65d
Update song-editable.php
louis-coding Mar 12, 2015
76a2401
Update ugsEditorPlus.actions.js
louis-coding Mar 12, 2015
daa726a
Update ugsEditorPlus.submenuUi.js
louis-coding Mar 12, 2015
e98e454
Update ukeGeeks.definitions.js
louis-coding Mar 12, 2015
9a4056d
Update song-editable.php
louis-coding Nov 9, 2015
59b3193
Update song.php
louis-coding Nov 9, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/js/editor/ugsEditorPlus.actions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,11 +324,11 @@ ugsEditorPlus.actions = (function() {
*/
var doTuning = function(value){
var tuning = ukeGeeks.definitions.instrument.sopranoUke,
msg = 'Standard <strong>GCEA</strong> Soprano Ukulele';
msg = '<strong>GCEA</strong> Standard Ukulele';

if (value == 'baritone') {
tuning = ukeGeeks.definitions.instrument.baritoneUke;
msg = 'Standard <strong>DGBE</strong> Baritone Ukulele';
msg = '<strong>DGBE</strong> Baritone Ukulele';
}

$('#footTuningInfo').html(msg);
Expand Down Expand Up @@ -497,4 +497,4 @@ ugsEditorPlus.actions = (function() {
// ---------------------------------------
return _public;

}());
}());
4 changes: 2 additions & 2 deletions src/js/editor/ugsEditorPlus.submenuUi.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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']
};

/**
Expand Down Expand Up @@ -247,4 +247,4 @@ ugsEditorPlus.submenuUi = (function(){
// ---------------------------------------
return _public;

}());
}());
6 changes: 3 additions & 3 deletions src/js/scriptasaurus/ukeGeeks.definitions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -192,4 +192,4 @@ ukeGeeks.definitions = (function() {
};

return _public;
}());
}());
4 changes: 2 additions & 2 deletions src/js/scriptasaurus/ukeGeeks.definitions.sopranoUkuleleGcea.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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}'
];
];
3 changes: 2 additions & 1 deletion ugsphp/settings.json_example
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
Expand Down Expand Up @@ -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"]
}
}
12 changes: 6 additions & 6 deletions ugsphp/views/song-editable.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@ function GetDisplayStyle($value){
<script type="text/javascript">var isLegacyIe = false;</script>
<!--[if lt IE 9]>
<script type="text/javascript">isLegacyIe = true;document.getElementsByTagName('html')[0].className='legacyIe';</script>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script type="text/javascript" src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script type="text/javascript" src="//explorercanvas.googlecode.com/svn/trunk/excanvas.js"></script>
<link rel="stylesheet" href="<?php echo($model->StaticsPrefix); ?>css/ugsEditorPlus.legacyIe.css" />
<![endif]-->
<link href='http://fonts.googleapis.com/css?family=Peralta|Smokum|Cherry+Cream+Soda|Ranchers|Creepster|Lobster|Permanent+Marker|Architects+Daughter|Bree+Serif' rel='stylesheet' type='text/css' />
<link href='//fonts.googleapis.com/css?family=Peralta|Smokum|Cherry+Cream+Soda|Ranchers|Creepster|Lobster|Permanent+Marker|Architects+Daughter|Bree+Serif' rel='stylesheet' type='text/css' />
<link rel="stylesheet" href="<?php echo($model->StaticsPrefix); ?>css/yuiReset.css" />
<link rel="stylesheet" href="<?php echo($model->StaticsPrefix); ?>css/basic-page-layout.css" />
<link rel="stylesheet" href="<?php echo($model->StaticsPrefix); ?>css/ukeGeeks.music.css" />
Expand All @@ -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) -->
Expand Down Expand Up @@ -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>
Expand Down Expand Up @@ -311,4 +311,4 @@ function GetDisplayStyle($value){
});
</script>
</body>
</html>
</html>
6 changes: 3 additions & 3 deletions ugsphp/views/song.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
isLegacyIe = true;
document.getElementsByTagName('html')[0].className = 'ie';
</script>
<script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script src="//html5shiv.googlecode.com/svn/trunk/html5.js"></script>
<script type="text/javascript" src="<?php echo($model->StaticsPrefix); ?>/js/excanvas.js"></script>
<![endif]-->
<link rel="stylesheet" type="text/css" href="<?php echo($model->StaticsPrefix); ?>/css/yuiReset.css" />
Expand Down Expand Up @@ -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>