Changeset 2034

Timestamp:

06/16/09 12:23:37 (9 months ago)

Author:

JensDiemer

Message:

ajax login!

• needs tests
• "{{ login_link }}" -> "{% lucidTag auth %}"

Location:

branches/0.9/pylucid_project

Files:

• apps/pylucid/context_processors.py (modified) (2 diffs)
• apps/pylucid_update/views.py (modified) (2 diffs)
• media/PyLucid/pylucid_js_tools.js (modified) (2 diffs)
• media/PyLucid/superfish/pylucid_superfish_init.js (modified) (1 diff)
• pylucid_plugins/admin_menu/templates/admin_menu/admin_top_menu.html (modified) (1 diff)
• pylucid_plugins/auth/templates/auth/input_password.html (modified) (2 diffs)
• pylucid_plugins/auth/templates/auth/input_username.html (modified) (3 diffs)
• pylucid_plugins/auth/templates/auth/login_link.html (added)
• pylucid_plugins/auth/templates/auth/logout_link.html (added)
• pylucid_plugins/auth/views.py (modified) (7 diffs)
• pylucid_plugins/extrahead/context_middleware.py (modified) (3 diffs)
• pylucid_plugins/page_admin/templates/page_admin/edit_page_form.html (modified) (4 diffs)
• pylucid_plugins/page_admin/views.py (modified) (1 diff)

branches/0.9/pylucid_project/apps/pylucid/context_processors.py

@@ -12 +12 @@
 from pylucid_project import PYLUCID_VERSION_STRING
 from pylucid_project.utils import slug
+from pylucid_plugins.auth.context_processors import auth_context_processors
 
 
 def _add_plugin_info(request, context):
-    """ Add css anchor into context. Used infomation from lucidTagNode. """
+    """ Add css anchor into context. Used information from lucidTagNode. """
     
     plugin_name = request.plugin_name
@@ -58 +59 @@
     }
     
-    
-    
-    # TODO: Use internal SHA-Login plugin views, if implemented:
-    if request.user.is_authenticated():
-        # admin_logout reverse is still broken in django, see:
-        # http://code.djangoproject.com/ticket/11080
-        # http://code.djangoproject.com/attachment/ticket/10061
-        #url = reverse("admin_logout")
-        #url = reverse("admin_index") + "logout/" # TODO: Update this if django is bugfixed
-        url = "?auth=logout"
-        
-        txt = "%s [%s]" % (_("Log out"), request.user.username)
-    else:
-        #url = reverse("admin_index") # django admin panel index page
-        url = "?auth=login"
-        txt = _("Log in")
-        
-    context["login_link"] = mark_safe('<a href="%s">%s</a>' % (url, txt))
+    # TODO: Put all Plugin context processors into settings?
+    context.update(auth_context_processors(request))
     
     if hasattr(request, "plugin_name"):

branches/0.9/pylucid_project/apps/pylucid_update/views.py

@@ -267 +267 @@
         content = template.content
 
