From 8e0575ee9731510ddca8d268d7af7340ef0f6e3b Mon Sep 17 00:00:00 2001
From: Olga Brani <olgabrani@grnet.gr>
Date: Mon, 5 Nov 2012 16:00:55 +0200
Subject: [PATCH] Merge billing

---
 snf-astakos-app/.settings/org.eclipse.core.resources.prefs      |    3 +--
 .../astakos/im/templates/im/astakosgroup_form_demo.html         |    7 ++-----
 snf-astakos-app/astakos/im/templates/im/billing.html            |    2 +-
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/snf-astakos-app/.settings/org.eclipse.core.resources.prefs b/snf-astakos-app/.settings/org.eclipse.core.resources.prefs
index 0492ee8..d6497d3 100644
--- a/snf-astakos-app/.settings/org.eclipse.core.resources.prefs
+++ b/snf-astakos-app/.settings/org.eclipse.core.resources.prefs
@@ -1,6 +1,5 @@
-#Thu Sep 27 13:01:48 EEST 2012
+#Mon Nov 05 15:29:48 EET 2012
 eclipse.preferences.version=1
 encoding//astakos/im/migrations/0010_auto__add_field_astakosuser_activation_sent__chg_field_service_url.py=utf-8
 encoding//astakos/im/migrations/0011_set_old_activation_sent.py=utf-8
 encoding//astakos/im/migrations/0017_populate_resource_data.py=utf-8
-encoding//astakos/im/migrations/0023_populate_resource_data.py=utf-8
diff --git a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html
index eeb5c21..480d61b 100644
--- a/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html
+++ b/snf-astakos-app/astakos/im/templates/im/astakosgroup_form_demo.html
@@ -5,10 +5,7 @@
  
 {% 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">	
+	<script src="{{ IM_STATIC_URL }}js/quotas.js"></script>	
 {% endblock %}		
 <form action="" method="post" class="withlabels quotas-form">{% csrf_token %}
 	 
@@ -120,4 +117,4 @@
 	
 </script>	 
  
-{% endblock %}
+{% endblock %}
\ No newline at end of file
diff --git a/snf-astakos-app/astakos/im/templates/im/billing.html b/snf-astakos-app/astakos/im/templates/im/billing.html
index 9e08cd7..f3ad1f3 100644
--- a/snf-astakos-app/astakos/im/templates/im/billing.html
+++ b/snf-astakos-app/astakos/im/templates/im/billing.html
@@ -6,7 +6,7 @@
 
 {% block page.body %}
 <div class="billing list"> 
-	
+	{{ data }}
 	<div class="highlight">
 		
 		<em>{{ data.remainingCredits|floatformat:2 }}</em> credits remaining
-- 
1.7.10.4