Changeset 33081 for main

Show
Ignore:
Timestamp:
15.05.2019 19:27:54 (5 months ago)
Author:
wy59
Message:

1. Beginnings of label for shapes. 2. Commented out rough working sample code for label appearing on map (if in future we want a label appearing on SHAPES in the map).

Location:
main/trunk/greenstone3/web/interfaces/default
Files:
1 added
3 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone3/web/interfaces/default/js/map-scripts-editor.js

    r33062 r33081  
    88    this.MAX_OPACITY = 100.00;  
    99    this.MIN_OPACITY = 0.00; 
     10 
     11    // WORK-IN-PROGRESS FEATURE: label on Map (to be changed to a label associated with each shape later) 
     12    // Also uncomment import of label-overlay-class.js in document.xsl 
     13    //this.labelOverlay = null; 
     14     
    1015     
    1116    this.id = id; 
     
    271276            mapId: this.id, 
    272277        }); 
     278     
     279    // WORK-IN-PROGRESS FEATURE: label on Map (to be changed to a label associated with each shape later) 
     280    // let's associate a label with the map (for now, later associate labels for each shape) 
     281    //this.labelOverlay = new LabelOverlay(this.map);        
     282         
    273283    this.mapsArray.push(this.map); 
    274284    // Add a style-selector control to the map. 
  • main/trunk/greenstone3/web/interfaces/default/style/map-editors.css

    r33062 r33081  
    120120} 
    121121 
     122#FourthRow { 
     123    clear: left; 
     124} 
     125#FourthRow > p{ 
     126    padding-left: 10px; 
     127} 
     128 
    122129#FillColour > p {  
    123130 margin-top: 5px; 
  • main/trunk/greenstone3/web/interfaces/default/transform/pages/document.xsl

    r33062 r33081  
    275275                            </div> 
    276276                        </div> 
     277                        <div id = "FourthRow"> 
     278                            <p>Label Text: 
     279                                <input type="text" />    
     280                            </p> 
     281                        </div> 
     282 
    277283                    </div> 
    278284                    <!-- 
     
    341347            <script type="text/javascript" src="interfaces/{$interface_name}/js/map-scripts-editor-history.js"><xsl:text> </xsl:text></script> 
    342348            <script type="text/javascript" src="interfaces/{$interface_name}/js/map-scripts-editor-themes.js"><xsl:text> </xsl:text></script>        
     349            <!--<script type="text/javascript" src="interfaces/{$interface_name}/js/label-overlay-class.js"><xsl:text> </xsl:text></script>--> 
    343350            <script type="text/javascript" src="interfaces/{$interface_name}/js/map-scripts-editor.js"><xsl:text> </xsl:text></script>       
    344351            <script type="text/javascript" src="interfaces/{$interface_name}/js/hierarchy.js"><xsl:text> </xsl:text></script>