Changeset 33062 for main/trunk/greenstone3/web/interfaces/default
- Timestamp:
- 2019-05-09T17:43:55+12:00 (5 years ago)
- Location:
- main/trunk/greenstone3/web/interfaces/default
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
main/trunk/greenstone3/web/interfaces/default/js/map-scripts-editor.js
r33061 r33062 5 5 // https://stackoverflow.com/questions/4271566/how-do-i-know-which-version-of-javascript-im-using 6 6 this.MAX_THICKNESS = 5.0; 7 this.MIN_THICKNESS = 0.0; 8 7 this.MIN_THICKNESS = 0.0; 9 8 this.MAX_OPACITY = 100.00; 10 9 this.MIN_OPACITY = 0.00; … … 70 69 var thicknessValue = ((thicknessSlider.value / 20) * 100) / 100; 71 70 thicknessSliderOutput.value = thicknessValue.toFixed(2); 72 //console.log("Init thickness slider value: " + thicknessValue);73 71 74 72 thicknessSlider.oninput = function () { … … 95 93 var opacitySlider = document.getElementById("colourOpacity" + "-" + this.id); 96 94 var opacitySliderOutput = document.getElementById("opacityRangeVal" + "-" + this.id); 97 //opacitySliderOutput.innerHTML = Math.round(opacitySlider.value) + "%";98 95 99 96 opacitySlider.oninput = function () { … … 484 481 MapEditor.prototype.addMarkerListeners = function (newShape, e) { 485 482 var that = this; 486 // cLICK EVENT IF A MARKER IS CREATED483 //Click event if a marker is created 487 484 google.maps.event.addListener(newShape, 'click', function (e) { 488 485 if(that.shiftKeyPressed){ … … 662 659 } 663 660 664 MapEditor.prototype.updateMenuValues = function (thi, opa, fCol, sCol) { 665 //console.log("New thickness value: " + thi); 661 MapEditor.prototype.updateMenuValues = function (thi, opa, fCol, sCol) { 666 662 //Update thickness slider and value on the settings menu 667 663 var thicknessSliderOutput = document.getElementById("thicknessRangeVal" + "-" + this.id); 668 // update the thickness innerHTML's value to always have 2 decimal places, https://www.w3schools.com/js/js_number_methods.asp 669 //console.log("thi =" + thi + " type of = " + typeof thi ); 664 // update the thickness innerHTML's value to always have 2 decimal places, https://www.w3schools.com/js/js_number_methods.asp 670 665 thi = parseFloat(thi); //Ensure the thi is a number 671 666 thicknessSliderOutput.value = thi.toFixed(2); -
main/trunk/greenstone3/web/interfaces/default/style/map-editors.css
r33061 r33062 86 86 } 87 87 88 .valueEditor{ 89 display:inline-block; 90 } 91 88 92 #ColourOpacity{ 89 93 float: left; … … 91 95 margin-right: 3px; 92 96 } 93 94 /*95 #opacityRangeVal{96 width:250px;97 max-width:250px;98 }99 */100 97 101 98 #buttons3{ … … 107 104 108 105 #FillColour { 109 /*display: inline;110 float: left;*/111 106 padding-left: 10px; 112 107 } -
main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl
r33061 r33062 247 247 <div id="SecondRow"> 248 248 <div id="LineThickness"> 249 <p style="display:inline-block">Line thickness: 250 <!-- <span id="thicknessRangeVal-{@nodeID}">1.00</span> --> 249 <p class="valueEditor">Line thickness: 251 250 <div class="valueChanger"> 252 251 <input type="number" class="valueInput" id="thicknessRangeVal-{@nodeID}" min="1.00" max="5.00" value="1.00" step="0.01" /> … … 258 257 </div> 259 258 <input type="range" size="2" min="20" max="100" value="1" class="slider" id="thicknessRange-{@nodeID}" /> 260 </p> 261 <!-- <p>Value: </p> --> 259 </p> 262 260 </div> 263 261 264 262 <div id="ColourOpacity"> 265 <p style="display:inline-block">Colour opacity: 266 <!-- <span id="opacityRangeVal-{@nodeID}">1.0</span> --> 263 <p class="valueEditor">Colour opacity: 267 264 <div class="valueChanger"> 268 265 <input type="number" class="valueInput" id="opacityRangeVal-{@nodeID}" min="0.0" max="100.0" value="40" /> … … 271 268 <input type="range" min="0" max="100" value="40" class="slider" id="colourOpacity-{@nodeID}" /> 272 269 </p> 273 <!-- <p>Value: </p> -->274 270 </div> 275 271 </div> … … 294 290 </select> 295 291 </div> 296 --> 297 292 --> 298 293 </div> 299 294
Note:
See TracChangeset
for help on using the changeset viewer.