large navs

This commit is contained in:
Kayn Ty 2018-04-25 12:00:01 +02:00
parent 4caf290064
commit dfb4fbd340
5 changed files with 122 additions and 137 deletions

View File

@ -10,21 +10,14 @@
{% endblock %} {% endblock %}
</head> </head>
<body> <body>
{% if app.user is not defined %}
<div class="bg-img"></div>
{% else %}
<div class="bg-img-logged-in"></div>
{% endif %}
{% block navigation %} {% block navigation %}
{% endblock %} {% endblock %}
<div id="bodyland"> <div id="bodyland">
<div class="container"> {% include 'default/header.html.twig' %}
{% include 'default/header.html.twig' %} {% block body %}
{% block body %} {% endblock %}
{% endblock %} {% include 'default/footer.html.twig' %}
{% include 'default/footer.html.twig' %}
</div>
</div> </div>
{% block javascripts %} {% block javascripts %}
<script src="{{ asset('build/app.js') }}"></script> <script src="{{ asset('build/app.js') }}"></script>

View File

@ -1,13 +1,14 @@
<footer class="big-footer text-center container"> <footer class="big-footer text-center navbar-inverse navbar-footer ">
<sub class="footer-note text-center"> développé par Tykayn / <div class="container">
<a href="http://www.cipherbliss.com"> <sub class="footer-note text-center"> développé par Tykayn /
Cipher Bliss <a href="http://www.cipherbliss.com">
</a> Cipher Bliss
| </a>
<a href="mailto:contact@cipherbliss.com"> |
<i class="fa fa-mail"></i> <a href="mailto:contact@cipherbliss.com">
contact <i class="fa fa-mail"></i>
</a> contact
</sub> </a>
</sub>
</div>
</footer> </footer>

View File

@ -1,27 +1,31 @@
<div class="header-block container"> <div class="header-block ">
<div class="row"> <div class="nav navbar-inverse padded">
<div class="col-xs-12"> <div class="container">
{% include 'default/login-choices.html.twig' %} <div class="row">
</div> <div class="col-xs-12">
</div> {% include 'default/login-choices.html.twig' %}
<div class="row-fluid"> </div>
<div class="col-xs-12">
{% if app.request.hasPreviousSession %}
{% for type, messages in app.session.flashBag.all %}
{% for message in messages %}
<div class="{{ type }}">
{{ message|trans({}, 'FOSUserBundle') }}
</div>
{% endfor %}
{% endfor %}
{% endif %}
<div>
{% block fos_user_content %}
{% endblock fos_user_content %}
</div> </div>
<div class="row-fluid">
<div class="col-xs-12">
{% if app.request.hasPreviousSession %}
{% for type, messages in app.session.flashBag.all %}
{% for message in messages %}
<div class="{{ type }}">
{{ message|trans({}, 'FOSUserBundle') }}
</div>
{% endfor %}
{% endfor %}
{% endif %}
<div>
{% block fos_user_content %}
{% endblock fos_user_content %}
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

View File

