Revision 4bc1e7b0

b/snf-astakos-app/astakos/im/synnefo_settings.py
53 53
    'astakos.im.context_processors.im_modules',
54 54
    'astakos.im.context_processors.next',
55 55
    'astakos.im.context_processors.code',
56
    'astakos.im.context_processors.invitations'
56
    'astakos.im.context_processors.invitations',
57
    'synnefo.lib.context_processors.cloudbar'
57 58
]
58 59

  
59 60
middlware_classes = [
b/snf-astakos-app/astakos/im/templates/im/account_base.html
3 3
{% block page.title %}Profile{% endblock %}
4 4
{% block page.nav.classes %}{% endblock %}
5 5

  
6
{% comment %}{% block page.quicknav.items %}
6
{% block page.quicknav.items %}
7 7
        <li class="{% block signup_class %}{% endblock %}">
8 8
            <a href="{% url astakos.im.views.logout %}">LOGOUT</a>
9 9
        </li>
10
{% endblock %}{% endcomment %}
10
{% endblock %}
11 11

  
12
{% comment %}{% block page.nav.items %}
12
{% block page.nav.items %}
13 13
    <li class="{% if tab == "im/profile" %}active{% endif %}">
14 14
        <a href="{% url astakos.im.views.edit_profile %}">Profile</a>
15 15
    </li>
......
24 24
    <li class="{% if tab == "im/feedback" %}active{% endif %}">
25 25
        <a href="{% url astakos.im.views.send_feedback %}">Send feedback</a>
26 26
    </li>
27
{% endblock %}{% endcomment %}
27
{% endblock %}
28 28
    
29 29
{% block page.body %}
30 30
<div class="maincol {% block innerpage.class %}full{% endblock %}">
b/snf-astakos-app/astakos/im/templates/im/base.html
64 64
          $("label[for=id_recaptcha_challenge_field]").closest('.form-row').hide();
65 65
    })
66 66
  </script>
67
  <script>
68
    var CLOUDBAR_LOCATION = "{{ CLOUDBAR_LOC }}";
69
    var CLOUDBAR_COOKIE_NAME = "{{ CLOUDBAR_COOKIE_NAME }}";
70
    var CLOUDBAR_ACTIVE_SERVICE = '{{ CLOUDBAR_ACTIVE_SERVICE }}';
71
    
72
    var GET_SERVICES_URL = "{{ GET_SERVICES_URL }}";
73
    var GET_MENU_URL = "{{ GET_MENU_URL }}";
74 67

  
75
    $(document).ready(function(){
76
      $.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
77
    })
78
  </script>
68
    {% if CLOUDBAR_ACTIVE %}
69
        {{ CLOUDBAR_CODE }}
70
    {% endif %}
79 71
</head>
80 72

  
81 73
<body>
......
85 77
                <h1>accounts</h1>
86 78
            </div>
87 79
            
88
            <ul class="mainnav inline quicknav">
89
                {% comment %}{% block page.quicknav.items %}
90
                    <li class="{% block signup_class %}{% endblock %}">
91
                        <a href="{% url astakos.im.views.index %}">Login</a>
92
                    </li>
93
                    <li class="{% block signin_class %}{% endblock %}">
94
                        <a href="{% url astakos.im.views.signup %}">Sign up</a>
95
                    </li>
96
                {% endblock %}{% endcomment %}
97
            </ul>
98

  
99
            {% comment %}{% block page.nav %}
80
            {% block page.nav %}
81
            <div class="navigation">
100 82
            <ul class="mainnav inline">
101 83
                {% block page.nav.items %}
102 84
                {% endblock %}
103 85
            </ul>
104
            {% endblock %}{% endcomment %}
86
            <ul class="mainnav inline subnav">
87
                {% block page.subnav %}{%endblock %}
88
            </ul>
89
            </div>
90
            {% endblock %}
105 91
        </div>
92
        {% if messages %}
93
        <ul class="messages">
94
            {% for message in messages %}
95
            <li{% if message.tags %} 
96
                class="{{ message.tags }}"{% endif %}>
97
                {{ message }}</li>
98
            {% endfor %}
99
        </ul>
100
        {% endif %}
106 101
        <div class="page">
107
            {% if messages %}
108
            <ul class="messages">
109
                {% for message in messages %}
110
                <li{% if message.tags %} 
111
                    class="{{ message.tags }}"{% endif %}>
112
                    {{ message }}</li>
113
                {% endfor %}
114
            </ul>
115
            {% endif %}
116 102
            {% block page.body %}
117 103
                <div class="maincol">
118 104
                    {% block body %}
b/snf-astakos-app/astakos/im/templates/im/login.html
13 13
{% endblock body %}
14 14
    
15 15
{% block body.right %}
16
<div class="section">
16 17
     {% if "local" in im_modules %}
17 18
        <form action="{% url astakos.im.target.local.login %}" method="post"
18 19
            class="login innerlabels">{% csrf_token %}
......
26 27
        </form>
27 28
      {% endif %}
28 29

  
29
          <div class="section">
30
          <div class="extralogin">
30 31
              {% for o in im_modules %}
31 32
              <div>
32 33
            {% if o != 'local' %}
......
38 39
            {% endfor %}
39 40
        </div>
40 41
        {% block body.signup %}
41
        <div class="section signup">
42
            <br /><br />
43
                <h2>NEW TO OKEANOS ?</h2>
44
                <a class="button" href="{% url astakos.im.views.signup %}">CREATE ACCOUNT</a>
42
        {% for o in im_modules %}
43
            {% if o != 'local' %}
44
            <br />
45
            {% endif %}
46
        {% endfor %}
47
        <div class="bottom">
48
                new to okeanos ? <a href="{% url astakos.im.views.signup %}">SIGN UP</a>
45 49
            </div>
46 50
        </div>
47 51
        {% endblock %}
48

  
52
    </div>
49 53
{% endblock %}

Also available in: Unified diff