Changeset 5493

Show
Ignore:
Timestamp:
06/05/12 18:26:06 (7 years ago)
Author:
gpress
Message:

When a acquired vessel is on a node which is inactive, the vessel location will now turn red. When inactive, the vessel location(now red) has a tooltip indicating so. Also added a tooltip to the ? help link in the vessel name column Ticket #300

Location:
seattle/trunk/seattlegeni/website
Files:
3 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/seattlegeni/website/control/interface.py

    r3226 r5493  
    10101010    vessel_info["handle"] = vessel_info["node_id"] + ":" + vessel.name 
    10111011     
     1012    vessel_info["is_active"] = node.is_active 
     1013     
    10121014    expires_in_timedelta = vessel.date_expires - datetime.datetime.now() 
    10131015    # The timedelta object stores information in two parts: days and seconds. 
  • seattle/trunk/seattlegeni/website/html/templates/control/myvessels.html

    r5492 r5493  
    6464                                        {% url help as help %} 
    6565                                        <th>Vessel Location</th> 
    66                                         <th>Vessel Name <a class="help" href="{{ help }}#myvessels">?</a></th> 
     66                                        <th>Vessel Name <a class="help" href="{{ help }}#myvessels" title="For each vessel that you acquire, you will see an entry in the table with the vessel location (denoted by its IP address) and vessel name. This is the name that seash will display when you browse your vessels.">?</a></th> 
    6767                                        <th>Expires In</th> 
    6868                                        {% ifnotequal num_vessels 0 %} 
     
    8383                                          </form> 
    8484                                        </td> 
     85                                        {% if vessel.is_active %} 
    8586                                        <td><b> {{ vessel.node_ip }} </b></td> 
     87                                        {% else %} 
     88                                        <td><b> <span style="background-color: #FF0033" title="This node has become inactive and the server is unable to communicate with it."> 
     89                                                {{ vessel.node_ip }} </span></b></td> 
     90                                        {% endif %} 
    8691                                        <td> {{ vessel.vessel_id }} </td> 
    8792                                        <td> {{ vessel.expires_in }} </td> 
  • seattle/trunk/seattlegeni/website/html/views.py

    r5202 r5493  
    365365      vessel["expires_in"] = "Expired" 
    366366    else: 
     367      #is_active = vessel["is_active"] 
    367368      days = vessel["expires_in_seconds"] / (3600 * 24) 
    368369      hours = vessel["expires_in_seconds"] / 3600 % 24