@ -1,126 +1,125 @@
{% trans_default_domain 'FOSUserBundle' %} {% trans_default_domain 'FOSUserBundle' %}
{% block loginchoices %} {% block loginchoices %}
<div class="loginland "> <div class="loginland ">
<div class="bg-img padded">
<div class="login-choices"> <div class="login-choices">
{% if is_granted("IS_AUTHENTICATED_REMEMBERED") %} {% if is_granted("IS_AUTHENTICATED_REMEMBERED") %}
<div class="row"> <div class="row">
<div class="col-xs-10"> <div class="col-xs-10">
<div id="menu-dashboard"> <div id="menu-dashboard">
<ul class="nav nav-pills"> <ul class="nav nav-pills">
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'homepage' %} <a class="btn {% if app.request.attributes.get('_route') == 'homepage' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('homepage') }}" title="accueil Caisse"> {% endif %}" href="{{ path('homepage') }}" title="accueil Caisse">
<i class="fa fa-circle-o-notch "></i> <i class="fa fa-circle-o-notch "></i>
</a> </a>
<li> <li>
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'dashboard' %} <a class="btn {% if app.request.attributes.get('_route') == 'dashboard' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('dashboard') }}"> {% endif %}" href="{{ path('dashboard') }}">
<i class="fa fa-list"></i> <i class="fa fa-list"></i>
Dashboard Dashboard
</a> </a>
</li> </li>
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'productcategory_index' %} <a class="btn {% if app.request.attributes.get('_route') == 'productcategory_index' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('productcategory_index') }}"> {% endif %}" href="{{ path('productcategory_index') }}">
<i class="fa fa-file-archive-o"></i> <i class="fa fa-file-archive-o"></i>
Catégories Catégories
<span class="badge"> <span class="badge">
{{ app.user.categories|length }} {{ app.user.categories|length }}
</span> </span>
</a> </a>
</li> </li>
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'product_index' %} <a class="btn {% if app.request.attributes.get('_route') == 'product_index' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('product_index') }}" data-toggle="tab"> {% endif %}" href="{{ path('product_index') }}" data-toggle="tab">
<i class="fa fa-gears"></i> <i class="fa fa-gears"></i>
Produits Produits
<span class="badge"> <span class="badge">
{{ app.user.products|length }} {{ app.user.products|length }}
</span> </span>
</a> </a>
</li> </li>
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'festival_index' %} <a class="btn {% if app.request.attributes.get('_route') == 'festival_index' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('festival_index') }}" {% endif %}" href="{{ path('festival_index') }}"
data-toggle="tab"> data-toggle="tab">
<i class="fa fa-th-large"></i> <i class="fa fa-th-large"></i>
Festivals Festivals
<span class="badge"> <span class="badge">
{{ app.user.festivals|length }} {{ app.user.festivals|length }}
</span> </span>
</a> </a>
</li> </li>
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'history' %} <a class="btn {% if app.request.attributes.get('_route') == 'history' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('history') }}" {% endif %}" href="{{ path('history') }}"
data-toggle="tab"> data-toggle="tab">
<i class="fa fa-clock-o"></i> <i class="fa fa-clock-o"></i>
Historique Historique
</a> </a>
</li> </li>
<li> <li>
<a class="btn {% if app.request.attributes.get('_route') == 'import' %} <a class="btn {% if app.request.attributes.get('_route') == 'import' %}
btn-success btn-success
{% else %} {% else %}
btn-default btn-default
{% endif %}" href="{{ path('import') }}" {% endif %}" href="{{ path('import') }}"
data-toggle="tab"> data-toggle="tab">
<i class="fa fa-arrow-circle-o-up"></i> <i class="fa fa-arrow-circle-o-up"></i>
Import Import
</a> </a>
</li> </li>
</ul> </ul>
</div>
</div>
<div class="col-xs-2 text-right">
Bonjour
<a href="{{ path('fos_user_profile_edit') }}">
<i class="fa fa-user"></i>
{{ app.user.username }}
</a>
|
<a class="btn btn-default" href="{{ path('fos_user_security_logout') }}">
{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}
</a>
</div> </div>
</div> </div>
<div class="col-xs-2 text-right">
Bonjour
<a href="{{ path('fos_user_profile_edit') }}">
<i class="fa fa-user"></i>
{{ app.user.username }}
</a>
|
<a class="btn btn-default" href="{{ path('fos_user_security_logout') }}">
{{ 'layout.logout'|trans({}, 'FOSUserBundle') }}
</a>
</div>
</div>
{% else %} {% else %}
<h1 class="text-right"> <h1 class="text-right">
<a class="btn btn-primary" <a class="btn btn-primary"
href="{{ path('fos_user_security_login') }}"> href="{{ path('fos_user_security_login') }}">
<i class="fa fa-key"></i> <i class="fa fa-key"></i>
{{ 'layout.login'|trans }}</a> {{ 'layout.login'|trans }}</a>
<a class="btn btn-default" <a class="btn btn-default"
href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans }}</a> href="{{ path('fos_user_registration_register') }}">{{ 'layout.register'|trans }}</a>
</h1> </h1>
{% endif %} {% endif %}
</div>
</div> </div>
</div> </div>

View File

@ -1,16 +1,4 @@
<div class="selling-history"> <div class="selling-history">
{#<h4>#}
{#Ventes récentes#}
{#</h4>#}
{#{% if recentSells %}#}
{#<ul>#}
{#{% for s in recentSells %}#}
{#<li>{{ s.date|date('Y/m/d H:i:s') }} {{ s.sellingComment }} | {{ s.amount }}€</li>#}
{#{% endfor %}#}
{#</ul>#}
{#{% else %}#}
{#aucune#}
{#{% endif %}#}
{% verbatim %} {% verbatim %}
<div ng-repeat="s in recentSelling track by $index"> <div ng-repeat="s in recentSelling track by $index">
{{s.id}} ) {{s.id}} )