Changeset 33062


Ignore:
Timestamp:
05/09/19 17:43:55 (2 years ago)
Author:
wy59
Message:

Tidying up the previous commit of debug statements

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  
    55    // https://stackoverflow.com/questions/4271566/how-do-i-know-which-version-of-javascript-im-using
    66    this.MAX_THICKNESS = 5.0;
    7     this.MIN_THICKNESS = 0.0;
    8    
     7    this.MIN_THICKNESS = 0.0;   
    98    this.MAX_OPACITY = 100.00;
    109    this.MIN_OPACITY = 0.00;
     
    7069    var thicknessValue = ((thicknessSlider.value / 20) * 100) / 100;
    7170    thicknessSliderOutput.value = thicknessValue.toFixed(2);
    72     //console.log("Init thickness slider value: " + thicknessValue);
    7371
    7472    thicknessSlider.oninput = function () {
     
    9593    var opacitySlider = document.getElementById("colourOpacity" + "-" + this.id);
    9694    var opacitySliderOutput = document.getElementById("opacityRangeVal" + "-" + this.id);
    97     //opacitySliderOutput.innerHTML = Math.round(opacitySlider.value) + "%";
    9895   
    9996    opacitySlider.oninput = function () {
     
    484481MapEditor.prototype.addMarkerListeners = function (newShape, e) {
    485482    var that = this;
    486     //cLICK EVENT IF A MARKER IS CREATED
     483    //Click event if a marker is created
    487484    google.maps.event.addListener(newShape, 'click', function (e) {
    488485        if(that.shiftKeyPressed){
     
    662659}
    663660
    664 MapEditor.prototype.updateMenuValues = function (thi, opa, fCol, sCol) {
    665     //console.log("New thickness value: " + thi);
     661MapEditor.prototype.updateMenuValues = function (thi, opa, fCol, sCol) {   
    666662    //Update thickness slider and value on the settings menu
    667663    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   
    670665    thi = parseFloat(thi); //Ensure the thi is a number
    671666    thicknessSliderOutput.value = thi.toFixed(2);
  • main/trunk/greenstone3/web/interfaces/default/style/map-editors.css

    r33061 r33062  
    8686}
    8787
     88.valueEditor{
     89     display:inline-block;
     90}
     91
    8892#ColourOpacity{
    8993    float: left;
     
    9195    margin-right: 3px;
    9296}
    93 
    94 /*
    95 #opacityRangeVal{
    96    width:250px;
    97    max-width:250px;
    98 }
    99 */
    10097
    10198#buttons3{
     
    107104
    108105#FillColour {
    109     /*display: inline;
    110     float: left;*/
    111106    padding-left: 10px;
    112107}
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

    r33061 r33062  
    247247                        <div id="SecondRow">
    248248                            <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:                                 
    251250                                    <div class="valueChanger">
    252251                                        <input type="number" class="valueInput" id="thicknessRangeVal-{@nodeID}" min="1.00" max="5.00" value="1.00" step="0.01" />
     
    258257                                    </div>
    259258                                    <input type="range"  size="2" min="20" max="100" value="1" class="slider" id="thicknessRange-{@nodeID}" />             
    260                                 </p>
    261                                 <!-- <p>Value: </p> -->
     259                                </p>                               
    262260                            </div> 
    263261                           
    264262                            <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:                                 
    267264                                    <div class="valueChanger">
    268265                                        <input type="number" class="valueInput" id="opacityRangeVal-{@nodeID}" min="0.0" max="100.0" value="40" />
     
    271268                                    <input type="range" min="0" max="100" value="40" class="slider" id="colourOpacity-{@nodeID}" />
    272269                                </p>
    273                                 <!-- <p>Value: </p> -->
    274270                            </div>
    275271                        </div>
     
    294290                      </select>
    295291                    </div> 
    296                     -->
    297                
     292                    -->             
    298293                </div>
    299294               
Note: See TracChangeset for help on using the changeset viewer.