Uniform text in group details/group list

[astakos] / snf-astakos-app / astakos / im / templates / im / astakosgroup_form_summary.html

diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
index f3ba7e9..b4a207b 100644 (file)
--- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
+++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_summary.html
@@ -6,76 +6,72 @@
  
 {% with form.data as data %}           
 <div class="projects summary">
-       <h2>CONFIRM YOUR REQUEST</h2>
-       <p>Lorem ipsum</p>
        <form action="{% url group_add_complete %}" method="post" class="quotas-form">{% csrf_token %}
+               <legend>CONFIRMATION REQUEST</legend>
+               <P>These are the specifications of the Project you want to create. If you hit the "Submit" button this form will be officially sent to GRNET for review. Please make sure the following reflect exactly your request. After submitting, there is no way to modify your Project request. </P>
 <!-- 
                {% for k,v in data.iteritems %}
                        <input type="hidden" name="{{ k }}" value="{{ v }}">
                {% endfor %}
  -->
         {% include "im/form_render.html" %}
-               
                <div class="full-dotted">
-                        <h3>DETAILS:</h3>
+                       <h3>GENERAL INFO</h3>
+                       <p class="restricted">{{ data.desc|safe }}</p>
+                       <dl class="alt-style">                      
+                               <dt>Homepage Url</dt>
+                               <dd>{{ data.homepage }}&nbsp;</dd>
+                               <dt>Modarated</dt>
+                               <dd>{{ data.moderation_enabled|yesno:"Yes, No" }}</dd>
+                       </dl>
+               </div>
+               <div class="full-dotted">
+                        <h3>DETAILS</h3>
                         <dl class="alt-style">                     
                            <dt>Name</dt>
-                               <dd>{{ data.name|strip_http }}&nbsp;</dd>
-                               <dt>Homepage Url</dt>
-                               <dd>{{ data.homepage }}&nbsp;</dd>
-                               <dt>Description</dt>
-                               <dd>{{ data.desc }}</dd>
+                               <dd>{{ data.name }}&nbsp;</dd>
                                <!--<dt>Type</dt>
                                <dd>Course&nbsp;</dd>-->
-                               <dt>Issue date:</dt>
+                               <dt>Start date</dt>
                                <dd>{{ data.issue_date|date:"d/m/Y"}}&nbsp;</dd>
-                               <dt>Expiration Date</dt>
+                               <dt>End Date</dt>
                                <dd>{{ data.expiration_date|date:"d/m/Y"}}&nbsp;</dd>
-                               <dt>Modaration</dt>
-                               <dd>{% if data.moderation_enabled%}Yes{% else %}No{% endif %}</dd>
-                               <dt>Max members per group</dt>
+                               <dt>Total number of members</dt>
                                <dd>{% if  data.max_participants %}{{ data.max_participants }}{% else %}Unlimited{% endif %}</dd>
                         </dl>
                 </div>
+                
+                
                 <div class="full-dotted">
-                        <h3>RESOURCES:</h3>
-                  <dl class="alt-style">                       
-                       {% for r in policies %}
-                               {% with r.service|add:'.'|add:r.resource as t %}
-                               {% with resource_catalog|lookup:'resources' as resources %}
-                               {% with resources|lookup:t as info %}
-                               {% with resource_presentation|lookup:t as resource_info %}
-                                       <dt>
-                                               Max {% if resource_info.is_abbreviation %}{{ r.resource|upper }}{% else %}{{ r.resource }}{% endif %}{% if not info.unit %}s {% endif  %}  per user
-                                       </dt>
-                                       
-                                       <dd>
-                                       {% if r.uplimit %}
-                                               {{ r.uplimit }} {% if info.unit %}({{ info.unit}}){% endif %}
-                                       {% else %}
-                                               Unlimited
-                                       {% endif %}
-                                       </dd>
-                               {% endwith %}
-                               {% endwith %}
-                               {% endwith %}
-                               {% endwith %}
-                       {% endfor %}
-                               
-                               <!--<dt>Max Vms per user</dt>
-                               <dd>3</dd>
-                               <dt>Max diskspace per user</dt>
-                               <dd>5GB</dd>
-                               <dt>Max RAM per user</dt>
-                               <dd>2GB</dd>
-                               <dt>Max CPU per user</dt>
-                               <dd>2</dd>-->
-                        </dl>
-                
+                       <h3>RESOURCES</h3>
+                       <p>The following ~okeanos resources will be granted to each member of this Project:</p>
+                       <dl class="alt-style">  
+                               {% for p in policies %}
+                                        
+                                       <dt>
+                                       Max {% if p.is_abbreviation %}{{ p.verbose_name|upper }}{% else %}{{ p.verbose_name }}{% endif %}{% if not p.unit %}s {% endif  %}  per user
+                               </dt>
+                                       <dd>
+                               {% if p.uplimit %}
+                                        {% if p.unit %}
+                                               {{ p.uplimit|sizeof_fmt }}
+                                        {% else %}
+                                               {{ p.uplimit }}
+                                        {% endif %}
+                               {% else %}
+                                       Unlimited
+                               {% endif %}
+                               </dd>
+                       {% empty %}
+                               No resources
+                               {% endfor %}
+                       </dl>      
                 </div>
+                
                 <div class="full-dotted">
                         
                 </div>
+               
                 
                 <div class="form-row submit">
                        <input type="submit" value="SUBMIT" class="submit altcol" autocomplete="off">