Skip to content

GitLab

Commit 4bc1e7b0 authored by Kostas Papadimitriou's avatar Kostas Papadimitriou
Browse files

Display menu and use cloudbar processor for cloudbar

parent 02717631
Hide whitespace changes
Inline Side-by-side
snf-astakos-app/astakos/im/synnefo_settings.py
View file @ 4bc1e7b0
......@@ -53,7 +53,8 @@ context_processors = [
'astakos.im.context_processors.im_modules',
'astakos.im.context_processors.next',
'astakos.im.context_processors.code',
'astakos.im.context_processors.invitations'
'astakos.im.context_processors.invitations',
'synnefo.lib.context_processors.cloudbar'
]
middlware_classes = [
......
snf-astakos-app/astakos/im/templates/im/account_base.html
View file @ 4bc1e7b0
......@@ -3,13 +3,13 @@
{% block page.title %}Profile{% endblock %}
{% block page.nav.classes %}{% endblock %}
{% comment %}{% block page.quicknav.items %}
{% block page.quicknav.items %}
<li class="{% block signup_class %}{% endblock %}">
<a href="{% url astakos.im.views.logout %}">LOGOUT</a>
</li>
{% endblock %}{% endcomment %}
{% endblock %}
{% comment %}{% block page.nav.items %}
{% block page.nav.items %}
<li class="{% if tab == "im/profile" %}active{% endif %}">
<a href="{% url astakos.im.views.edit_profile %}">Profile</a>
</li>
......@@ -24,7 +24,7 @@
<li class="{% if tab == "im/feedback" %}active{% endif %}">
<a href="{% url astakos.im.views.send_feedback %}">Send feedback</a>
</li>
{% endblock %}{% endcomment %}
{% endblock %}
{% block page.body %}
<div class="maincol {% block innerpage.class %}full{% endblock %}">
......
snf-astakos-app/astakos/im/templates/im/base.html
View file @ 4bc1e7b0
......@@ -64,18 +64,10 @@
$("label[for=id_recaptcha_challenge_field]").closest('.form-row').hide();
})
</script>
<script>
var CLOUDBAR_LOCATION = "{{ CLOUDBAR_LOC }}";
var CLOUDBAR_COOKIE_NAME = "{{ CLOUDBAR_COOKIE_NAME }}";
var CLOUDBAR_ACTIVE_SERVICE = '{{ CLOUDBAR_ACTIVE_SERVICE }}';
var GET_SERVICES_URL = "{{ GET_SERVICES_URL }}";
var GET_MENU_URL = "{{ GET_MENU_URL }}";
$(document).ready(function(){
$.getScript(CLOUDBAR_LOCATION + 'cloudbar.js');
})
</script>
{% if CLOUDBAR_ACTIVE %}
{{ CLOUDBAR_CODE }}
{% endif %}
</head>
<body>
......@@ -85,34 +77,28 @@
<h1>accounts</h1>
</div>
<ul class="mainnav inline quicknav">
{% comment %}{% block page.quicknav.items %}
<li class="{% block signup_class %}{% endblock %}">
<a href="{% url astakos.im.views.index %}">Login</a>
</li>
<li class="{% block signin_class %}{% endblock %}">
<a href="{% url astakos.im.views.signup %}">Sign up</a>
</li>
{% endblock %}{% endcomment %}
</ul>
{% comment %}{% block page.nav %}
{% block page.nav %}
<div class="navigation">
<ul class="mainnav inline">
{% block page.nav.items %}
{% endblock %}
</ul>
{% endblock %}{% endcomment %}
<ul class="mainnav inline subnav">
{% block page.subnav %}{%endblock %}
</ul>
</div>
{% endblock %}
</div>
{% if messages %}
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %}
class="{{ message.tags }}"{% endif %}>
{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
<div class="page">
{% if messages %}
<ul class="messages">
{% for message in messages %}
<li{% if message.tags %}
class="{{ message.tags }}"{% endif %}>
{{ message }}</li>
{% endfor %}
</ul>
{% endif %}
{% block page.body %}
<div class="maincol">
{% block body %}
......
snf-astakos-app/astakos/im/templates/im/login.html
View file @ 4bc1e7b0
......@@ -13,6 +13,7 @@ Login
{% endblock body %}
{% block body.right %}
<div class="section">
{% if "local" in im_modules %}
<form action="{% url astakos.im.target.local.login %}" method="post"
class="login innerlabels">{% csrf_token %}
......@@ -26,7 +27,7 @@ Login
</form>
{% endif %}
<div class="section">
<div class="extralogin">
{% for o in im_modules %}
<div>
{% if o != 'local' %}
......@@ -38,12 +39,15 @@ Login
{% endfor %}
</div>
{% block body.signup %}
<div class="section signup">
<br /><br />
<h2>NEW TO OKEANOS ?</h2>
<a class="button" href="{% url astakos.im.views.signup %}">CREATE ACCOUNT</a>
{% for o in im_modules %}
{% if o != 'local' %}
<br />
{% endif %}
{% endfor %}
<div class="bottom">
new to okeanos ? <a href="{% url astakos.im.views.signup %}">SIGN UP</a>
</div>
</div>
{% endblock %}
</div>
{% endblock %}
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment