From f552b41f4b337e6844f71c29ff177915abbfa417 Mon Sep 17 00:00:00 2001
From: Alvin Li <liweitianux@gmail.com>
Date: Fri, 4 Oct 2013 23:56:35 +0800
Subject: * indicator/static/javascripts/card_chart.js:   improved the display
 position of 'detail_card_info' *
 indicator/templates/indicator/SheetDefault.html:   destroy 'qtip' when close
 card

* added new app 'apps/sfaccount'
* implemented 'signup' and 'activate' functions
* implemented async sending activation mail
  (using 'django-celery' and 'redis')
* moved 'registration/*' templates to 'sfaccount/templates'

* implemented 'password_change' function:
  o password_change
  o password_change_done
* implemented 'password_reset' function
  o password_reset
  o password_reset_done
  o password_reset_confirm
  o password_reset_complete
  o re-write 'sfaccount.fomrs.SFPasswordResetForm'
  o re-write 'sfaccount.views.password_reset_view'
* improved 'sfaccount.functional' send mail functions
  o to send 'multipart' mail

* added 'README.txt'

* added app 'apps/recommend':
  for comparing with the SCI papers and then recommending
  most related papers for user.
---
 97suifangqa/templates/base.html                    |  2 +-
 97suifangqa/templates/registration/login.html      | 47 ----------------------
 97suifangqa/templates/registration/logout.html     |  0
 .../registration/password_change_done.html         |  0
 .../registration/password_change_form.html         |  0
 .../registration/password_reset_complete.html      |  0
 .../registration/password_reset_confirm.html       |  0
 .../registration/password_reset_done.html          |  0
 .../registration/password_reset_email.html         |  0
 .../registration/password_reset_form.html          |  0
 .../registration/password_reset_subject.txt        |  0
 97suifangqa/templates/registration/signup.html     | 24 -----------
 12 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 97suifangqa/templates/registration/login.html
 delete mode 100644 97suifangqa/templates/registration/logout.html
 delete mode 100644 97suifangqa/templates/registration/password_change_done.html
 delete mode 100644 97suifangqa/templates/registration/password_change_form.html
 delete mode 100644 97suifangqa/templates/registration/password_reset_complete.html
 delete mode 100644 97suifangqa/templates/registration/password_reset_confirm.html
 delete mode 100644 97suifangqa/templates/registration/password_reset_done.html
 delete mode 100644 97suifangqa/templates/registration/password_reset_email.html
 delete mode 100644 97suifangqa/templates/registration/password_reset_form.html
 delete mode 100644 97suifangqa/templates/registration/password_reset_subject.txt
 delete mode 100644 97suifangqa/templates/registration/signup.html

(limited to '97suifangqa/templates')

diff --git a/97suifangqa/templates/base.html b/97suifangqa/templates/base.html
index ae80e81..a93f207 100644
--- a/97suifangqa/templates/base.html
+++ b/97suifangqa/templates/base.html
@@ -80,7 +80,7 @@
 
     {% block js %}
     {% block jquery %}
-      <script src="{% static "javascripts/jquery-1.9.1.min.js" %}"></script>
+      <script type="text/javascript" src="{% static "javascripts/jquery-1.9.1.min.js" %}"></script>
     {% endblock %}
 
     {% block scripts %}
diff --git a/97suifangqa/templates/registration/login.html b/97suifangqa/templates/registration/login.html
deleted file mode 100644
index d0e98fc..0000000
--- a/97suifangqa/templates/registration/login.html
+++ /dev/null
@@ -1,47 +0,0 @@
-{% extends "picture-base.html" %}
-{% load staticfiles %}
-{% block bodyclasses %}{{ block.super }} registration login{% endblock %}
-{% block othercss %}
-<link rel="stylesheet" href="{% static "stylesheets/sass/registration.css" %}">
-{% endblock %}
-{% block body %}
-<h2>登录97随访  科学了解乙肝治疗</h2>
-<p></p>
-<p>
-	<img src="{% static "images/sinalogo.png" %}" alt="" style="width: 2.5em; vertical-align: middle;">
-	新浪微博账号登录
-</p>
-
-
-<p>
-	<img src="{% static "images/qqlogo.png" %}" alt="" style="width: 2.5em; vertical-align: middle;">
-	腾讯QQ账号登录
-</p>
-
-<form method="post">{% csrf_token %}
-
-	<table class="reg-form login-form">
-		<tr>
-			<td class="login-prompt">
-				<span class="prompt">或者直接用邮箱登陆</span>
-			</td>
-			<td></td>
-		</tr>
-		<tr>
-			<td>
-				<input type="text" name="{{ form.username.name }}" value="{{ form.username.value|default_if_none:"" }}" maxlength="80" placeholder="{{ form.username.label }}" class="username ">
-			</td>
-			<td rowspan="2" class="error">
-				{{form.non_field_errors|first}}
-			</td>
-		</tr>
-		<tr>
-			<td><input type="password" name="{{ form.password.name }}" placeholder="{{ form.password.label }}" class="password"></td>
-		</tr>
-	</table>
-
-	<input type="hidden" name="next" value="{{ next }}" />
-	<input type="submit" value="登 录" class="submit login"/> &emsp; | &emsp;
-	<a href="{% url profile.views.signup %}">还没有帐号?</a>
-</form>
-{% endblock body%}
diff --git a/97suifangqa/templates/registration/logout.html b/97suifangqa/templates/registration/logout.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_change_done.html b/97suifangqa/templates/registration/password_change_done.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_change_form.html b/97suifangqa/templates/registration/password_change_form.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_reset_complete.html b/97suifangqa/templates/registration/password_reset_complete.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_reset_confirm.html b/97suifangqa/templates/registration/password_reset_confirm.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_reset_done.html b/97suifangqa/templates/registration/password_reset_done.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_reset_email.html b/97suifangqa/templates/registration/password_reset_email.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_reset_form.html b/97suifangqa/templates/registration/password_reset_form.html
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/password_reset_subject.txt b/97suifangqa/templates/registration/password_reset_subject.txt
deleted file mode 100644
index e69de29..0000000
diff --git a/97suifangqa/templates/registration/signup.html b/97suifangqa/templates/registration/signup.html
deleted file mode 100644
index 935dde2..0000000
--- a/97suifangqa/templates/registration/signup.html
+++ /dev/null
@@ -1,24 +0,0 @@
-{% extends "picture-base.html" %}
-{% load staticfiles %}
-{% block bodyclasses %}{{ block.super }} registration signup{% endblock %}
-{% block othercss %}
-<link rel="stylesheet" href="{% static "stylesheets/sass/registration.css" %}">
-{% endblock %}
-{% block body %}
-<h2>注册97随访  科学了解乙肝治疗</h2>
-<form method="post">{% csrf_token %}
-  	<table class="reg-form register-form">
-  		{% for item in form %}
-  		<tr>
-  			<td>
-  				<input type="{{ item.field.widget.input_type }}" name="{{ item.name }}" {% if item.field.widget.input_type == "text" %}value="{{ item.value|default_if_none:"" }}"{% endif %} placeholder="{{ item.label }}" class="{{ item.name }}">
-  			</td>
-			<td class="error">{{ item.errors|join:"" }}</td>
-  		</tr>
-  		{% endfor %}
-	</table>
-
-  <input type="submit" value="注册完毕" class="submit register"/> &emsp; |
-  &emsp; <a href="{% url apps.profile.views.login %}">已有账号</a>
-</form>
-{% endblock body %}
-- 
cgit v1.2.2