-        new_head_file_tag = (
+
+        SCRIPT_TAG = (
             '<script src="%(url)s"'
             ' onerror="JavaScript:alert(\'Error loading file [%(url)s] !\');"'
             ' type="text/javascript" /></script>\n'
-            '<!-- ContextMiddleware extrahead -->\n'
-        ) % {
+        )
+
+        new_head_file_tag = ""
+        new_head_file_tag += SCRIPT_TAG % {
             "url": posixpath.join(settings.MEDIA_URL, settings.PYLUCID.PYLUCID_MEDIA_DIR, "jquery.js")
         }
+        new_head_file_tag += SCRIPT_TAG % {
+            "url": posixpath.join(
+                settings.MEDIA_URL, settings.PYLUCID.PYLUCID_MEDIA_DIR, "pylucid_js_tools.js"
+            )
+        }
+        new_head_file_tag += '<!-- ContextMiddleware extrahead -->\n'      
         
         content = replace(content, out,"{% lucidTag page_style %}", new_head_file_tag)
@@ -280 +289 @@
         content = replace(content, out,"{% lucidTag head_files %}", new_head_file_tag)
         content = replace(content, out,"<!-- ContextMiddleware head_files -->", new_head_file_tag)
+        
+        content = replace(content, out,"{{ login_link }}", "{% lucidTag auth %}")
         
         content = replace(content, out,"{% lucidTag back_links %}", "<!-- ContextMiddleware breadcrumb -->")

branches/0.9/pylucid_project/media/PyLucid/pylucid_js_tools.js

@@ +1 @@
+
+
+// helper function for console logging
+// set debug to true to enable debug logging
+function log() {
+    if (debug && window.console && window.console.log)
+        window.console.log(Array.prototype.join.call(arguments,''));
+};
+
 
 function OpenInWindow(URL) {
@@ -5 +14 @@
     win.focus();
 }
+
+
+
+function get_pylucid_ajax_view(url) {
+    /*************************************************************************
+        PyLucid ajax replace function
+        
+        usage e.g.:
+        ----------------------------------------------------------------------
+            $(document).ready(function(){
+                $("#link_id").click(function(){
+                    return get_pylucid_ajax_view("{{ ajax_get_view_url }}");
+                });
+            });
+        ----------------------------------------------------------------------
+        or:
+        ----------------------------------------------------------------------
+        <a href="{{ url }}" onclick="return get_pylucid_ajax_view('{{ ajax_url }}');">foo</a>
+        ----------------------------------------------------------------------
+    *************************************************************************/
+    $("#page_content").html('<h2>loading...</h2>');
+    $("#page_content").animate({opacity: 0.3}, 500 );
+
+    var url = encodeURI(url);
+    log("get:" + url);
+    
+    var load_normal_link = true;
+    
+    $.ajax({
+        async: false,
+        type: "GET",
+        url: url,
+        dataType: "html",
+        
+        success: function(form_html){
+                log("ajax get success.");
+            $("#page_content").html(form_html);
+            $("#page_content").animate({opacity: 1}, 500 );
+            load_normal_link = false;
+        },
+        error: function(XMLHttpRequest){
+                log("ajax get response error!");
+            // Display the complete Traceback html page
+                log(XMLHttpRequest);
+                var response_text = XMLHttpRequest.responseText;
+                log("response_text: '" + response_text + "'");
+                if (!response_text) {
+                        document.write("<h1>ajax response error</h1>");
+                } else {
+                        document.write(response_text);
+                }
+                load_normal_link = true;
+        }
+    });
+    if (debug) {
+        // never fall back in debug mode.
+        log("return: " + load_normal_link);
+        return false;
+    } else {
+        // fall back to normal view, if ajax request failed.
+        return load_normal_link; // The browser follow the link, if true
+    }    
+}

branches/0.9/pylucid_project/media/PyLucid/superfish/pylucid_superfish_init.js

@@ -6 +6 @@
       delay:       1000,                            // one second delay on mouseout 
       animation:   {opacity:'show',height:'show'},  // fade-in and slide-down animation 
-      speed:       'fast',                          // faster animation speed
+      speed:       'fast'                           // faster animation speed
   });
 });

branches/0.9/pylucid_project/pylucid_plugins/admin_menu/templates/admin_menu/admin_top_menu.html

@@ -21 +21 @@
 -->
 </style>
-<script type="text/javascript">
-$(document).ready(function(){
-    $("#edit_page").click(function() {
-        var url = encodeURI("{{ edit_page_ajax}}");
-        console.log("get:" + url);
-        
-        bodyContent = $.ajax({
-            type: "GET",
-            url: url,
-            dataType: "html",
-            
-            success: function(form_html){
-                $("#page_content").html(form_html);
-            },
-            error: function(XMLHttpRequest){
-                 // Display the complete Traceback html page
-                 document.write(XMLHttpRequest.responseText);
-            },       
-        });
-        return false; // The browser follow the link, if true
-        });
-});
-</script>
 {% endextrahead %}
 
 <ul class="sf-menu">
-    <li class="current">
-        <a href="{{ logout_link }}">{% trans 'logout' %} [{{ request.user.username }}]</a>
-    </li>
+    <li class="current">{% lucidTag auth %}</li>
     <li>
-        <li><a href="#{{ edit_page_link }}" title="edit inline" id="edit_page">{% trans 'edit page' %}</a></li>
+        <li><a href="{{ edit_page_link }}" title="edit inline" id="edit_page" onclick="return get_pylucid_ajax_view('{{ edit_page_ajax}}');">{% trans 'edit page' %}</a></li>
         <ul>
             <li><a href="{{ edit_admin_panel_link }}">edit in admin panel</a></li>

branches/0.9/pylucid_project/pylucid_plugins/auth/templates/auth/input_password.html

@@ -4 +4 @@
 {% block plugin_content %}
 
