From: Guillaume Pellerin <guillaume.pellerin@ircam.fr>
Date: Mon, 21 Sep 2015 23:10:37 +0000 (+0200)
Subject: mv user panel in header, fix styles and colums
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=7c48430289b1bb9be1945f7b80ba07fb627bb4ee;p=diggersdigest.git

mv user panel in header, fix styles and colums
---

diff --git a/diggersdigest/static/css/dig2.css b/diggersdigest/static/css/dig2.css
index 3585fe6..c59f60e 100644
--- a/diggersdigest/static/css/dig2.css
+++ b/diggersdigest/static/css/dig2.css
@@ -44,3 +44,20 @@ hr {
     display: block;
     font-weight: bold;
 }
+
+.navbar-collapse {
+    margin-top:  50px;
+}
+
+#logo {
+    float: left;
+}
+
+#user_panel_header {
+    float: right;
+    margin-top: -90px;
+}
+
+.audio {
+    margin-top: 2em;
+}
diff --git a/diggersdigest/templates/base.html b/diggersdigest/templates/base.html
index 449b7c0..2e0ecc1 100644
--- a/diggersdigest/templates/base.html
+++ b/diggersdigest/templates/base.html
@@ -66,13 +66,23 @@
         <span class="icon-bar"></span>
         <span class="icon-bar"></span>
       </button>
+      <div id="logo">
       {% if settings.SITE_TITLE %}<a class="navbar-brand" href="/"><img class="pull-left" width="180" src="{% static "img/diggersdigest_400.png" %}"alt={{ settings.SITE_TITLE }}  ></a>{% endif %}
       {% if settings.SITE_TAGLINE %}<p class="navbar-text visible-lg">{{ settings.SITE_TAGLINE }}</p>{% endif %}
+      </div>
     </div>
-    <div class="navbar-collapse collapse">
+    <div>
       {% search_form "all" %}
+    </div>
+    <div class="navbar-collapse collapse">
       {% page_menu "pages/menus/dropdown.html" %}
     </div>
+    <div id="user_panel_header">
+    {% nevercache %}
+    {% include "includes/language_selector.html" %}
+    {% include "includes/user_panel_header.html" %}
+    {% endnevercache %}
+    </div>
     <hr>
 </div>
 
@@ -116,15 +126,12 @@
 </div>
 {% endcomment %}
 
-<div class="col-md-9 middle">
+<div class="col-md-12 middle">
     {% block main %}{% endblock %}
 </div>
 
+{% comment %}
 <div class="col-md-3 right">
-    {% nevercache %}
-    {% include "includes/language_selector.html" %}
-    {% include "includes/user_panel.html" %}
-    {% endnevercache %}
     <div class="panel panel-default">
     <div class="panel-body">
     {% block right_panel %}
@@ -135,6 +142,7 @@
     </div>
     </div>
 </div>
+{% endcomment %}
 
 </div>
 </div>
@@ -143,7 +151,7 @@
 <div>
 <!-- {% page_menu "pages/menus/footer.html" %} -->
 
-<div class="row">
+<div>
 <p class="site-info text-center">
     {% trans "Coded by" %}
     <a href="http://www.parisson.com">Parisson</a>
diff --git a/diggersdigest/templates/includes/user_panel_header.html b/diggersdigest/templates/includes/user_panel_header.html
new file mode 100644
index 0000000..0150d9e
--- /dev/null
+++ b/diggersdigest/templates/includes/user_panel_header.html
@@ -0,0 +1,10 @@
+{% load mezzanine_tags %}
+<div class="">
+{% ifinstalled cartridge.shop %}
+{% include "shop/includes/user_panel_header.html" %}
+{% endifinstalled %}
+{% ifinstalled mezzanine.accounts %}
+{% ifinstalled cartridge.shop %}<br>{% endifinstalled %}
+{% include "accounts/includes/user_panel.html" %}
+{% endifinstalled %}
+</div>
diff --git a/diggersdigest/templates/index.html b/diggersdigest/templates/index.html
index 6ef2789..56360cf 100644
--- a/diggersdigest/templates/index.html
+++ b/diggersdigest/templates/index.html
@@ -22,7 +22,7 @@
     <div class="col-xs-12 col-md-12 product-thumb ">
     <a href="{{ product.get_absolute_url }}" class="thumbnail">
         {% if product.image %}
-          <img src="{{ MEDIA_URL }}{% thumbnail product.image 256 256 %}">
+          <img src="{{ MEDIA_URL }}{% thumbnail product.image 512 512 %}">
         {% else %}
           <div class="placeholder"></div>
         {% endif %}
diff --git a/diggersdigest/templates/shop/includes/user_panel_header.html b/diggersdigest/templates/shop/includes/user_panel_header.html
new file mode 100644
index 0000000..db8f64c
--- /dev/null
+++ b/diggersdigest/templates/shop/includes/user_panel_header.html
@@ -0,0 +1,18 @@
+{% load i18n shop_tags mezzanine_tags %}
+{% spaceless %}
+<a href="{% url "shop_cart" %}">
+<span class="glyphicon glyphicon-shopping-cart"></span>
+{% blocktrans count request.cart.total_quantity as cart_quantity %}1 item{% plural %}{{ cart_quantity }} items{% endblocktrans %}
+{% trans "in cart" %}:
+{{ request.cart.total_price|currency }}</a><br>
+{% if request.cart.total_quantity != 0 %}
+<a href="{% url "shop_checkout" %}" class="btn btn-primary">
+    {% if request.session.order.step %}{% trans "Return to Checkout" %}{% else %}{% trans "Go to Checkout" %}{% endif %}
+</a><br>
+{% endif %}
+{% if settings.SHOP_USE_WISHLIST %}
+<a href="{% url "shop_wishlist" %}" class="btn-wishlist">
+<span class="glyphicon glyphicon-star"></span>
+{% blocktrans count request.wishlist|length as wishlist_count %}Wishlist contains 1 item{% plural %} Wishlist contains {{ wishlist_count }} items{% endblocktrans %}</a>
+{% endif %}
+{% endspaceless %}
diff --git a/diggersdigest/templates/shop/product.html b/diggersdigest/templates/shop/product.html
index 3bb21b0..6e53529 100644
--- a/diggersdigest/templates/shop/product.html
+++ b/diggersdigest/templates/shop/product.html
@@ -54,7 +54,9 @@ $(function () {
 {% endblock %}
 
 {% block title %}
+<span class="bg-white">
 {% editable product.title %}{{ product.title }}{% endeditable %}
+</span>
 {% endblock %}
 
 {% block main %}
@@ -131,10 +133,12 @@ $(function () {
   <li>{% include "shop/includes/price.html" %}</li>
 </ul>
 
+<div class="audio">
 {% if product.record.audio_file %}
 <audio controls>
     <source src="{{ MEDIA_URL }}{{ product.record.audio_file }}">
 </audio>
+</div>
 {% endif %}
 
 </div>