commit 5e05921c245b71e16b2d51083399c8e0b174e0c5
Author: Sofia Papagiannaki <papagian@gmail.com>
Date:   Thu Nov 8 19:18:46 2012 +0200

    Display inf in case of unlimited group resource in the admin notification email text.

diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.orig b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.orig
deleted file mode 100644
index 7bb5726..0000000
--- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html.orig
+++ /dev/null
@@ -1,243 +0,0 @@
-{% extends "im/account_base.html" %}
-
-{% load filters %}
-{% block page.body %}
- 
-{% block headjs %}
-	{{ block.super }}	 
-		
-	<script src="{{ IM_STATIC_URL }}js/jquery.uniform.js"></script>
-	<script src="{{ IM_STATIC_URL }}js/quotas.js"></script>
-	 <link rel="stylesheet" href="{{ IM_STATIC_URL }}css/uniform.default.css" type="text/css" media="screen">	
-{% endblock %}		
-<form action="" method="post" class="withlabels quotas-form">{% csrf_token %}
-	 
-    <fieldset>
-    	<legend>
-    		1. CREATE GROUP
-			<span class="info"> 
-		    	<em>more info</em>
-		    	<span>Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text</span>
-	    	</span>    		
-    	</legend>
- 
-        {% include "im/form_render.html" %}
-		
-		<div class="double-checks">
- 
-    		<label>Max users per group</label>
-    		<div class="form-row">
-    			<p class="clearfix">
-    				<label for="members_unlimited">Unlimited</label>
-    				<input type="checkbox" id="members_unlimited" name="members_unlimited" class="unlimited" checked="checked">
-    			</p>
-    		</div>
-    		<div class="form-row">
-    			<p class="clearfix">
-    				<label for="members_limited">Limited</label>
-    				<input type="checkbox" id="members_limited" name="members_limited" class="limited">
-       				<input type="text" id="members_uplimit" name="members_uplimit" />
-       				 
-    			</p>
-    		</div>
-    		
-    	</div> 
-    	<!--<div class="radios clearfix">
-    		<label>Max users per group</label>
-    		<div class="radio-wrap">
-	    		
-	            <input type="radio" name="radio1" value="1" id="vm_radio_unlimited" checked="checked">
-	            <label for="vm_radio_unlimited">Unlimited</label>
-	            <input type="radio" name="radio1" value="0" id="vm_radio_limited" >
-	            <label for="vm_radio_limited">Limited</label>
-	            <input type="text" id="vm_radio_limited_num" name="vm_radio_limited_num"/>
-    		</div>
-    	</div>-->
-    </fieldset>       
-    <fieldset id="icons">
-    	<legend>
-    		2. CHOOSE RESOURCES
-    		<span class="info"> 
-		    	<em>more info</em>
-		    	<span>Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text Help Text</span>
-	    	</span>    
-    	</legend>
-
-    {% with resource_catalog|lookup:'resources' as resources %}
-    {% with resource_catalog|lookup:'groups' as groups %}    	
-    	<ul class="clearfix">
-            {% for g, rs in groups.items %}    		
-    		<li><a href="#{{'group_'|add:g}}" id="{{'group_'|add:g}}"><img src="/static/im/images/create-resource-vm.png" alt="vm"/></a></li>
-<!-- 
-    		<li><a href="#storage_1" id="storage_1"><img src="/static/im/images/create-resource-storage.png" alt="storage"/></a></li>
- -->
-            {% endfor %}
-    	</ul>
-    	<!--p class="msg">if you choose CPU without selecting any VMs you must also select RAM and DISKSPACE</p-->
-    </fieldset>
-    <div class="foo">
-<<<<<<< HEAD
-    	
-    </div> 
-    <div class="not-foo">
-	    <div class="group vm_1">  
-	    	<a href="#icons" class="delete"><strong>X</strong> remove resource</a>
-		    <fieldset class="quota vm" style="background:none;">
-		    	<legend>VM</legend>
-		    	<div class="form-row">
-		    		<p class="clearfix">
-		    			<label for="num_vms">Total VMs</label>
-		    			<input type="text" name="num_vms">
-		    			<span class="extra-img">&nbsp;</span>
-		         		<span class="info"> 
-					    	<em>more info</em>
-					    	<span>Help Text</span>
-				    	</span>
-		    		</p>
-		    	</div>
-		    	<div class="double-checks">
-		    		<label>Max VMs per user</label>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="vm_per_user_unlimited">Unlimited</label>
-		    				<input type="checkbox" id="vm_per_user_unlimited" name="vm_per_user_unlimited" class="unlimited" checked="checked">
-		    			</p>
-		    		</div>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="vm_per_user_limited">Limited</label>
-		    				<input type="checkbox" id="vm_per_user_limited" name="vm_per_user_limited" class="limited">
-		       				<input type="text" id="vm_per_user_limited_num" name="vm_per_user_limited_num"/>
-		       				 
-		    			</p>
-		    		</div>
-		    		
-		    	</div> 
-		    </fieldset>
-		    <fieldset class="quota cpu" style="background:none;">
-		    	 
-		    	<legend>cpu</legend>
-		    	<div class="form-row">
-		    		<p class="clearfix">
-		    			<label for="num_cpu">Total cpus</label>
-		    			<input type="text" name="num_cpu">
-		    			<span class="extra-img">&nbsp;</span>
-		         		<span class="info"> 
-					    	<em>more info</em>
-					    	<span>Help Text</span>
-				    	</span>
-		    		</p>
-		    	</div>
-		    	<div class="double-checks">
-		    		<label>Max cpus per user</label>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="cpu_per_user_unlimited">Unlimited</label>
-		    				<input type="checkbox" id="cpu_per_user_unlimited" name="cpu_per_user_unlimited" class="unlimited" checked="checked">
-		    			</p>
-		    		</div>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="cpu_per_user_limited">Limited</label>
-		    				<input type="checkbox" id="cpu_per_user_limited" name="cpu_per_user_limited" class="limited">
-		       				<input type="text" id="cpu_user_limited_num" name="cpu_user_limited_num"/>
-		       				 
-		    			</p>
-		    		</div>
-		    		
-		    	</div> 
-		    </fieldset>
-		    <fieldset class="quota ram">
-		    	 
-		    	<legend>ram</legend>
-		    	<div class="form-row">
-		    		<p class="clearfix">
-		    			<label for="num_ram">Total ram</label>
-		    			<input type="text" name="num_ram">
-		    			<span class="extra-img">&nbsp;</span>
-		         		<span class="info"> 
-					    	<em>more info</em>
-					    	<span>Help Text</span>
-				    	</span>
-		    		</p>
-		    	</div>
-		    	<div class="double-checks">
-		    		<label>Max ram per user</label>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="ram_per_user_unlimited">Unlimited</label>
-		    				<input type="checkbox" id="ram_per_user_unlimited" name="ram_per_user_unlimited" class="unlimited" checked="checked">
-		    			</p>
-		    		</div>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="ram_per_user_limited">Limited</label>
-		    				<input type="checkbox" id="ram_per_user_limited" name="ram_per_user_limited" class="limited">
-		       				<input type="text" id="ram_user_limited_num"/>
-		       				 
-		    			</p>
-		    		</div>
-		    		
-		    	</div> 
-		    </fieldset>
-		</div>    
-		<div class="group storage_1">
-=======
-    
-    </div>
-    
-        {% for g, rs in groups.items %}
-        <div class="{{'group_'|add:g}}">
->>>>>>> 952c09791d8a4c6e4ff8067fad45d6e1e8a0ce56
-			<a href="#icons" class="delete"><strong>X</strong> remove resource</a>	
-		    {% for r in rs %}
-		    <fieldset class="quota storage">
-		    	<legend>{{r|upper}}</legend>
-<!-- 
-		    	<div class="form-row">
-		    		<p class="clearfix">
-		    			<label for="num_storage">Total storage</label>
-		    			<input type="text" name="num_storage">
-		    			<span class="extra-img">&nbsp;</span>
-		         		<span class="info"> 
-					    	<em>more info</em>
-					    	<span>Help Text</span>
-				    	</span>
-		    		</p>
-		    	</div>
- -->
-		    	<div class="double-checks">
-		    		<label>Max Storage per user</label>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="{{r|add:'_unlimited'}}">Unlimited</label>
-		    				<input type="checkbox" id="{{'id_'|add:r|add:'_unlimited'}}" name="{{r|add:'_unlimited'}}" class="unlimited" checked="checked">
-		    			</p>
-		    		</div>
-		    		<div class="form-row">
-		    			<p class="clearfix">
-		    				<label for="{{r|add:'_limited'}}">Limited</label>
-		    				<input type="checkbox" id="id_storage_per_user_limited" name="{{r|add:'_limited'}}" class="limited">
-		       				<input type="text" id="{{'id_'|add:r|add:'_uplimit'}}" name="{{r|add:'_uplimit'}}"/> 
-		    			</p>
-		    		</div>
-		    		
-		    	</div> 
-		    </fieldset>
-		    {% endfor %}
-	    </div>
-    {% endfor %}
-
-    {% endwith %}
-    {% endwith %}
-	</div>
-    <div class="form-row submit">
-   		<input type="submit" value="SUBMIT" class="submit altcol" autocomplete="off">
-	</div>     
-</form>
-	 
-<script>
-	
-</script>	 
- 
-{% endblock %}
diff --git a/snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt b/snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt
index 10a327f..f3c4e0b 100644
--- a/snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt
+++ b/snf-astakos-app/astakos/im/templates/im/group_creation_notification.txt
@@ -12,7 +12,7 @@ Owner:                          {{owner}}
 Maximum participant number:	{{group.max_participants}}
 Policies:
 {% for p in policies %}
-    {{p.service}}.{{p.resource}}: uplimit:{{p.uplimit}}
+    {{p.service}}.{{p.resource}}: uplimit:{% if p.uplimit %}{{p.uplimit}}{% else %}inf{% endif %}
 {% endfor %}
 
 Για την ενεργοποίησή του μπορείτε να χρησιμοποιήσετε το command line εργαλείο:
@@ -31,7 +31,7 @@ Owner:                          {{owner}}
 Maximum participant number:	{{group.max_participants}}
 Policies:
 {% for p in policies %}
-    {{p.service}}.{{p.resource}}: uplimit:{{p.uplimit}}
+    {{p.service}}.{{p.resource}}: uplimit:{% if p.uplimit %}{{p.uplimit}}{% else %}inf{% endif %}
 {% endfor %}
 
 For its activation you can use the command line tool:
