From e51ffd9759e247806678e4c25acb2921eaab89b8 Mon Sep 17 00:00:00 2001
From: Tomas Groth <second@tgc.dk>
Date: Thu, 2 Jun 2016 15:54:44 +0200
Subject: [PATCH] Removed resizing buttons and reuse the stage.css

---
 openlp/plugins/remotes/html/chords.html    |  4 +-
 openlp/plugins/remotes/html/css/chords.css | 63 ++++------------------
 openlp/plugins/remotes/html/js/chords.js   | 12 ++---
 3 files changed, 13 insertions(+), 66 deletions(-)
diff --git a/openlp/plugins/remotes/html/chords.html b/openlp/plugins/remotes/html/chords.html
index b8ad05347..e5c1f2cb9 100644
--- a/openlp/plugins/remotes/html/chords.html
+++ b/openlp/plugins/remotes/html/chords.html
@@ -23,6 +23,7 @@
 <head>
   <meta charset="utf-8" />
   <title>${chords_title}</title>
+  <link rel="stylesheet" href="/css/stage.css" />
   <link rel="stylesheet" href="/css/chords.css" />
   <link rel="shortcut icon" type="image/x-icon" href="/images/favicon.ico">
   <script type="text/javascript" src="/assets/jquery.min.js"></script>
@@ -32,9 +33,6 @@
 <input type="hidden" id="next-text" value="${next}" />
 <div id="right">
   <div id="clock"></div>
-  <div id="chords">chords on/off</div>
-  <div id="plus" class="button">+</div>
-  <div id="minus" class="button">-</div>
   <div id="notes"></div>
 </div>
 <div id="header">
diff --git a/openlp/plugins/remotes/html/css/chords.css b/openlp/plugins/remotes/html/css/chords.css
index dafe4aedf..3f20649a7 100644
--- a/openlp/plugins/remotes/html/css/chords.css
+++ b/openlp/plugins/remotes/html/css/chords.css
@@ -16,48 +16,9 @@
 * with this program; if not, write to the Free Software Foundation, Inc., 59  *
 * Temple Place, Suite 330, Boston, MA 02111-1307 USA                          *
 ******************************************************************************/
-body {
-  background-color: black;
-  font-family: 'Arial Narrow', 'Avenir Next Condensed', sans-serif-condensed, Arial, sans-serif;
-  font-size: 4.4vw;
-  overflow: hidden;
-}
-
-#currentslide {
-  font-size: 100%;
-  color: lightgray;
-  padding-bottom: 0px;
-}
-
-#nextslide {
-  font-size: 100%;
-  color: gray;
-  padding-top: 0px;
-  padding-bottom: 0px;
-}
-
-#right {
-  float: right;
-}
-
-#clock {
-  font-size: 75%;
-  color: yellow;
-  text-align: right;
-}
-
-#notes {
-  font-size: 90%;
-  color: salmon;
-  text-align: right;
-}
-
-#controls {
-  display: none;
-}
 
 #chords {
-  font-size: 50%;
+  font-size: 20pt;
   color: gray;
   background-color: gray;
   color: white;
@@ -65,14 +26,15 @@ body {
 }
 
 #header {
-  height: 1.4em;
+  padding-bottom: 1em;
+
 }
 
 #transpose,
 #transposevalue,
 #capodisplay {
   display: inline-block;
-  font-size: 75%;
+  font-size: 30pt;
   color: gray;
   vertical-align: middle;
 }
@@ -86,25 +48,18 @@ body {
   vertical-align: middle;
   color: white;
   background-color: gray;
-  font-size: 75%;
+  font-size: 30pt;
   text-align: center;
   cursor: pointer;
 }
 
+/* Extending exiting definition in stage.css */
 #verseorder {
-  font-size: 75%;
-  color: green;
-  text-align: left;
   line-height: 1.5;
   display: inline-block;
   vertical-align: middle;
 }
 
-.currenttag {
-  color: lightgreen;
-  font-weight: bold;
-}
-
 .chordline {
   line-height: 2.0;
 }
@@ -121,10 +76,10 @@ body {
   position: absolute;
   top: -1em;
   left: 0;
-  font: 500 75% 'Arial Narrow', 'Avenir Next Condensed', sans-serif-condensed, Arial, sans-serif;
+  font: 30pt sans-serif;
   color: yellow;
 }
 