-{% extrahead %}
+{# We can't use extrahead block here, because it's used in ajax view, too. #}
 <script type="text/javascript" src="{{ PyLucid_media_url }}sha.js"></script>
 <script type="text/javascript" src="{{ PyLucid_media_url }}shared_sha_tools.js"></script>
@@ -33 +33 @@
 start_init();
 </script>
-{% endextrahead %}
 
 <fieldset><legend>PyLucid <a href="http://www.pylucid.org/_goto/8/JS-SHA-Login/" title="What is the PyLucid JS-SHA-LogIn?">JS-SHA-LogIn</a> - step 2</legend>

branches/0.9/pylucid_project/pylucid_plugins/auth/templates/auth/input_username.html

@@ -2 +2 @@
 
 {% block plugin_content %}
-<div class="{{ CSS_PLUGIN_CLASS_NAME }} {{ css_plugin_class }}" id="{{ css_plugin_id }}">
+{# We can't use extrahead block here, because it's used in ajax view, too. #}
+<script type="text/javascript">
+
+$(document).ready(function(){
+    log("input username ready");
+    $("#id_username").focus();
+    
+    $('#username_form').bind('submit', function() {
+        // get the input password form via ajax
+        $("#page_content").html('<h2>loading...</h2>');
+        $("#page_content").animate({opacity: 0.3}, 500 );
+    
+        log("continue login...");
+
+        var form = $(this);
+        var form_data = form.serialize();
+        log("form data:" + form_data);
+        
+        var url = encodeURI(form.attr('action'));
+        log("form url:" + url);
+        
+            $.post(url, form_data,
+                function(form_html){
+                    log("ajax get success.");
+                    $("#page_content").html(form_html);
+                    $("#page_content").animate({opacity: 1}, 500 );
+                }
+            );
+        
+        return false; // <-- important!
+    });    
+});
+</script>
+
 <fieldset><legend>PyLucid <a href="http://www.pylucid.org/_goto/8/JS-SHA-Login/" title="What is the PyLucid JS-SHA-LogIn?">JS-SHA-LogIn</a> - step 1</legend>
 
@@ -12 +45 @@
 </noscript>
 
-<form method="post" action="{{ form_url }}">
+<form id="username_form" method="post" action="{{ form_url }}">
   {{ form.as_p }}
   <br />
@@ -21 +54 @@
 </form>
 </fieldset>
-
-<script type="text/javascript">document.getElementById("id_username").focus();</script>
-</div>
 {% endblock %}

branches/0.9/pylucid_project/pylucid_plugins/auth/views.py

@@ -25 +25 @@
 
 
+def lucidTag(request):
+    # TODO: Use internal SHA-Login plugin views, if implemented:
+    if request.user.is_authenticated():
+        # admin_logout reverse is still broken in django, see:
+        # http://code.djangoproject.com/ticket/11080
+        # http://code.djangoproject.com/attachment/ticket/10061
+        #url = reverse("admin_logout")
+        #url = reverse("admin_index") + "logout/" # TODO: Update this if django is bugfixed
+        template_name = "auth/logout_link.html"
+        context = {"logout_url": "?auth=logout"}
+    else:
+        template_name = "auth/login_link.html"
+        #url = reverse("admin_index") # django admin panel index page
+        context = {
+            "login_url": "?auth=login",
+            "login_url_ajax": "?auth=get_login_form",
+        }
+    
+    return render_to_string(template_name, context, context_instance=RequestContext(request))
+
+
+
+
 def _logout_view(request, next_url):
     """ Logout the current user. """
@@ -43 +66 @@
 
 
-def _plaintext_login(request, context, username, next_url):
+def _plaintext_login(request, context, username, next_url, render_function):
     """ input the password and login if auth ok """
     if "password" in request.POST:
@@ -56 +79 @@
     
     # return a string for replacing the normal cms page content
-    return render_to_string('auth/plaintext_login.html', context)
-
-
-    
-def _sha_login(request, context, user, next_url):
+    return render_function('auth/plaintext_login.html', context)
+
+
+    
+def _sha_login(request, context, user, next_url, render_function):
     """
     Login via JS-SHA-Login.
@@ -122 +145 @@
 
     # return a string for replacing the normal cms page content
-    return render_to_string('auth/input_password.html', context, 
-        context_instance=RequestContext(request)
-    )
-
-
-def _login_view(request, form_url, next_url):
+    return render_function('auth/input_password.html', context, context_instance=RequestContext(request))
+
+
+def _login_view(request, form_url, next_url, render_function):
     if DEBUG:
         request.page_msg(
@@ -147 +168 @@
             
             if "plaintext_login" in request.POST:
-                return _plaintext_login(request, context, user.username, next_url)
+                return _plaintext_login(request, context, user.username, next_url, render_function)
             else:
-                return _sha_login(request, context, user, next_url)
+                return _sha_login(request, context, user, next_url, render_function)
     else:
         username_form = UsernameForm()
@@ -156 +177 @@
     
     # return a string for replacing the normal cms page content
-    return render_to_string('auth/input_username.html', context)
+    return render_function('auth/input_username.html', context)
 
 
@@ -164 +185 @@
     """
     next_url = request.path
-    
+#    import time
+#    time.sleep(0.5)
     action = request.GET["auth"]
     if action=="login":
         form_url = request.path + "?auth=login" # FIXME: How can we add the GET Parameter?
-        return _login_view(request, form_url, next_url)
+        return _login_view(request, form_url, next_url, render_function=render_to_string)
+    elif action=="get_login_form":
+        form_url = request.path + "?auth=get_login_form" # FIXME: How can we add the GET Parameter?
+        return _login_view(request, form_url, next_url, render_function=render_to_response)
     elif action=="logout":
         return _logout_view(request, next_url)

branches/0.9/pylucid_project/pylucid_plugins/extrahead/context_middleware.py

@@ -49 +49 @@
     def __init__(self, request, context):
         self.request = request
-        self.data = ""
+        if settings.DEBUG:
+            # Turn debug mode in JavaScript on
+            self.data = DEBUG_INFO % {
+                "fileinfo": os.path.basename(__file__),
+                "content": '<script type="text/javascript">var debug=true;log("debug is on");</script>'
+            }
+            self.data += "\n" 
+        else:
+            self.data = ""
         
     def add_content(self, content):
@@ -89 +97 @@
             return False
         
-        def cut(filepath):
-            return "..." + filepath.split(FILEPATH_SPLIT,1)[1]
-            if len(filepath)>=MAX_FILEPATH_LEN:
-                return "...%s" % filepath[-MAX_FILEPATH_LEN:]
-            return filepath
-        
-        
-        try:
-            self_basename = os.path.basename(__file__)
-            if self_basename.endswith(".pyc"):
-                # cut: ".pyc" -> ".py"
-                self_basename = self_basename[:-1]
-    
+        try:    
             fileinfo = []
             step = 0
@@ -111 +107 @@
                     continue
                 
-                fileinfo.append("%s line %s" % (cut(filepath), lineno))
+                filepath = "..." + filepath.split(FILEPATH_SPLIT,1)[1]
+                
+                fileinfo.append("%s line %s" % (filepath, lineno))
                 if step>=1:
                     break

branches/0.9/pylucid_project/pylucid_plugins/page_admin/templates/page_admin/edit_page_form.html

@@ +1 @@
+{% extends "pylucid/css_anchor_div.html" %}
+
+{% block plugin_content %}
+
+{# We can't use extrahead block here, because it's used in ajax view, too. #}
 <script type="text/javascript">
 $(document).ready(function(){
     $("#preview_fieldset").hide();
-    $("#preview").click(function() {   
+    
+    $("#preview").click(function() {
+        $("#edit_page_preview").html("<h2>loading...</h2>");
+        $("#preview_fieldset").slideDown();
+    
         var content = $("#id_content")[0].value;
     
@@ -11 +20 @@
         $.post(url, { 'content': content }, function(form_html){
             $("#edit_page_preview").html(form_html);
-            $("#preview_fieldset").slideDown();
+            
         });
       return false; // The browser submit the form, if true
@@ -43 +52 @@
         {% endif %}
 
-        <a href="{{ url_pagelinklist }}" title="{% trans 'List of all pages for creating links' %}">
-            <button type="button" onclick="OpenInWindow('{{ url_pagelinklist }}'); return false">
+        <a href="{{ pagelinklist_url }}" title="{% trans 'List of all pages for creating links' %}">
+            <button type="button" onclick="OpenInWindow('{{ pagelinklist_url }}'); return false">
              {% trans 'page list' %}
             </button>
         </a>
-        <a href="{{ url_taglist }}" title="{% trans 'List of all available PyLucid template tags' %}">
-            <button type="button" onclick="OpenInWindow('{{ url_taglist }}'); return false">
+        <a href="{{ taglist_url }}" title="{% trans 'List of all available PyLucid template tags' %}">
+            <button type="button" onclick="OpenInWindow('{{ taglist_url }}'); return false">
              {% trans 'tag list' %}
             </button>
@@ -78 +87 @@
 </form>
 </fieldset>
+{% endblock %}

branches/0.9/pylucid_project/pylucid_plugins/page_admin/views.py

@@ -56 +56 @@
         "abort_url": request.path,
         "preview_url": "%s?page_admin=preview" % request.path,
+        
+        "pagelinklist_url": "#TODO", #FIXME ;)
+        "taglist_url": "#TODO", #FIXME ;)
+        
         "edit_page_form": edit_page_form,
         "pagecontent_instance": pagecontent_instance,