console/SWSCloudCore/templates/default/_header.html
Vyacheslav Anzhiganov d6f4a0e348 Merge commit 'bf9e0731bcd036956918559645d2a8cd4a3a2c94'
# Conflicts:
#	README.md
#	SWSCloudCore/__init__.py
#	SWSCloudCore/static/css/gocloud.css
#	SWSCloudCore/static/css/hp.css
#	SWSCloudCore/static/css/normalize.css
#	SWSCloudCore/static/css/style.css
#	SWSCloudCore/templates/default/_header.html
#	SWSCloudCore/templates/default/containers/index.html
#	SWSCloudCore/templates/default/homepage/index.en.html
#	SWSCloudCore/templates/default/id/_account_information_edit.html
#	SWSCloudCore/templates/default/id/_account_information_view.html
#	SWSCloudCore/templates/default/id/billing.html
#	SWSCloudCore/templates/default/id/edit.html
#	SWSCloudCore/templates/default/tasks/index.html
#	SWSCloudCore/templates/errors/403.html
#	SWSCloudCore/templates/errors/404.html
#	SWSCloudCore/templates/errors/410.html
#	SWSCloudCore/templates/errors/500.html
#	SWSCloudCore/views/account/__init__.py
#	SWSCloudCore/views/api/__init__.py
#	SWSCloudCore/views/containers/__init__.py
#	SWSCloudCore/views/payments/__init__.py
#	app/static/css/app.css
#	app/static/css/gocloud.css
#	app/templates/default/_footer.html
#	app/templates/default/errors/404.html
#	app/templates/default/errors/410.html
#	app/templates/default/errors/500.html
#	app/templates/default/homepage/index.html
#	app/templates/default/id/_account_information_view.html
#	app/templates/default/settings/profile/_account_information_view.html
#	app/templates/default/tasks/index.html
#	app/templates/default/tasks/index.ru.html
#	app/templates/errors/404.html
#	app/templates/errors/410.html
#	app/templates/errors/500.html
#	kb/README.md
2016-04-02 02:20:12 +03:00

39 lines
2 KiB
HTML

<header>
<div class="row">
<div class="large-12 columns">
<div class="contain-to-grid sticky">
<nav class="top-bar" data-topbar role="navigation" data-options="sticky_on: large">
<ul class="title-area">
<li class="name">
<h1><a href="{{ url_for('homepage.index') }}">Puluttar</a></h1>
</li>
</ul>
<section class="top-bar-section">
{% if session['user_id'] %}
<ul class="right">
<li><a href="{{ url_for('settings.index') }}">{{ _("Settings") }}</a></li>
<li><a href="{{ url_for('account.logout') }}">{{ _("Logout") }}</a></li>
</ul>
<ul class="left">
<<<<<<< HEAD:app/templates/default/_header.html
<li><a href="{{ url_for('containers.index') }}">{{ _("Containers") }}</a></li>
<li><a href="{{ url_for('containers.create') }}">{{ _("Create new") }}</a></li>
=======
<li><a href="{{ url_for('containers.index') }}">Контейнеры</a></li>
>>>>>>> bf9e0731bcd036956918559645d2a8cd4a3a2c94:SWSCloudCore/templates/default/_header.html
</ul>
{% else %}
<ul class="right">
<li class="active"><a href="{{ url_for('account.login') }}">{{ _("Login") }}</a></li>
<li><a href="{{ url_for('account.registration') }}">{{ _("Registration") }}</a></li>
</ul>
<ul class="left">
<li><a href="{{ url_for('homepage.index') }}">{{ _("Home") }}</a></li>
</ul>
{% endif %}
</section>
</nav>
</div>
</div>
</div>
</header>