From 58e9556fdd0693e331a25d13517a7244349ebc27 Mon Sep 17 00:00:00 2001
From: Yasin <mohammed-yasin.rahman@lip6.fr>
Date: Thu, 19 Sep 2013 14:30:30 +0200
Subject: [PATCH] Reg:Warning Msg added, MyAccount: delete,download in progess.
 Css: common css moved to onelab.css

---
 portal/accountview.py                   | 11 +++++------
 portal/static/css/account_view_html.css |  8 --------
 portal/static/css/onelab.css            | 10 ++++++++++
 portal/templates/account-view.html      |  1 +
 portal/templates/registration_view.html | 11 +++++++----
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/portal/accountview.py b/portal/accountview.py
index 5671b51c..35b52097 100644
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -132,16 +132,15 @@ def account_process(request):
         private_key = k.as_pem()
         private_key = ''.join(private_key.split())
         public_key = "ssh-rsa " + public_key
-        print "testing"
         # Saving to DB
         keypair = '{"user_public_key":"'+ public_key + '", "user_private_key":"'+ private_key + '"}'
 #        keypair = re.sub("\r", "", keypair)
 #        keypair = re.sub("\n", "\\n", keypair)
 #        #keypair = keypair.rstrip('\r\n')
 #        keypair = ''.join(keypair.split())
-        user_params = { 'config': keypair}
+        user_params = { 'config': keypair, 'auth_type':'managed'}
         manifold_update_account(request,user_params)
-        return HttpResponse('Success: New Keypair Generated! %s' % keypair)
+        return HttpResponse('Success: New Keypair Generated!')
 
     elif 'upload_key' in request.POST:
         up_file = request.FILES['pubkey']
@@ -155,12 +154,12 @@ def account_process(request):
             #file_content = re.sub("\n", "\\n",file_content)
             file_content = ''.join(file_content.split())
             # update manifold account table
-            user_params = { 'config': file_content}
+            user_params = { 'config': file_content, 'auth_type':'user'}
             manifold_update_account(request,user_params)
-            return HttpResponse('Success: Publickey uploaded! Old records overwritten')
+            return HttpResponse('Success: Publickey uploaded! Please delegate your credentials using SFA: http://trac.myslice.info/wiki/DelegatingCredentials')
         else:
             return HttpResponse('Please upload a valid RSA public key [.txt or .pub].')    
         
     else:
-        message = 'You submitted an empty form.'
+        message = 'Under Construction.'
         return HttpResponse(message)
diff --git a/portal/static/css/account_view_html.css b/portal/static/css/account_view_html.css
index dd77998d..cd6e478f 100644
--- a/portal/static/css/account_view_html.css
+++ b/portal/static/css/account_view_html.css
@@ -146,14 +146,6 @@ code {
 
 /***** Notifications *****/
 
-.warning {
-	border: 1px solid red;
-	margin: 20px 60px;
-	padding: 10px 20px;
-	color: red;
-	background-color: #f2dbdb;
-	text-align: center;
-}
 .warning2 {
 	border: 1px solid red;
 	margin: 20px 60px;
diff --git a/portal/static/css/onelab.css b/portal/static/css/onelab.css
index 70418c0b..b11396c3 100644
--- a/portal/static/css/onelab.css
+++ b/portal/static/css/onelab.css
@@ -14,3 +14,13 @@ div.onelab-title{
     background-color: #e0f0f0;
 }
 
+/***** Notifications *****/
+.warning {
+    border: 1px solid red;
+    margin: 20px 60px;
+    padding: 10px 20px;
+    color: red;
+    background-color: #f2dbdb;
+    text-align: center;
+}
+
diff --git a/portal/templates/account-view.html b/portal/templates/account-view.html
index 4e97f9d7..346c41f8 100644
--- a/portal/templates/account-view.html
+++ b/portal/templates/account-view.html
@@ -1,6 +1,7 @@
 {% extends "layout-unfold1.html" %}
 
 {% block head %}
+<link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css"/>
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/account_view_html.css" />
 <script type="text/javascript" src="{{STATIC_URL}}/jquery.validate.js"></script> 
 <script type="text/javascript" src="{{STATIC_URL}}/my_account.edit_profile.js"></script>
diff --git a/portal/templates/registration_view.html b/portal/templates/registration_view.html
index 7e1c1d7b..2589961a 100644
--- a/portal/templates/registration_view.html
+++ b/portal/templates/registration_view.html
@@ -1,6 +1,6 @@
 {% extends "layout-unfold1.html" %}
 
-{% block head %}                
+{% block head %}
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/onelab.css" />
 <!-- xxx ideally only onelab.css but ... xxx -->
 <link rel="stylesheet" type="text/css" href="{{STATIC_URL}}/css/registration.css" />
@@ -77,17 +77,20 @@
      <p class="hint">Retype the password</p>
    </div>
    <div class="field">
-      <label for="question">My Public Key</label>
+      <label for="question">My Keys</label>
       <select name="question" class="required" id="question">        
         <option value="generate">Generate key pairs for me </option>
         <option value="upload">Upload my public key </option>
-      </select> 
+      </select>
+		<p class="hint">Account Delegation: Automatic (Recommended)</p> 
       <?php echo $errFile; ?>
    </div>
    <div class="field" style="display:none;" id="upload_key">
       <label for="file">Upload public key</label>
       <input type="file" name="user_public_key" class="required" id="user_public_key"/>
-      <p class="hint">Upload a valid public key</p>
+      <p class="hint">Account Delegation: Manual (Advanced Users)</p>
+	  <p class="warning" id="pkey_del_msg">Once your account is validated, you have to delegate your credentials manually using SFA [Advanced users only]</p>
+
    </div>
    <div class="field" id="register">
      <input class="submit btn" type="submit"  name="submit" value="Register"/>
-- 
2.43.0