From c9dd5842b34ae76b87f730a726e0e64beb70a7d0 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 20:11:37 +0200 Subject: [PATCH 01/17] Removed some old CSS code Wishlist badge now always shown if selected --- .../themes/bootflat/static/less/fixes.less | 18 +++++------------- .../manga/series/includes/volume.html | 6 +++--- 2 files changed, 8 insertions(+), 16 deletions(-) diff --git a/shelfzilla/themes/bootflat/static/less/fixes.less b/shelfzilla/themes/bootflat/static/less/fixes.less index ea3804a..eaec268 100644 --- a/shelfzilla/themes/bootflat/static/less/fixes.less +++ b/shelfzilla/themes/bootflat/static/less/fixes.less @@ -16,14 +16,14 @@ .volume-item { &:not(.user-have-it) { - .badges { display: none; } - - &:hover .badges { + &:hover .badges .badge { display: block; } } - & + &.user-wishlisted-it .badge-wishlist-it { + display: block !important; + } .badges { position: absolute; @@ -35,7 +35,7 @@ border: #FFF 3px solid; border-radius: 50%; - display: block; + display: none; font-size: @size/1.5; height: @size; line-height: (@size)-3px; @@ -43,14 +43,6 @@ text-align: center; width: @size; } - - .badge-haveit, .badge-wishlist { - &:hover { - & > span { - display: block; - } - } - } } } diff --git a/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html b/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html index 519a0be..afeffb7 100644 --- a/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html +++ b/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html @@ -1,5 +1,5 @@ {% load i18n thumbnail %} -
+
{% if volume.pk in user_have_volumes %} @@ -9,12 +9,12 @@ {% else %} - + - + From c356129982da0667ad24800002e467cfb1fa5a67 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 20:36:21 +0200 Subject: [PATCH 02/17] Added basic search for series. Tap #19 --- shelfzilla/apps/manga/urls/search.py | 8 +++++ shelfzilla/apps/manga/views/search.py | 36 +++++++++++++++++++ .../themes/bootflat/templates/_layout.html | 13 ++++--- .../bootflat/templates/manga/search.html | 25 +++++++++++++ shelfzilla/urls.py | 1 + 5 files changed, 76 insertions(+), 7 deletions(-) create mode 100644 shelfzilla/apps/manga/urls/search.py create mode 100644 shelfzilla/apps/manga/views/search.py create mode 100644 shelfzilla/themes/bootflat/templates/manga/search.html diff --git a/shelfzilla/apps/manga/urls/search.py b/shelfzilla/apps/manga/urls/search.py new file mode 100644 index 0000000..6cd8dca --- /dev/null +++ b/shelfzilla/apps/manga/urls/search.py @@ -0,0 +1,8 @@ +from django.conf.urls import patterns, url + +from ..views.search import SearchView + +urlpatterns = patterns( + '', + url(r'^$', SearchView.as_view(), name='search'), +) diff --git a/shelfzilla/apps/manga/views/search.py b/shelfzilla/apps/manga/views/search.py new file mode 100644 index 0000000..27a30f5 --- /dev/null +++ b/shelfzilla/apps/manga/views/search.py @@ -0,0 +1,36 @@ +from django.template import RequestContext +from django import forms +from django.utils.translation import ugettext as _ +from django.shortcuts import render_to_response, get_object_or_404 + +from shelfzilla.views import View +from ..models import Series + + +class SearchForm(forms.Form): + q = forms.CharField(max_length=64, label=_('Search'), + widget=forms.TextInput( + attrs={'placeholder': _('Search')}) + ) + + +class SearchView(View): + template = 'manga/search.html' + section = 'search' + + def post(self, request): + search_query = '' + items = [] + form = SearchForm(request.POST) + + if form.is_valid(): + search_query = form.cleaned_data['q'] + + items = Series.objects.filter(name__icontains=search_query) + + context = { + 'items': items, + 'search_query': search_query + } + ctx = RequestContext(request, self.get_context(context)) + return render_to_response(self.template, context_instance=ctx) diff --git a/shelfzilla/themes/bootflat/templates/_layout.html b/shelfzilla/themes/bootflat/templates/_layout.html index c7b08ac..4d9928e 100644 --- a/shelfzilla/themes/bootflat/templates/_layout.html +++ b/shelfzilla/themes/bootflat/templates/_layout.html @@ -1,11 +1,11 @@ -{% load i18n solo_tags %} +{% load i18n solo_tags staticfiles %} {% get_solo 'config.SiteConfiguration' as site_config %} {% get_solo 'config.SocialConfiguration' as social_config %} - + {% block extra_css %}{% endblock %} {% block page_title %}ShelfZilla{% endblock %} @@ -60,14 +60,13 @@ {% endif %} -
@@ -82,7 +81,7 @@ {% block footer %}{% endblock %} - + {% block extra_js %}{% endblock %} {% if social_config.google_analytics %} diff --git a/shelfzilla/themes/bootflat/templates/manga/search.html b/shelfzilla/themes/bootflat/templates/manga/search.html new file mode 100644 index 0000000..fcef003 --- /dev/null +++ b/shelfzilla/themes/bootflat/templates/manga/search.html @@ -0,0 +1,25 @@ +{% extends '_layout.html'|pjax:request %} +{% load i18n %} + +{% block main_content %} +
+
+
+

{% trans "Looking for..." %} "{{ search_query }}"

+
+
    + {% for item in items %} +
  • + {% if item.slug %} + {{ item.name }} + {% else %} + {{ item.name }} + {% endif %} +
    • + {% empty %} +
  • {% trans "No results" %}
    • + {% endfor %} +
+
+
+{% endblock %} diff --git a/shelfzilla/urls.py b/shelfzilla/urls.py index 9044a7e..0c0e981 100644 --- a/shelfzilla/urls.py +++ b/shelfzilla/urls.py @@ -15,6 +15,7 @@ urlpatterns = patterns( url(r'^series/', include('shelfzilla.apps.manga.urls.series')), url(r'^volumes/', include('shelfzilla.apps.manga.urls.volumes')), url(r'^publishers/', include('shelfzilla.apps.manga.urls.publishers')), + url(r'^search/', include('shelfzilla.apps.manga.urls.search')), url(r'^$', include('shelfzilla.apps.homepage.urls')), url(r'^_admin/', include('shelfzilla.apps._admin.urls')), url(r'^admin/', include(admin.site.urls)), From f3c79fb1e9ed0f4266b96306207dfcf70f71c7c1 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 20:36:37 +0200 Subject: [PATCH 03/17] Force local settings media and static url --- shelfzilla/settings/local.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shelfzilla/settings/local.py b/shelfzilla/settings/local.py index a8c32d3..3c67b17 100644 --- a/shelfzilla/settings/local.py +++ b/shelfzilla/settings/local.py @@ -22,3 +22,7 @@ INSTALLED_APPS += ( ) FILER_DUMP_PAYLOAD = True + + +MEDIA_URL = '/media/' +STATIC_URL = '/static/' From eb9e0abcf8994bce8f2553affbe55b4cc7f9363a Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 21:03:19 +0200 Subject: [PATCH 04/17] Own profile now shows wishlisted and owned volumes. WIP. --- .../bootflat/templates/users/profile.html | 3 ++ .../templates/users/profile/collection.html | 31 +++++-------------- .../templates/users/profile/summary.html | 28 ++++++++++++++++- .../templates/users/profile/wishlist.html | 12 +++++-- 4 files changed, 48 insertions(+), 26 deletions(-) diff --git a/shelfzilla/themes/bootflat/templates/users/profile.html b/shelfzilla/themes/bootflat/templates/users/profile.html index 3a4630e..dee2dd5 100644 --- a/shelfzilla/themes/bootflat/templates/users/profile.html +++ b/shelfzilla/themes/bootflat/templates/users/profile.html @@ -35,6 +35,9 @@ {% endcomment %}
+
+ +
{% block profile_content %} diff --git a/shelfzilla/themes/bootflat/templates/users/profile/collection.html b/shelfzilla/themes/bootflat/templates/users/profile/collection.html index 085f328..7c3a8d3 100644 --- a/shelfzilla/themes/bootflat/templates/users/profile/collection.html +++ b/shelfzilla/themes/bootflat/templates/users/profile/collection.html @@ -4,30 +4,15 @@ {% block page_title %}{{ block.super }} | {% trans "Collection" %}{% endblock %} {% block profile_content %} -
-
-
-

{{ user.have_volumes.count }}

- {% trans "Volumes owned" %} -
+
+ {% for owned_volume in user.have_volumes.all %} +
+ {% include "manga/series/includes/volume.html" with volume=owned_volume.volume user=user %}
-
-
-

{{ user.wishlisted_volumes.count }}

- {% trans "Volumes wishlisted" %} -
-
-
-
-

--

- Other -
-
-
-
-

--

- Other -
+ {% if forloop.counter|divisibleby:4 %}
+
+ {% endif %} + {% endfor %}
{% endblock %} diff --git a/shelfzilla/themes/bootflat/templates/users/profile/summary.html b/shelfzilla/themes/bootflat/templates/users/profile/summary.html index 779cf87..55a5d5e 100644 --- a/shelfzilla/themes/bootflat/templates/users/profile/summary.html +++ b/shelfzilla/themes/bootflat/templates/users/profile/summary.html @@ -1,11 +1,37 @@ +{% load i18n %} {% comment %} {% extends 'users/profile.html'|pjax:request %} -{% load i18n %} {% block page_title %}{{ block.super }}{% endblock %} {% endcomment %} {% block profile_content %} +
+
+
+

{{ user.have_volumes.count }}

+ {% trans "Volumes owned" %} +
+
+
+
+

{{ user.wishlisted_volumes.count }}

+ {% trans "Volumes wishlisted" %} +
+
+
+
+

--

+ Other +
+
+
+
+

--

+ Other +
+
+

Interesting. No, wait, the other thing: tedious. What are you hacking off? Is it my torso?! 'It is!' My precious torso! Yes, if you make it look like an electrical fire. When you do things right, people won't be sure you've done anything at all. Take me to your leader! Ven ve voke up, ve had zese wodies.

diff --git a/shelfzilla/themes/bootflat/templates/users/profile/wishlist.html b/shelfzilla/themes/bootflat/templates/users/profile/wishlist.html index 75e35ea..9ef2b9a 100644 --- a/shelfzilla/themes/bootflat/templates/users/profile/wishlist.html +++ b/shelfzilla/themes/bootflat/templates/users/profile/wishlist.html @@ -4,7 +4,15 @@ {% block page_title %}{{ block.super }} | {% trans "Wishlist" %}{% endblock %} {% block profile_content %} -
- Wishlist +
+ {% for wishlisted_volume in user.wishlisted_volumes.all %} +
+ {% include "manga/series/includes/volume.html" with volume=wishlisted_volume.volume user=user %} +
+ {% if forloop.counter|divisibleby:4 %} +
+
+ {% endif %} + {% endfor %}
{% endblock %} From 58a21c01e967a75d20044ce87f340e53308c5c66 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 21:04:43 +0200 Subject: [PATCH 05/17] Hide unused links on profile dropdown --- shelfzilla/themes/bootflat/templates/_layout.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shelfzilla/themes/bootflat/templates/_layout.html b/shelfzilla/themes/bootflat/templates/_layout.html index 4d9928e..15440f5 100644 --- a/shelfzilla/themes/bootflat/templates/_layout.html +++ b/shelfzilla/themes/bootflat/templates/_layout.html @@ -45,9 +45,11 @@
  • Admin
    • {% endif %}
  • {% trans "Profile" %}
    • +
  • {% trans "Logout" %}
    • From 0600a6a9862e20308fc7e159652648c4c95bf4a1 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 21:06:01 +0200 Subject: [PATCH 06/17] Fixed user drop down menu not hiding on click --- shelfzilla/themes/bootflat/static/coffee/main.coffee | 4 ---- 1 file changed, 4 deletions(-) diff --git a/shelfzilla/themes/bootflat/static/coffee/main.coffee b/shelfzilla/themes/bootflat/static/coffee/main.coffee index e5da794..7bf2447 100644 --- a/shelfzilla/themes/bootflat/static/coffee/main.coffee +++ b/shelfzilla/themes/bootflat/static/coffee/main.coffee @@ -41,8 +41,6 @@ $ -> # PJAX if $.support.pjax $(document).on 'click', 'a[data-pjax]', (event) -> - event.preventDefault() - elem = $(@) pjax = elem.data('pjax') push = true @@ -74,8 +72,6 @@ $ -> if elem.is('[pjax-messages]') window._updateMessages = true - false - # Tooltips $('[data-toggle="tooltip"]').tooltip(); From bc22ea8bfe2cb20f22967bfb6d5eddc5428703fc Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 21:25:10 +0200 Subject: [PATCH 07/17] Fixed wishlist-it/have-it buttons from c9dd5842b34ae76b87f730a726e0e64beb70a7d0 --- shelfzilla/themes/bootflat/static/less/fixes.less | 4 ++++ .../bootflat/templates/manga/series/includes/volume.html | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/shelfzilla/themes/bootflat/static/less/fixes.less b/shelfzilla/themes/bootflat/static/less/fixes.less index eaec268..ebf2783 100644 --- a/shelfzilla/themes/bootflat/static/less/fixes.less +++ b/shelfzilla/themes/bootflat/static/less/fixes.less @@ -25,6 +25,10 @@ display: block !important; } + &.user-have-it .badge-have-it { + display: block !important; + } + .badges { position: absolute; right: 10px; diff --git a/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html b/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html index afeffb7..16d93e5 100644 --- a/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html +++ b/shelfzilla/themes/bootflat/templates/manga/series/includes/volume.html @@ -3,7 +3,7 @@
    {% if volume.pk in user_have_volumes %} - + From 5ca84da14885e6d734bc3ed509c71a0b9c3818ce Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 21:26:53 +0200 Subject: [PATCH 08/17] UserWishlistVolume/UserHaveVolume ordering is now series name, volume number ASC --- shelfzilla/apps/manga/models.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/shelfzilla/apps/manga/models.py b/shelfzilla/apps/manga/models.py index 68eb262..bdc30eb 100644 --- a/shelfzilla/apps/manga/models.py +++ b/shelfzilla/apps/manga/models.py @@ -163,6 +163,9 @@ class UserHaveVolume(models.Model): self.volume ) + class Meta: + ordering = ('volume__series__name', 'volume__number', ) + class UserWishlistVolume(models.Model): user = models.ForeignKey(settings.AUTH_USER_MODEL, @@ -176,6 +179,9 @@ class UserWishlistVolume(models.Model): self.volume ) + class Meta: + ordering = ('volume__series__name', 'volume__number', ) + # # SIGNALS # From 622b69c05af10fb83bab6146acbf65ee8abd8488 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 21:28:07 +0200 Subject: [PATCH 09/17] Hide letters selector under publishers list --- shelfzilla/themes/bootflat/templates/manga/publishers/list.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shelfzilla/themes/bootflat/templates/manga/publishers/list.html b/shelfzilla/themes/bootflat/templates/manga/publishers/list.html index 80a8b5e..a59be48 100644 --- a/shelfzilla/themes/bootflat/templates/manga/publishers/list.html +++ b/shelfzilla/themes/bootflat/templates/manga/publishers/list.html @@ -6,6 +6,7 @@ {% block main_content %} {% regroup items by first_letter as letter_list %}
    +
    {% for letter in letter_list %}
    From 8b320994d16c6d799ad566ac6c793dd22ac3c7b4 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 22:19:20 +0200 Subject: [PATCH 10/17] Profile page don't showing "collection" or "wish list" links if user don't own or have wish listed any volumes. --- shelfzilla/themes/bootflat/templates/users/profile.html | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/shelfzilla/themes/bootflat/templates/users/profile.html b/shelfzilla/themes/bootflat/templates/users/profile.html index dee2dd5..cc2cff4 100644 --- a/shelfzilla/themes/bootflat/templates/users/profile.html +++ b/shelfzilla/themes/bootflat/templates/users/profile.html @@ -25,10 +25,14 @@
    {% trans "Summary" %} + {% if user.have_volumes.count > 0 %} {% trans "Collection" %} + {% endif %} + {% if user.wishlisted_volumes.count > 0 %} {% trans "Wishlist" %} + {% endif %} {% comment %} {% trans "Achievements" %} From d8cd553150f9a7ed36c3a591a0516242a444f20f Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 22:22:29 +0200 Subject: [PATCH 11/17] Updated es_ES translation --- shelfzilla/locale/es/LC_MESSAGES/django.mo | Bin 3461 -> 3773 bytes shelfzilla/locale/es/LC_MESSAGES/django.po | 135 +++++++++++++-------- 2 files changed, 85 insertions(+), 50 deletions(-) diff --git a/shelfzilla/locale/es/LC_MESSAGES/django.mo b/shelfzilla/locale/es/LC_MESSAGES/django.mo index 39c02a6a5a02b02d6f11217208098d6d7a05f117..f0ffbcf2c4cb3445bbf8ffe06c057405134dcc96 100644 GIT binary patch delta 1489 zcmY+?OK4PA9LMo9@g|c@CX*PG`i?hNLk$?|h)p75z|z`|+7?@?M2cK86MN0f+~H0% z)lvr)yDL5}61u1q+CrDbq}o=4pl(`mrEVgKl7(5d4GIPq!S62|5r;G9b6)qH|9PBR zKC!a$pxHTZ_+|L7;GeHj&6umsD;p_JP*37*ti?%OfKyn5kFg&A#TI;y32dx3hN4-9 znr9X2`wd8c#q>~!)9@~8q8)a?Zri@kI)IDmAHt=05;gt@+y1llDw51yGWAbl3Ljwu z{*MZD4jtAv2}aFFiuzy~nIdk-X6!)5nqE}oeMmANkSXwwt$VPJ`hL`WKI+7VQ9D0w z>t~TR@7Ic~)z*pIq` zGMH)XCgKoyb$vD{5lfo3I5nE@Rz|F7X*i3zip$uIf1_ScjPPX~6>tM;;TF_oZ?yGKaSinlHQ#6|$~f)u>|w7s zkjqBC)6?=^)*m*?+`;8Ta!bf2fcvyTM2?mo+bIBYyeIyk8z>f$5s9QD=NAv1xs}+fAo8r{9hi*S5W? zrpNkfSI6RnbJWWQ(f+#ay$Zz(=Ogk$x8S>_Tu4mjeZT1CeGN08c%kQpxx;?hzcE%c zF9W?+cd>rkq4I!N%m#|Gl(?UIedt)GenYH|IB)z_V0Y0M4R1w9k~^Y*l2={;vR1;W delta 1227 zcmYk)O-R&17{~G1+;!LWt+aQ`G*rmQFx?EpE~ZhN7rQ7CS-Fs6yQpk$1dE3*6{L;5 zP^SnAwo9&+WC=n>MTjSZLLx&5r6BB7UHblTpqAbF%ri6pnP;E*k8QkIkoc76y>9r_ z^V`6$dYK|)4toEYOSg$Q3y)wLc49h4F%#ps68kWSH!y&AU7SR%f8xeppx>B;d9~Cr zlemTj)3^@5qaN`4md10OWysg;q0#(a%*HS(kyhkU6G0`?iCPzT;}aPul7|;gesDJtzwZRAHEGm(CEJPo>YJCZ6d@JVTJ~w_CweNA%f!(N*C*1s?o4*sJ z{yHehfJ~w8Y7|wvNz_aA-pzk;;|r(+ej+)U->7w78XdG8wNI&Y7pk&h)N?1Coe4TB zZMPe^gu254R00p&_#+pOpb{NNRpJe*0$)*go5q_NLO*I=5usv z=v+p<123I#ol~fcr%?yapziXIiwmf432`l!;?Zn7>Mgc&-ktf49np^7laY4Q80#tO ziJb0;oUsRdH|-DKWBV|D!9MlZr5)?)vWxz?VD+{gp`yx~+RBjq94P!R91dh`_SmXm ggY6Hlx2fQejb(luZpo_f*pck8H`X5Oy_Pff7qTCKrvLx| diff --git a/shelfzilla/locale/es/LC_MESSAGES/django.po b/shelfzilla/locale/es/LC_MESSAGES/django.po index b1e09f8..a3c4814 100644 --- a/shelfzilla/locale/es/LC_MESSAGES/django.po +++ b/shelfzilla/locale/es/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2014-04-25 17:15+0200\n" -"PO-Revision-Date: 2014-04-25 17:15+0200\n" +"POT-Creation-Date: 2014-05-27 22:21+0200\n" +"PO-Revision-Date: 2014-05-27 22:22+0200\n" "Last-Translator: \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" @@ -43,115 +43,127 @@ msgstr "Configuración del sitio" msgid "Social Configuration" msgstr "Configuración social" -#: apps/manga/admin.py:14 +#: apps/manga/admin.py:40 msgid "Items marked for review" msgstr "Marcar items para revisión" -#: apps/manga/admin.py:18 +#: apps/manga/admin.py:45 msgid "Items unmarked for review" msgstr "Desmarcar items para revisión" -#: apps/manga/admin.py:29 apps/manga/models.py:104 apps/manga/models.py:105 -#: themes/bootflat/templates/_layout.html:31 +#: apps/manga/admin.py:56 apps/manga/admin.py:92 apps/manga/admin.py:135 +#: apps/manga/admin.py:173 +msgid "General" +msgstr "General" + +#: apps/manga/admin.py:57 apps/manga/admin.py:94 apps/manga/admin.py:136 +#: apps/manga/admin.py:174 +msgid "Review" +msgstr "Para revisión" + +#: apps/manga/admin.py:58 apps/manga/admin.py:95 apps/manga/admin.py:137 +#: apps/manga/admin.py:175 +msgid "Advanced" +msgstr "Avanzado" + +#: apps/manga/admin.py:78 apps/manga/models.py:105 apps/manga/models.py:106 +#: themes/bootflat/templates/_layout.html:32 #: themes/bootflat/templates/manga/publishers/detail.html:18 #: themes/bootflat/templates/manga/series/list.html:4 msgid "Series" msgstr "Series" -#: apps/manga/admin.py:43 apps/manga/models.py:131 +#: apps/manga/admin.py:93 apps/manga/admin.py:120 apps/manga/models.py:135 #: themes/bootflat/templates/manga/publishers/detail.html:21 msgid "Volumes" msgstr "Volúmenes" -#: apps/manga/admin.py:64 +#: apps/manga/admin.py:165 #: themes/bootflat/templates/_admin/volumes/change_series.html:4 #: themes/bootflat/templates/_admin/volumes/change_series.html:8 msgid "Change volume series" msgstr "Cambiar serie de los volúmenes" -#: apps/manga/models.py:13 apps/manga/models.py:50 apps/manga/models.py:110 -#: apps/manga/models.py:135 +#: apps/manga/models.py:14 apps/manga/models.py:51 apps/manga/models.py:111 +#: apps/manga/models.py:139 msgid "Name" msgstr "Nombre" -#: apps/manga/models.py:14 apps/manga/models.py:51 apps/manga/models.py:136 +#: apps/manga/models.py:15 apps/manga/models.py:52 apps/manga/models.py:140 msgid "Slug" msgstr "Álias" -#: apps/manga/models.py:15 +#: apps/manga/models.py:16 msgid "URL" msgstr "URL" -#: apps/manga/models.py:45 +#: apps/manga/models.py:46 msgid "Publisher" msgstr "Editorial" -#: apps/manga/models.py:46 themes/bootflat/templates/_layout.html:34 +#: apps/manga/models.py:47 themes/bootflat/templates/_layout.html:35 #: themes/bootflat/templates/manga/publishers/list.html:4 #: themes/bootflat/templates/manga/series/detail.html:64 msgid "Publishers" msgstr "Editoriales" -#: apps/manga/models.py:53 themes/bootflat/templates/users/profile.html:27 +#: apps/manga/models.py:54 themes/bootflat/templates/users/profile.html:27 msgid "Summary" msgstr "Resumen" -#: apps/manga/models.py:54 +#: apps/manga/models.py:55 #: themes/bootflat/templates/manga/series/detail.html:25 msgid "Finished" msgstr "Finalizado" -#: apps/manga/models.py:109 +#: apps/manga/models.py:110 msgid "Number" msgstr "Número" -#: apps/manga/models.py:115 +#: apps/manga/models.py:116 msgid "ISBN-10" msgstr "ISBN-10" -#: apps/manga/models.py:117 +#: apps/manga/models.py:118 msgid "ISBN-13" msgstr "ISBN-13" -#: apps/manga/models.py:120 +#: apps/manga/models.py:121 msgid "Retail price" msgstr "Precio recomendado" -#: apps/manga/models.py:122 +#: apps/manga/models.py:123 msgid "Pages" msgstr "Páginas" -#: apps/manga/models.py:123 +#: apps/manga/models.py:124 msgid "Release date" msgstr "Fecha de lanzamiento" -#: apps/manga/models.py:130 +#: apps/manga/models.py:134 msgid "Volume" msgstr "Volumen" -#: apps/manga/models.py:143 +#: apps/manga/models.py:147 msgid "Person" msgstr "Persona" -#: apps/manga/models.py:144 +#: apps/manga/models.py:148 msgid "Persons" msgstr "Personas" -#: apps/manga/models.py:158 +#: apps/manga/models.py:162 msgid "have" msgstr "tiene" -#: apps/manga/models.py:171 +#: apps/manga/models.py:178 msgid "wants" msgstr "quiere" -#: apps/manga/views/series.py:20 -msgid "other" -msgstr "otros" - -#: apps/manga/views/series.py:21 -msgid "all" -msgstr "todos" +#: apps/manga/views/search.py:11 apps/manga/views/search.py:13 +#: themes/bootflat/templates/_layout.html:69 +msgid "Search" +msgstr "Buscar" #: apps/manga/views/volumes.py:23 msgid "{} is already on your collection!" @@ -197,7 +209,7 @@ msgstr "Has accedido correctamente." msgid "Logged out successfully" msgstr "Sesión finalizada." -#: settings/base.py:120 +#: settings/base.py:121 msgid "Spanish" msgstr "Español" @@ -205,31 +217,31 @@ msgstr "Español" msgid "Toggle navigation" msgstr "Mostrar/Ocultar navegación" -#: themes/bootflat/templates/_layout.html:45 +#: themes/bootflat/templates/_layout.html:47 #: themes/bootflat/templates/users/profile-pjax.html:4 #: themes/bootflat/templates/users/profile.html:4 msgid "Profile" msgstr "Perfil" -#: themes/bootflat/templates/_layout.html:47 +#: themes/bootflat/templates/_layout.html:50 msgid "My collection" msgstr "Mi colección" -#: themes/bootflat/templates/_layout.html:48 +#: themes/bootflat/templates/_layout.html:51 msgid "My wishlist" msgstr "Mi lista de deseados" -#: themes/bootflat/templates/_layout.html:50 +#: themes/bootflat/templates/_layout.html:54 msgid "Logout" msgstr "Cerrar sesión" -#: themes/bootflat/templates/_layout.html:56 +#: themes/bootflat/templates/_layout.html:60 msgid "Log in" msgstr "Entrar" -#: themes/bootflat/templates/_layout.html:65 -msgid "Search" -msgstr "Buscar" +#: themes/bootflat/templates/_admin/manga/series/includes/volumes.html:13 +msgid "Edit" +msgstr "Editar" #: themes/bootflat/templates/_admin/volumes/change_series.html:9 msgid "You are about to change the series of this volumes:" @@ -243,6 +255,16 @@ msgstr "Cambiar a:" msgid "Change" msgstr "Cambiar" +#: themes/bootflat/templates/manga/search.html:8 +msgid "Looking for..." +msgstr "Buscando..." + +#: themes/bootflat/templates/manga/search.html:20 +#: themes/bootflat/templates/manga/series/list.html:38 +#: themes/bootflat/templates/manga/series/list.html:58 +msgid "No results" +msgstr "Sin resultados" + #: themes/bootflat/templates/manga/publishers/detail.html:14 #: themes/bootflat/templates/manga/publishers/detail.html:43 #: themes/bootflat/templates/manga/series/detail.html:19 @@ -274,10 +296,9 @@ msgstr "Historia" msgid "Original publisher" msgstr "Editorial original" -#: themes/bootflat/templates/manga/series/list.html:35 -#: themes/bootflat/templates/manga/series/list.html:55 -msgid "No results" -msgstr "Sin resultados" +#: themes/bootflat/templates/manga/series/list.html:17 +msgid "other" +msgstr "otros" #: themes/bootflat/templates/users/login.html:24 msgid "Access the site" @@ -287,20 +308,34 @@ msgstr "Accede al sitio" msgid "Login" msgstr "Entrar" -#: themes/bootflat/templates/users/profile.html:29 +#: themes/bootflat/templates/users/profile.html:30 #: themes/bootflat/templates/users/profile/collection.html:4 msgid "Collection" msgstr "Mi colección" -#: themes/bootflat/templates/users/profile.html:31 +#: themes/bootflat/templates/users/profile.html:34 #: themes/bootflat/templates/users/profile/wishlist.html:4 msgid "Wishlist" msgstr "Lista de deseados" -#: themes/bootflat/templates/users/profile.html:33 +#: themes/bootflat/templates/users/profile.html:44 +msgid "Edit my profile" +msgstr "Editar mi perfil" + #: themes/bootflat/templates/users/profile/achievements.html:4 msgid "Achievements" msgstr "Logros" +#: themes/bootflat/templates/users/profile/summary.html:13 +msgid "Volumes owned" +msgstr "Volúmenes" + +#: themes/bootflat/templates/users/profile/summary.html:19 +msgid "Volumes wishlisted" +msgstr "¡{} añadido a la lista de deseados!" + +#~ msgid "all" +#~ msgstr "todos" + #~ msgid "Original series" #~ msgstr "Series originales" From d1c4c602e35a200850add247de4d51b765ccf617 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 22:47:01 +0200 Subject: [PATCH 12/17] Fixed background URL path --- shelfzilla/themes/bootflat/static/less/layout.less | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/shelfzilla/themes/bootflat/static/less/layout.less b/shelfzilla/themes/bootflat/static/less/layout.less index d9b83c8..14220b9 100644 --- a/shelfzilla/themes/bootflat/static/less/layout.less +++ b/shelfzilla/themes/bootflat/static/less/layout.less @@ -1,6 +1,6 @@ body { background-color: rgb(241, 242, 246) !important; - background-image: url('/backgrounds/triangify.png'); + background-image: url('../backgrounds/triangify.png'); background-position: center top; background-attachment: fixed; } From 0eadae992c81293c00dc98f69692eb5cfcbe3286 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 22:49:20 +0200 Subject: [PATCH 13/17] Hidden search form if user is not logged in. --- shelfzilla/themes/bootflat/templates/_layout.html | 2 ++ 1 file changed, 2 insertions(+) diff --git a/shelfzilla/themes/bootflat/templates/_layout.html b/shelfzilla/themes/bootflat/templates/_layout.html index 15440f5..b5d83ac 100644 --- a/shelfzilla/themes/bootflat/templates/_layout.html +++ b/shelfzilla/themes/bootflat/templates/_layout.html @@ -62,6 +62,7 @@ {% endif %} + {% if user.is_authenticated %} + {% endif %}
    From 0ceb680f5ee647e31e1201e325d359718bbf2bea Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 23:12:28 +0200 Subject: [PATCH 14/17] Added twitter, Facebook, google plus and email to social configuration model --- ...tion_facebook_url__add_field_socialconf.py | 56 +++++++++++++++++++ shelfzilla/apps/config/models.py | 8 +++ 2 files changed, 64 insertions(+) create mode 100644 shelfzilla/apps/config/migrations/0002_auto__add_field_socialconfiguration_facebook_url__add_field_socialconf.py diff --git a/shelfzilla/apps/config/migrations/0002_auto__add_field_socialconfiguration_facebook_url__add_field_socialconf.py b/shelfzilla/apps/config/migrations/0002_auto__add_field_socialconfiguration_facebook_url__add_field_socialconf.py new file mode 100644 index 0000000..6b25eb6 --- /dev/null +++ b/shelfzilla/apps/config/migrations/0002_auto__add_field_socialconfiguration_facebook_url__add_field_socialconf.py @@ -0,0 +1,56 @@ +# -*- coding: utf-8 -*- +from south.utils import datetime_utils as datetime +from south.db import db +from south.v2 import SchemaMigration +from django.db import models + + +class Migration(SchemaMigration): + + def forwards(self, orm): + # Adding field 'SocialConfiguration.facebook_url' + db.add_column(u'config_socialconfiguration', 'facebook_url', + self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True), + keep_default=False) + + # Adding field 'SocialConfiguration.google_plus_url' + db.add_column(u'config_socialconfiguration', 'google_plus_url', + self.gf('django.db.models.fields.URLField')(max_length=200, null=True, blank=True), + keep_default=False) + + # Adding field 'SocialConfiguration.contact_email' + db.add_column(u'config_socialconfiguration', 'contact_email', + self.gf('django.db.models.fields.EmailField')(max_length=75, null=True, blank=True), + keep_default=False) + + + def backwards(self, orm): + # Deleting field 'SocialConfiguration.facebook_url' + db.delete_column(u'config_socialconfiguration', 'facebook_url') + + # Deleting field 'SocialConfiguration.google_plus_url' + db.delete_column(u'config_socialconfiguration', 'google_plus_url') + + # Deleting field 'SocialConfiguration.contact_email' + db.delete_column(u'config_socialconfiguration', 'contact_email') + + + models = { + u'config.siteconfiguration': { + 'Meta': {'object_name': 'SiteConfiguration'}, + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'maintenance_mode': ('django.db.models.fields.BooleanField', [], {'default': 'False'}), + 'site_name': ('django.db.models.fields.CharField', [], {'max_length': '255', 'null': 'True', 'blank': 'True'}) + }, + u'config.socialconfiguration': { + 'Meta': {'object_name': 'SocialConfiguration'}, + 'contact_email': ('django.db.models.fields.EmailField', [], {'max_length': '75', 'null': 'True', 'blank': 'True'}), + 'facebook_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + 'google_analytics': ('django.db.models.fields.CharField', [], {'max_length': '16', 'null': 'True', 'blank': 'True'}), + 'google_plus_url': ('django.db.models.fields.URLField', [], {'max_length': '200', 'null': 'True', 'blank': 'True'}), + u'id': ('django.db.models.fields.AutoField', [], {'primary_key': 'True'}), + 'twitter_account': ('django.db.models.fields.CharField', [], {'max_length': '64', 'null': 'True', 'blank': 'True'}) + } + } + + complete_apps = ['config'] \ No newline at end of file diff --git a/shelfzilla/apps/config/models.py b/shelfzilla/apps/config/models.py index d309cc8..c2b19be 100644 --- a/shelfzilla/apps/config/models.py +++ b/shelfzilla/apps/config/models.py @@ -17,7 +17,15 @@ class SiteConfiguration(SingletonModel): class SocialConfiguration(SingletonModel): + # Social accounts twitter_account = models.CharField(max_length=64, blank=True, null=True) + facebook_url = models.URLField(blank=True, null=True) + google_plus_url = models.URLField(blank=True, null=True) + + # Contact + contact_email = models.EmailField(blank=True, null=True) + + # Analytics google_analytics = models.CharField(max_length=16, blank=True, null=True) def __unicode__(self): From 620a80f473a60972ce1b1bdcb0163a4fdb0e0ab7 Mon Sep 17 00:00:00 2001 From: Felipe Martin Date: Tue, 27 May 2014 23:13:39 +0200 Subject: [PATCH 15/17] Added social icons bar on top of navigation bar --- .../themes/bootflat/static/icons/email.png | Bin 0 -> 1422 bytes .../themes/bootflat/static/icons/facebook.png | Bin 0 -> 1246 bytes .../bootflat/static/icons/googleplus.png | Bin 0 -> 1401 bytes .../themes/bootflat/static/icons/twitter.png | Bin 0 -> 1370 bytes .../themes/bootflat/static/less/fixes.less | 5 +++++ .../templates/_includes/social_bar.html | 17 +++++++++++++++++ .../themes/bootflat/templates/_layout.html | 1 + 7 files changed, 23 insertions(+) create mode 100644 shelfzilla/themes/bootflat/static/icons/email.png create mode 100644 shelfzilla/themes/bootflat/static/icons/facebook.png create mode 100644 shelfzilla/themes/bootflat/static/icons/googleplus.png create mode 100644 shelfzilla/themes/bootflat/static/icons/twitter.png create mode 100644 shelfzilla/themes/bootflat/templates/_includes/social_bar.html diff --git a/shelfzilla/themes/bootflat/static/icons/email.png b/shelfzilla/themes/bootflat/static/icons/email.png new file mode 100644 index 0000000000000000000000000000000000000000..25d84384eb9fea21e3a362395b5b77fd3293960a GIT binary patch literal 1422 zcmaJ>eQeZZ7(YaD4u%tBWP@n!X0{=B?c3hYCjnX4zPHu&+S2yC z+e{4ZkVF`4F;Os}L8DRpWB-7eAABr?I5Am>AIvxt1Bn9@jZ65)i6Qar?QZN3LX-A= z`tRg_nkdpw?sM2pag&h_qHwhBG3X2T2UsB&USr^`q=S;>N)h+_0Y zERmM_U?-H6!9AB?qsO!IrrMo!lHyiQHqt)HwejWBCPI5WjmS+HxUty>-%kXZ$9Zo(RK9CDC`j)djXnr?HsFkbM>A=yo6bWd8qzOQK0mYFl2Lf2}!cjC! zNpYP*yci3;h4FsJF*$9m_y!P<5@;T;-xwYIwlO-OV? z+sIfl>PM=k1V**Hcc7A?A}`sQ8A~hVsmKJ>U>fR)rNHhNDi$6HWx46EBPw9=?_^c#+0_Zue0 zcQIJKD9NhsDjM8Q7P&%8eFZ9U%SdB|R&eTF7%-_ID}#{iWf+ZHE??XlLDljEwGzV|$(+16cRW@|Hk#OfwQxTvbEnpP{K;k%o`gNVN-3)-3p|^ZD8MOV!%3OXFql zx74);f}el+_?1Vt%%43F`Jr;>H&egwfBN{a9c}&M;LEFDUHM@>*ezV`Nyh5V)Hxge zINVycRZ&Pl()97>~P9OYLHdP+EI1WId>uNnVo4KX!I^CV%XJS=ZSCM^E$S<;_goBrhg! zoY_S^6g((+sCW=Ow5WJ2ih3v>qz5TgiXJ?u2U)6kRRp1ku)fUBZ1+$aNZyw(-|zc= z-@m-Ix$(@>iAPUx9JkcG;I`O#w!DuYW6!;D?G8K6QLjU{NS}^jj=6eBdYEq}aDZDF zhC8p^#48-P_;=Lq&`$8IjYv{~rA=j$WDL!5D{GSsqHRq19v(z#P5ASxuLV8|Yr+fF zKn^ko52FjaIo{gcXrtY2WQD@oD!($ZnS%sV$WM|uE$m56nEJJuT&g93pPJC^ns7j> z6KwJh$uVE8R7E5MjW?_cr~=IdPxFclR7qAPpo&1TWy=Otes&2gS|0Z8mg~=AvA3Eq zq%^Z7X*?cR#%hJ+0|{7`CCQ4UC?c~Ei=C9hiI^74a}O>qP#$G8A}L>bggr8%HGwfb zNFm9B;Lvee%nHRyCQV=_fr>08NtxHwx}Yt5m&QG(G~doa-ZhJ}EML|sR+s99D|vh#~I7QA~x^LA;X< zBSg|-MJneoju>Dn9bly+9;fOfgFClm+fa&!Ysg*>7a6B)dvms?XV$;C!B+fY)2+8B zzx2A@ZpPhyc>TZ2-<}OWSzLba`uFSS|GISg<@2|=M;70C;My5&;j`cN_xI0T0+nw* z_J3Wt0#E)V>;L?Ir+fX%+l%jRo!;%JigG*nKiYok-?hiT z`|$aPd~yBDz2&7_4}K7|K7aH5mrh>$dEr!-qpNSc_}JCq>*XJ(>20`I8{Lcl19qE| Ar2qf` literal 0 HcmV?d00001 diff --git a/shelfzilla/themes/bootflat/static/icons/googleplus.png b/shelfzilla/themes/bootflat/static/icons/googleplus.png new file mode 100644 index 0000000000000000000000000000000000000000..a1613cc9835f338b2509e9b4cc0099366d4878d8 GIT binary patch literal 1401 zcmaJ>Z)ntJ7*Dm8qvKfJ7`SO^NC&lUxg?id{@Js==I-jbU3cCcS{Q6glec$Sb4ixu zyleNRy1BJO3Ui>0D%F+2V0J45zpR7WTF|ZF>J&lQrh?!Gir|LZkd3{$-qn5(1Ihd3 z$@6=j-}5hHsooxc;|q-lg7_0VqiJ|<@^0S-_`FdH{|%4l-B_QSF$dg|Yy%{sn*9Jx z6yzL816dt<=X=nBAnWgI**>=~`KqXxg@EkY1j+>qq7kH{vuw%AAaK!skkgDXc5ikL zLp3#w?F}W#q$Pp8wsY79nc?27GCZgVD%QCJ?I?@TK>@fjS}y2@BbLKh#jgluPfcKG z#l#&9V=JWkk||U&ZGeUXAzUFT2IYhR6`~lPdKnFp6itvcLD4uB6iGp(LTL5EU^H7D z5Yy3kH5PmeV|mxLM1m-lN`Vp`Fzp;c34%b7K_VE$p#|;?8LnK$4X3r{AqpJD)+|>u z4b<}}_nSpGj6tR=DHN<^a@DcnR0{=5MwDfXpaLXOD0q2QtQ|KE9?^KLwUZsP0Fefc zS+o_{kAc=27}oB|fog`TvTA1)ZM~AGst`a21z@-iBt=yiLFVFXwgww0>rqoFdS4UK zFjg#Ts>p_7EG>{M&q{HMigriXSTM@-oD_>l-3-Zj!8`|Rflw1rAvPk#LlVnC6va?f zEGP&P7Z+%nWN0?daAXaeFdSDl6yOE*u-YRm`9!QJ*+6zpJ8PPHZB$Zu(>0yEX`xbv zMYkqpMKe4_yVuDoS72-VfEu^W0$OQ>s6B=OJHQDF#Va_=DkRPbLO(8Wtb+3tkXcn` z02vgpDqdYvwp#WyL&r!-;z=$D%STZ>$Qe2uMg(L|1clP@U6=?p7sT z^JYcVWg`cRf~#OaF6u6}Bc~5pc}+15r-Sh3P}d-!BCTMFH6APKHG^BTgxlbWt7`~f zRu>rdIrca-K^A>{CH7BBxZ28*dBX|7^XwwJt4R?HpZupw_Z`^dUm0!2{ysx>A zv+Cpdwl1{Ce&&ax4?ax3kr9S}y!bHH?fdjN+xAcynxqd-yd>Pd*1p_3`(I1f;l-_O zbz_sKPA@K9Kl`n)YulZrs|)9r#`d@R$LrVqyz9as^6XSY6KmJsoIB*z#&d+?3&swAGg8I|w;9u>_ zXTO=*xHsE*;^zGH=M%3WSJSs!N1nPhpS}O*`_VssZTa^|`ttHGncSs=bGTWz0r|2E V&ByMZIqCfj6S3atSKV(N_#Y{=-BJJm literal 0 HcmV?d00001 diff --git a/shelfzilla/themes/bootflat/static/icons/twitter.png b/shelfzilla/themes/bootflat/static/icons/twitter.png new file mode 100644 index 0000000000000000000000000000000000000000..b092c87c852f93682272997cb3b39d8495140791 GIT binary patch literal 1370 zcmaJ>Z)n_P7>{~}71#5ABu$!-u3Vki1Wx zJiq7pJ^wP<)!DYQ_K{i)!*-_Hm2Px41o!p_(Q~C3y^W52exld!v4{Mk>Ow50+k+5K z<<%_ghN?a`vIJW&tY+27^!mN&4oS1~AvLfGmGTZkV_3_9lA~(F(8mX1*07?)tqT_k z+|Z-MbKx|dc4U|{+Q(hkGv1le#)magCl0jYEhPy#$U|SnOL^1sq*9b9`<0L!s3`(3 zoA|>~VuMs~x(kcJ^L5W;wS|Tm4vFbsAp5_{kZ`c+d zcvJ`Nf*&Oi(~T7JPCC8m*zzicLM5Y0szZSgP37}JUS(^~?}m41+|}C4j5(0%hMrw; zHPnxx#wr-q?%si_hPt+C=M-GCoTsi)(1dwt`5qz#%8U?m>5yxn2CAlFYlYxzN{JGM zf}u-%IKi_b%}01S34juh@d-wWLDVZaXwq6Q)w$@3aba-uj$iUO~Z5dc+QS2;*C zB2mHXTgq0=p5@pCEz1#FU{Lu0h|m!>!Y9H4n-ow{c!ENNbWQRN--MMpjhTK$GL2wX zBvZArs3@ckhtz`U6RlZu%*h#=ZFwzJFo&jr0A*HswLWnK-^qI^s>3g z&_dhmqBUjyo;`1OL)?KQF>|m^Y$k%?f>g&_+ZWBYvlZq zcYbVmVRT{7?BY^?W~#F}UOzqe+o|@;-%ZyXANa)k@+s%?W23t|`tLvF#y)#s+v)da zD5te)t?B#|V!b}zlv-&#@z9mN>#tmReR1F0C;GI8qs@PmzCNY6&3!Mgv`lt( q=CiE}|AB9RpIXnJ{rBh9hX*ia@9x@nZ@<+a{OwYSPGv4WF!4WgMbMZ4 literal 0 HcmV?d00001 diff --git a/shelfzilla/themes/bootflat/static/less/fixes.less b/shelfzilla/themes/bootflat/static/less/fixes.less index ebf2783..47f1b06 100644 --- a/shelfzilla/themes/bootflat/static/less/fixes.less +++ b/shelfzilla/themes/bootflat/static/less/fixes.less @@ -13,6 +13,11 @@ margin-bottom: 0 !important; } +.social-bar { + margin-top: 10px; + margin-bottom: -10px; + text-align: right; +} .volume-item { &:not(.user-have-it) { diff --git a/shelfzilla/themes/bootflat/templates/_includes/social_bar.html b/shelfzilla/themes/bootflat/templates/_includes/social_bar.html new file mode 100644 index 0000000..5f4e274 --- /dev/null +++ b/shelfzilla/themes/bootflat/templates/_includes/social_bar.html @@ -0,0 +1,17 @@ +{% load staticfiles solo_tags %} +{% get_solo 'config.SocialConfiguration' as social %} + + diff --git a/shelfzilla/themes/bootflat/templates/_layout.html b/shelfzilla/themes/bootflat/templates/_layout.html index b5d83ac..01e038a 100644 --- a/shelfzilla/themes/bootflat/templates/_layout.html +++ b/shelfzilla/themes/bootflat/templates/_layout.html @@ -12,6 +12,7 @@ {% block navigation_bar %}
    + {% include "_includes/social_bar.html" %}