-.nextslide .chordline span.chord span strong {
+#nextslide .chordline span.chord span strong {
   color: gray;
-}
\ No newline at end of file
+}
diff --git a/openlp/plugins/remotes/html/js/chords.js b/openlp/plugins/remotes/html/js/chords.js
index 0d6acccfe..ac9428355 100644
--- a/openlp/plugins/remotes/html/js/chords.js
+++ b/openlp/plugins/remotes/html/js/chords.js
@@ -21,6 +21,7 @@ var lastChord;
 var notesSharpNotation = {}
 var notesFlatNotation = {}
 
+// See https://en.wikipedia.org/wiki/Musical_note#12-tone_chromatic_scale
 notesSharpNotation['german'] = ['C','C#','D','D#','E','F','F#','G','G#','A','A#','H'];
 notesFlatNotation['german'] = ['C','Db','D','Eb','Fb','F','Gb','G','Ab','A','B','H'];
 notesSharpNotation['english'] = ['C','C#','D','D#','E','F','F#','G','G#','A','A#','B'];
@@ -99,7 +100,6 @@ window.OpenLP = {
           idx = parseInt(idx, 10);
           if (data.results.items[idx]["selected"]) {
             $("#notes").html(data.results.items[idx]["notes"].replace(/\n/g, "<br />"));
-            $("#songtitle").html(data.results.items[idx]["title"].replace(/\n/g, "<br />"));
             if (data.results.items.length > idx + 1) {
               OpenLP.nextSong = data.results.items[idx + 1]["title"];
             }
@@ -171,7 +171,6 @@ window.OpenLP = {
                                          chordclassshow='class="chord" style="display:inline"',
                                          regchord=/<span class="chord" style="display:inline">([\(\w#b♭\+\*\d/\)-]+)<\/span>([\u0080-\uFFFF,\w]*)([\u0080-\uFFFF,\w,\s,\.,\,,\!,\?,\;,\:,\|,\",\',\-,\_]*)(<br>)?/g,
                                          replaceChords=function(mstr,$1,$2,$3,$4) {
-//                                         regchord=/<span class="chord" style="display:inline">[\[{]([\(\w#b♭\+\*\d/\)-]+)[\]}]<\/span>([\u0080-\uFFFF,\w]*)([\u0080-\uFFFF,\w,\s,\.,\,,\!,\?,\;,\:,\|,\",\',\-,\_]*)(<br>)?/g,
     var v='', w='';
     var $1len = 0, $2len = 0, slimchars='fiíIÍjlĺľrtť.,;/ ()|"\'!:\\';
     $1 = transposeChord($1, transposeValue, OpenLP.chordNotation);
@@ -240,8 +239,9 @@ window.OpenLP = {
         else
             text = text + "<br />";
       }
-  text = text.replace(/\n/g, "<br />");
+      text = text.replace(/\n/g, "<br />");
       $("#nextslide").html(text);
+      $("#nextslide").class("nextslide");
     }
     else {
       text = "<p class=\"nextslide\">" + $("#next-text").val() + ": " + OpenLP.nextSong + "</p>";
@@ -288,8 +288,6 @@ $(document).ready(function() {
   $('#transposeup').click(function(e) {
     $('#transposevalue').text(parseInt($('#transposevalue').text()) + 1);
     storeTransposeValue(OpenLP.currentSlides[0].text.split("\n")[0], $('#transposevalue').text());
-    //alert(getTransposeValue(OpenLP.currentSlides[0].text.split("\n")[0]));
-    //$('body').get(0).style.'font-size' = (parseFloat($('body').css('font-size')) + 0.1) + 'vw');
     OpenLP.loadSlides();
   });
   $('#transposedown').click(function(e) {  
@@ -297,8 +295,4 @@ $(document).ready(function() {
     storeTransposeValue(OpenLP.currentSlides[0].text.split("\n")[0], $('#transposevalue').text());
     OpenLP.loadSlides();
   });
-  $("#chords").click(function(){ OpenLP.showchords=OpenLP.showchords?false:true; OpenLP.updateSlide(); });
-  $('#plus').click(function() { var fs=$('#currentslide').css('font-size').match(/\d+/); $('#currentslide').css("font-size",+fs+10+"px");$('#nextslide').css("font-size",+fs+10+"px"); } );
-  $("#minus").click(function() {var fs=$('#currentslide').css('font-size').match(/\d+/); $('#currentslide').css("font-size",+fs-10+"px");$('#nextslide').css("font-size",+fs-10+"px"); } );
-  $('body').hover(function(){ $('#controls').fadeIn(500);},function(){ $('#controls').fadeOut(500);});
 });
