Changeset 5692

Show
Ignore:
Timestamp:
08/14/12 14:13:14 (7 years ago)
Author:
gpress
Message:

cleans up myvessels css/html code. reformats the "get more resources" element.

Location:
seattle/trunk/seattlegeni/website/html
Files:
2 modified

Legend:

Unmodified
Added
Removed
  • seattle/trunk/seattlegeni/website/html/media/css/myvessels.css

    r4340 r5692  
    2121} 
    2222 
     23#getresources #user_vessel_info { /* ADDED Aug 2012 */ 
     24    display:inline-block; 
     25                margin-bottom: 5px; 
     26} 
     27 
     28#getresources #total_vessels { /* ADDED Aug 2012 */ 
     29    position:relative; 
     30                left:-129px;  
     31                padding: 0px 0px 5px 0px; 
     32                margin: 0px 0px 0px 0px; 
     33 
     34} 
     35 
     36#getresources #total_donations { /* ADDED Aug 2012 */ 
     37    position:relative; 
     38                left: 11px;  
     39                padding: 0px 0px 5px 0px; 
     40                margin: 0px 0px 0px 0px; 
     41} 
     42 
    2343#getresources form { 
    2444    display : inline; 
    25 } 
    26  
    27 #getresources form input, #getresources form select { 
    28     margin-right: 10px; 
     45                margin-top: 5px; /* ADDED Aug 2012 */ 
    2946} 
    3047 
  • seattle/trunk/seattlegeni/website/html/templates/control/myvessels.html

    r5648 r5692  
    2323                <div id="middle"> 
    2424                        <div id="getresources"> 
    25                          
    26                         <span style="position:relative;left:-129px;"> Total vessels available : {{ total_vessel_credits }}</span> 
    27                         <span style="position:relative;left:-129px;" title="Each user is gifted {{ free_vessel_credits }} vessels. In addition to these, each donation on your behalf grants 10 vessels. 
    28                         {{free_vessel_credits}} + ({{my_donations  }} * 10) ={{ total_vessel_credits }}">  <img src="{{ MEDIA_URL }}images/help-icon.png" ></img> </span> 
    29                         <span style="position:relative;left:11px;"> Total<a href="{% url getdonations %}"> donations </a>: {{my_donations}}</span>  
    30                         <br> 
     25                                <span id="user_vessel_info"> 
     26                                <span id="total_vessels"> Total vessels available : {{ total_vessel_credits }} 
     27                                <img src="{{ MEDIA_URL }}images/help-icon.png" title="Each user is gifted {{ free_vessel_credits }} vessels. In addition to these, each  
     28donation on your behalf grants 10 vessels.  
     29{{free_vessel_credits}} + ({{my_donations  }} * 10) = {{ total_vessel_credits }}"></img> </span> 
     30                                <span id="total_donations"> Total<a href="{% url getdonations %}"> donations </a>: {{my_donations}}</span>  
     31                                </span> 
     32                        <br/> 
    3133                                {% ifnotequal get_form None %} 
    3234                                <form method="POST" action="{% url get_resources %}"> 
     
    7072                                        {% url help as help %} 
    7173                                        <th>Vessel Location</th> 
    72                                         <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> 
     74                                        <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."><img src="{{ MEDIA_URL }}images/help-icon.png" ></img></a></th> 
    7375                                        <th>Expires In</th> 
    7476                                        {% ifnotequal num_vessels 0 %} 
     
    8587                                        <td> 
    8688                                          <form method="POST" action="{% url del_resource %}"> 
    87                                         <input type="image" src="{{ MEDIA_URL }}images/delete.png" alt="Remove" /> 
    88                                         <input type="hidden" name="handle" value="{{ vessel.handle }}" /> 
     89                                        <input type="image" src="{{ MEDIA_URL }}images/delete.png" alt="Remove" /> 
     90                                        <input type="hidden" name="handle" value="{{ vessel.handle }}" /> 
    8991                                          </form> 
    9092                                        </td> 
     
    99101                                        <td> 
    100102                                          <form method="POST" action="{% url renew_resource %}"> 
    101                                         <input type="image" src="{{ MEDIA_URL }}images/reload.png" alt="Renew" /> 
    102                                         <input type="hidden" name="handle" value="{{ vessel.handle }}" /> 
     103                                        <input type="image" src="{{ MEDIA_URL }}images/reload.png" alt="Renew" /> 
     104                                        <input type="hidden" name="handle" value="{{ vessel.handle }}" /> 
    103105                                          </form> 
    104106                                        </td>