/lenasys/trunk

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/lenasys/trunk

« back to all changes in this revision

Viewing changes to codeigniter/js/bannermenu.js

  • Committer: Gustav Hatvigsson
  • Date: 2013-05-28 11:46:41 UTC
  • mfrom: (83.2.19 pvp)
  • Revision ID: gustav.hartvigsson@gmail.com-20130528114641-jc7sbw7ffajiwnix
Merged Bigestans:s changes:
* Merged trunk AND
* Modified js/login.js and js/bannermenu.js, specifically functions related to the login popup!
Continuing work on viewstudents

Show diffs side-by-side

added added

removed removed

Lines of Context:
codeigniter/js/bannermenu.js
30
30
                        else {
31
31
                                // If the user is not logged in and the popup-div is hidden it's filled and shown.
32
32
                                if($('#popup').is(':hidden')) {
33
 
                                        $('#popup').load('ajax/popup/loginForm #loginForm', function(){
 
33
                                        $('#popup').load('ajax/popup/login', function(){
34
34
                                                $('#popup').show();
 
35
                                                $("#popup .hint").click(loginHint);
35
36
                                        });
36
37
                                }
37
38
                                // If the user is not logged in and the popup-div shows it's hidden.