Revision 3c6a178b

b/snf-astakos-app/astakos/im/static/im/css/formating.css
109 109
.button:hover { background-color: #3582AC;}
110 110
.button.wide { display: block;}
111 111
span.action-desc { display: block; color: #fff;}
112
.button:visited { color: #fff !important }
113

  
114
/* heading extra */
115
h2 .header-actions { float: right; font-size: 0.8em;}
b/snf-astakos-app/astakos/im/static/im/css/modules.css
509 509
.auth_methods .dialog-wrap						{ display:inline; position:relative; }
510 510
.auth_methods .dialog							{ background:#fff; border:1px dashed #ccc; position:absolute; bottom:30px; left:0; padding:15px; width:220px; display:none;}
511 511
.auth_methods .dialog .submit					{ min-width:30px; padding:5px 22px; } 
512
.right-align									{ text-align:right; }			
512
.right-align									{ text-align:right; }			
513

  
514

  
515
/* login section */
516
.login-section {}
517
.main-login-method { margin-bottom: 20px;}
b/snf-astakos-app/astakos/im/templates/im/auth/local_login_form.html
1 1
<form action="{% url astakos.im.target.local.login %}" method="post"class="login innerlabels">{% csrf_token %}
2
    <h2>LOGIN</h2>
3 2
    {% with login_form as form %}
4 3
        {% include "im/form_render.html" %}
5 4
    {% endwith %}
b/snf-astakos-app/astakos/im/templates/im/auth/local_login_prompt.html
1
<form action="{% url astakos.im.target.local.login %}" method="post" 
1
<form action="{% url astakos.im.target.local.login %}#other-login-methods" method="post" 
2 2
  class="login-form login innerlabels">{% csrf_token %}
3
  <h2 class="form-toggler"><a href="#">LOGIN USING YOUR LOCAL ACCOUNT</a></h2>
4
  <div class="login-form" style="display:none">
3
  <p>if you already have a username and password</p>
4
  <Br />
5
  <div class="login-form" style="display:block">
5 6
    {% with login_form as form %}
6 7
        {% include "im/form_render.html" %}
7 8
    {% endwith %}
......
21 22
      </div>
22 23
    </div>
23 24
  </form>
24
  <script>
25
    $(document).ready(function(){
26
      $("h2.form-toggler a").click(function(e) {
27
        e.preventDefault();
28
        $("div.login-form").slideToggle();
29
      });
30
      if ($('form.login-form .form-row.with-errors, form.login-form .form-error').length > 0) {
31
        $('div.login-form').css({display:'block'});
32
	  };
33
    })
34
  </script>
b/snf-astakos-app/astakos/im/templates/im/auth/local_signup_prompt.html
1
new to okeanos ? 
1
<br />
2
New to okeanos ? 
2 3
<a href="{% url astakos.im.views.signup %}{% ifnotequal code "" %}?code={{ code|urlencode }}{% endifnotequal %}">
3 4
{{ provider.get_create_prompt_display }}
4 5
</a>
b/snf-astakos-app/astakos/im/templates/im/auth/shibboleth_login.html
1
<h2><a href="/im/login/shibboleth">LOGIN OR CREATE ACCOUNT USING SHIBBOLETH</a></h2>
1
<p>
2
If you are a student/researcher/faculty you can login using your university 
3
credentials in the following page 
4
</p>
5
<br />
6
<a class="button" href="/im/login/shibboleth">ACADEMIC LOGIN</a>
b/snf-astakos-app/astakos/im/templates/im/auth/shibboleth_login_prompt.html
1
LOGIN using
1
LOGIN or SIGNUP using
2 2
<a href="/im/login/shibboleth?{% ifnotequal next "" %}&next={{ next|urlencode }}{% endifnotequal %}{% ifnotequal code ""%}{% if next != "" %}&{% else %}?{% endif %}code={{ code }}{% endifnotequal %}"
3 3
  alt="{{ provider.get_title_display }}">{{ provider.get_title_display }}</a>
b/snf-astakos-app/astakos/im/templates/im/login_base.html
9 9
    
10 10
{% block body.right %} 
11 11
    
12
    {% include master_auth_provider.login_template %}
12
    <div class="login-section">
13 13

  
14
    <div class="extralogin">
14
      <h2 class="clearfix"><span class="title">LOGIN</span> <span class="header-actions">
15
          <a class="other-logins" href="#other-login-methods">other login methods</a></span>
16
      </h2>
17
      <div class="main-login-method">
18
        {% include master_auth_provider.login_template %}
19
      </div>
20

  
21
    <div class="extralogin" style="display:none">
15 22
      {% for provider in auth_providers %}
16 23
      {% if not provider == master_auth_provider %}
17 24
        {% include provider.login_prompt_template %}
25
        <br />
18 26
      {% endif %}
19 27
      {% endfor %}
20
    </div><br />
21
    <div class="bottom">
22
      {% block body.signup %}
23
        {% for provider in auth_providers %}
24
          {% include provider.signup_prompt_template %}
25
        {% endfor %}
28
        <div class="bottom">
29
        {% block body.signup %}
30
          {% for provider in auth_providers %}
31
              {% include provider.signup_prompt_template %}
32
          {% endfor %}
33
        {% endblock body.signup %}
34
        </div>
35
    </div>
26 36
    </div>
27
	{% endblock body.signup %}
37
    <script>
38
      $(document).ready(function(){
39
        if (window.location.toString().match(/#other-login-methods/)) {
40
            $(".extralogin").show();
41
        }
42

  
43
        $(".other-logins").click(function(e){
44
            e.preventDefault();
45
            $(".extralogin").slideToggle();
46
            if (window.location.toString().match(/#other-login-methods/)) {
47
              window.location = window.location.hash = "#"
48
            } else {
49
              window.location = window.location.hash = "#other-login-methods"
50
            }
51
        })
52

  
53
        });    
54
    </script>
28 55
 
29 56
{% endblock body.right%}

Also available in: Unified diff