# HG changeset patch
# User Madhusudan.C.S <madhusudancs@gmail.com>
# Date 1249755876 -19800
# Node ID 05b9e60e6a10e2f39c7b4c72cbc2d405f4abc84b
# Parent  5c1e26fa0fc4367c844e3be388cfedacfb353258
Changed CSS and removed Withdraw proposal.

diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/projrev/models.py
--- a/app/projrev/models.py	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/projrev/models.py	Sat Aug 08 23:54:36 2009 +0530
@@ -52,6 +52,10 @@
   state = models.CharField(max_length=256,
                            choices=STATE_CHOICES)
 
+  mobile_num = models.CharField(max_length=20)
+
+  fax_num = models.CharField(max_length=20, null=True)
+
   # Field containing the district to which the institution belongs
   # to in the state of India.
   district = models.CharField(max_length=256,
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/projrev/views/login.py
--- a/app/projrev/views/login.py	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/projrev/views/login.py	Sat Aug 08 23:54:36 2009 +0530
@@ -33,7 +33,10 @@
     if user is not None:
       if user.is_active:
         login(request, user)
-        return HttpResponseRedirect('/proposal/submit/')
+        if user.is_staff:
+          return HttpResponseRedirect('/proposal/review/')
+        else:
+          return HttpResponseRedirect('/proposal/submit/')
       else:
         pass
         # Return a 'disabled account' error message
@@ -57,17 +60,19 @@
         user.save()
         subject = "[Sakshath] Registration at Saskshath portal"
         message = """Hi,
-            We have received a request for registration of your
-            email address, "%s", to the http://sakshath.ac.in mailing list.
-            \n\n
-            Your login credentials are:\n
-              username: %s\n
-              password: %s\n\n\n
-            Regards,
-              Saksath admin
-            """ % (username, username, password)
+   We have received a request for registration of your email address, 
+"%s", to the http://sakshath.ac.in portal.
+ 
+Your login credentials are:
+  username: %s
+  password: %s
+
+--  
+Regards,
+Saksath admin""" % (username, username, password)
 
         user.email_user(subject=subject, message=message)
+
         context = {
             'created': True,
             'username': username,
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/projrev/views/proposal.py
--- a/app/projrev/views/proposal.py	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/projrev/views/proposal.py	Sat Aug 08 23:54:36 2009 +0530
@@ -111,6 +111,22 @@
 
       project.micr_code = cleaned_data['micr_code']
 
+      subject = "[Sakshath] MICR Code of the new proposal submitted"
+      message = """Hi,
+   We have received a new proposal for National Mission on education from your, 
+email address "%s", to the http://sakshath.ac.in portal. The MICR Code of the
+submitted proposal is: 
+  MICR Code: %s
+
+Please remember this code for all future references.
+
+
+--  
+Regards,
+Saksath admin""" % (request.user.username, project.micr_code)
+
+      request.user.email_user(subject=subject, message=message)
+
     project.status = 'new'
     micr_code = project.micr_code
 
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/site-content/css/projrev.css
--- a/app/site-content/css/projrev.css	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/site-content/css/projrev.css	Sat Aug 08 23:54:36 2009 +0530
@@ -183,6 +183,8 @@
 
 input.micr_button {
 	width: auto;
+	position: relative;
+	left: 22%;
   font: bold 1em Arial, Sans-serif; 
   background: #FFF url(/site-content/images/gradientbg.jpg) repeat-x; 
   color: #333;  
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/templates/projrev/auth/create_account.html
--- a/app/templates/projrev/auth/create_account.html	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/templates/projrev/auth/create_account.html	Sat Aug 08 23:54:36 2009 +0530
@@ -19,21 +19,25 @@
 {% block body %}
   <form id="login-form" action="#" method="POST">
     <fieldset>
-    
-      <legend>Log in</legend>
-      <label for="login">Email</label>
-      <input type="text" id="login" name="username"/>
-      <div class="clear"></div>
-      
-      <label for="password">Password</label>
-      <input type="password" id="password" name="password"/>
-      <div class="clear"></div>
+      {% if created %}
+      <p>Your account has been created and an Email confirming your 
+      password has been sent to you.<a href="/login">Click Here</a> to login.</p>
+      {% else %}
+        <legend>Log in</legend>
+        <label for="login">Email</label>
+        <input type="text" id="login" name="username"/>
+        <div class="clear"></div>
 
-      <label for="confirmpassword">Password</label>
-      <input type="password" id="confirmpassword" name="confirmpassword"/>
-      <div class="clear"></div>
-      <br />
-      <input type="submit" style="margin: -20px 0 0 287px;" class="button" name="Create" value="Create"/> 
+        <label for="password">Password</label>
+        <input type="password" id="password" name="password"/>
+        <div class="clear"></div>
+
+        <label for="confirmpassword">ConfirmPassword</label>
+        <input type="password" id="confirmpassword" name="confirmpassword"/>
+        <div class="clear"></div>
+        <br />
+        <input type="submit" style="margin: -20px 0 0 287px;" class="button" name="Create" value="Create"/>
+      {% endif %} 
     </fieldset>
   </form>
   <div class='hidden' style="display: none;">
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/templates/projrev/base.html
--- a/app/templates/projrev/base.html	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/templates/projrev/base.html	Sat Aug 08 23:54:36 2009 +0530
@@ -36,7 +36,8 @@
 		<h1 id="logo"><a href="index.html" title="">National Mission on Education <span class="gray">through ICT</span></a></h1>	
 	</div></div>
 
-	<div class="headerphoto"></div>
+	<!-- <div class="headerphoto"></div>  -->
+	<br /> <br />
 	{% endblock header %}
 
 	<!-- content-wrap starts here -->
@@ -50,7 +51,7 @@
 				<ul class="sidemenu">
 				  {% if user.is_authenticated %}
             <li>Welcome, {{ user.username }}</li>
-            <li><a href="/logout/" class="top">Logout</a></li>
+            <li><a href="/logout/" class="top"><strong>Logout</strong></a></li>
             {% if user.is_staff%}
               <li><a href="/proposal/review/" class="top">Review Proposals</a></li>
               <li><a href="/proposal/rank/" class="top">Aggregated Scores for Proposals</a></li>
@@ -59,7 +60,7 @@
             {% endif %}
           {% else %}
             <li>Welcome, new user. Please log in.</li>
-            <li><a href="/login/" class="top">Login</a></li>
+            <li><a href="/login/" class="top"><strong>Login</strong></a></li>
           {% endif %}
 				</ul>
 			</div>
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/templates/projrev/proposal/get_micr.html
--- a/app/templates/projrev/proposal/get_micr.html	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/templates/projrev/proposal/get_micr.html	Sat Aug 08 23:54:36 2009 +0530
@@ -19,15 +19,8 @@
     <br /><br /><br />
     <input class="micr_button" type="submit" name="submit" value="New Proposal" />
 		<input class="micr_button" type="submit" name="submit" value="Edit Proposal for MICR Code" />
-		<input class="micr_button" type="submit" name="submit" value="Withdraw Proposal for MICR Code" />
 		</p>		
 	</form>
 				
-	<p class="post-footer align-right">					
-		<span class="comments">Reviews (5)</span>
-		<span class="date">Last reviewed: Nov 11, 2006</span>
-		<span class="date">Last submitted: Nov 11, 2006</span>	
-	</p>
-				
 </div>
 {% endblock content %}
\ No newline at end of file
diff -r 5c1e26fa0fc4 -r 05b9e60e6a10 app/urls.py
--- a/app/urls.py	Fri Aug 07 04:13:53 2009 +0530
+++ b/app/urls.py	Sat Aug 08 23:54:36 2009 +0530
@@ -23,8 +23,9 @@
     (r'^logout/$', 'app.projrev.views.login.logout_view'),
     (r'^proposal/submit/$', 'app.projrev.views.proposal.getMicr'),
     (r'^proposal/submit/create/$', 'app.projrev.views.proposal.submit'),
-    (r'^proposal/withdraw/(?P<micr_code>[A-Z]{6}\d{9})/$',
-     'app.projrev.views.proposal.withdraw'),
+#    disabled for now.
+#    (r'^proposal/withdraw/(?P<micr_code>[A-Z]{6}\d{9})/$',
+#     'app.projrev.views.proposal.withdraw'),
     (r'^proposal/submit/(?P<micr_code>[A-Z]{6}\d{9})/$',
      'app.projrev.views.proposal.submit'),
     (r'^proposal/review/$', 'app.projrev.views.proposal.review'),