old login system restored, merge done

5 files changed, 5 insertions, 5 deletions

diff --git a/forum/skins/default/templates/about.html b/forum/skins/default/templates/about.html
index e463ac44..66dcc3fd 100755
--- a/forum/skins/default/templates/about.html
+++ b/forum/skins/default/templates/about.html
@@ -26,7 +26,7 @@
     These points (very) roughly reflect the level of trust of the community.
     </p>
     <p>No points are necessary to ask or answer the questions - so please -
-    <strong><a href="{% url auth_signin %}">join us!</a></strong>
+    <strong><a href="{% url user_signin %}">join us!</a></strong>
     </p>
     <p>
             If you would like to find out more about this site - please see <strong><a href="{% url faq %}">frequently asked questions</a></strong>.
diff --git a/forum/skins/default/templates/auth/signup.html b/forum/skins/default/templates/auth/signup.html
index bd5750b4..ac5eb241 100755
--- a/forum/skins/default/templates/auth/signup.html
+++ b/forum/skins/default/templates/auth/signup.html
@@ -26,7 +26,7 @@
     {{form.recaptcha}}{% endcomment %}
     <div class="submit-row"><input type="submit" class="submit" value="{% trans "Create Account" %}" /> 
     <strong>{% trans "or" %}
-    <a href="{% url auth_signin %}">{% trans "return to login page" %}</a></strong></div>
+    <a href="{% url user_signin %}">{% trans "return to login page" %}</a></strong></div>
 </form>
 {% endblock %}
 <!--end signup.html-->
diff --git a/forum/skins/default/templates/faq.html b/forum/skins/default/templates/faq.html
index 284e1229..e7b2b626 100755
--- a/forum/skins/default/templates/faq.html
+++ b/forum/skins/default/templates/faq.html
@@ -113,7 +113,7 @@
         <div>
             <h3 class="subtitle">{% trans "To register, do I need to create new password?" %}</h3>
             <p>{% trans "No, you don't have to. You can login through any service that supports OpenID, e.g. Google, Yahoo, AOL, etc." %}
-            <strong><a href="{% url auth_signin %}">{% trans "Login now!" %}</a> »</strong> 
+            <strong><a href="{% url user_signin %}">{% trans "Login now!" %}</a> »</strong> 
             </p>
         </div>
     
diff --git a/forum/skins/default/templates/header.html b/forum/skins/default/templates/header.html
index e65ac73a..099bfb85 100755
--- a/forum/skins/default/templates/header.html
+++ b/forum/skins/default/templates/header.html
@@ -8,7 +8,7 @@
                     <a href="{% url user_profile id=request.user.id,slug=request.user.username|slugify %}">{{ request.user.username }}</a> {% get_score_badge request.user %} 
                     <a href="{% url logout %}">{% trans "logout" %}</a>
                 {% else %}
-                    <a href="{% url auth_signin %}">{% trans "login" %}</a>
+                    <a href="{% url user_signin %}">{% trans "login" %}</a>
                 {% endif %}
                 <a href="{% url about %}">{% trans "about" %}</a>
                 <a href="{% url faq %}">{% trans "faq" %}</a>
diff --git a/forum/skins/default/templates/question.html b/forum/skins/default/templates/question.html
index 4fc37dbd..1c542c8b 100755
--- a/forum/skins/default/templates/question.html
+++ b/forum/skins/default/templates/question.html
@@ -33,7 +33,7 @@
             {% if not question.closed and request.user.is_authenticated %}initEditor();{% endif %}

             

             lanai.highlightSyntax();

-            $('#btLogin').bind('click', function(){window.location.href='{% url auth_signin %}'; } )

+            $('#btLogin').bind('click', function(){window.location.href='{% url user_signin %}'; } )

         });

         

         function initEditor(){