From a5a1af418c5128c1221a8364ce89c4a388c27fef Mon Sep 17 00:00:00 2001 From: Mouse Reeve Date: Tue, 10 Nov 2020 13:39:37 -0800 Subject: [PATCH] Adds ui for editing and adding shelves --- bookwyrm/static/css/fonts/icomoon.eot | Bin 7624 -> 7744 bytes bookwyrm/static/css/fonts/icomoon.svg | 1 + bookwyrm/static/css/fonts/icomoon.ttf | Bin 7460 -> 7580 bytes bookwyrm/static/css/fonts/icomoon.woff | Bin 7536 -> 7656 bytes bookwyrm/static/css/icons.css | 13 +++--- bookwyrm/templates/followers.html | 10 +++++ bookwyrm/templates/following.html | 10 +++++ bookwyrm/templates/shelf.html | 45 +++++++++++++++++-- bookwyrm/templates/snippets/user_header.html | 13 ------ bookwyrm/templates/user.html | 15 +++++++ bookwyrm/templates/user_shelves.html | 25 ----------- 11 files changed, 85 insertions(+), 47 deletions(-) delete mode 100644 bookwyrm/templates/user_shelves.html diff --git a/bookwyrm/static/css/fonts/icomoon.eot b/bookwyrm/static/css/fonts/icomoon.eot index 0c2680e2a1b3249a5616c11ef3996d5a26a06522..30ae2cd57334ee225ee478e7d23d10bab788d955 100644 GIT binary patch delta 465 zcmX?MeZYp*L5_i8&O}yo7JKu)CzAzbL?(tL)w6RjFfi-^;)LYf#DdEoE`MfVV3Yy! zbJ7!w3xKo$klz8MInr|~(-xg-ss!>UFfd4pWTYmhNOLSrU|^710+ct)019w$v*-f( zcYu7AjNFonx^@nr8PY&5Lr+eAa$@$U5};K>X|A8Vv4KEphBG;iJjQ<~tvxrR>a~G2U>R@DG*eu3$NTUA#0Tu@40}RSQ zBNPQq)U+9u*hB>tmDpq%MZ}C11x3WH8I8>LGAk2G!SNPuoUSVNg z#sn~jF#*V7asX4j*c5S#*H>3?N@6 zBe$fYs+|L9hExxb-;tA_oS6M7y^VoES_H^<%T25(V9?iQ0$L^=0~AomOUzB3>BR|j zfOHMelD2~U;t~dCpbUd73rL=UnfdbM6h=Fym$xP_VYD{)01EOka4;}2urV+)D7=(- z+4l0*|G)qLgR}to3_$*MFrV@NV{sO->0<6c;}|!~F&&an04d2_cldTZzs*+$Zjkv5 l47bm_PlwTybEM4~l_oEd?wD*K + \ No newline at end of file diff --git a/bookwyrm/static/css/fonts/icomoon.ttf b/bookwyrm/static/css/fonts/icomoon.ttf index 58aeb8fe1d1799f79772a6727cb961dea997a1b4..40d6e886255770541932dbd4b4d4930eca41ff88 100644 GIT binary patch delta 460 zcmZ2tHOIQ1fsuiMft#U$ftkU;KUm+0Ux=LpD6$8L6OwZi3od`S{F#A)Q3lA*Nlz>; z0MY_Leg}}|NYANETXd?a63Cyxz#u7-k(!ty&9O9rfkA2sP~I#9D8RwZq6_5T0rFKc za!V@e+Btw`NCUYHJvsTwj)~cyN`MAR_W%VvauX{G7<8C`mPua$@)hzDb5mz}asCGK zzW^<1E66V{0Xh^2WNSe349v_|CLXY3dc`$~(b_%$C?o)cAO(yJ3NIyIw!OUditGR1 z|Nns^K;kZi?fJL7jqYr0O|mS!sa5zLlX7>53n#WA7D@h8lfm?qNdHL z#3m}JsKh4AC?aO8C@3Ok&1ht1DyV2=X3J=z#{A&l0%6_*yu$w$@Cpm_GA4jIj0r#v zlLMII#ijt{8c?_c!IM67`*?nvuMFHQATBS%?F$>qKr9eFIYi2wQF(HYRL5iiX)ht3 aF0d|TCMgC`95FC3O%{|D-dr!elo0?NN^cSX delta 328 zcmbPZy~L`XfsuiMft#U$ftkU;KUm+0Ux@8GP-G7fCnV=47BH;e^P7QzQ3l9QNlz>; z0MY_Leglx^NYANEGp{!WvKc!V7$jC?q$Z|FvtC}rz#wG+lsC%&3UF|<=m7Z{K)y;w zZb?N|I|tAVsU9G|BPT!EF){m7dK&|Sv+&=F< g9Y#++A!W{}G)cN+a*wnd2T&9gZc3YPNgrYa03B9UjQ{`u diff --git a/bookwyrm/static/css/fonts/icomoon.woff b/bookwyrm/static/css/fonts/icomoon.woff index 2483f599c5e1555a79f55ef2102e0388832c03b5..6cfa9a4da17882e7cb0d51ebd423e00e5de1ad84 100644 GIT binary patch delta 486 zcmexh^}<@D+~3WOfsp|SWM43FgXuXFMYQVKIg)b|3m6y}Gk{__Abk15<_K^S_8;e0bveq z7Tt{8k_w=h50Kvj!gcK&1v&Z2i46V>(l>wt9w40ksYD<*u>xqZi~^7k!8%Mbd5O8H zKrsiPX?BnX67rCc^K`OUU5zKVYIdn0162JAxMgmLE)vu z%eI%dUUB{Z`~N>s1Zcra2B64ws0ic#$Kotv)5YAyB!D`AA+>oQ;~|Oq{|8tYm=7>0 z1C3A=G*Q!LRALhqR8(SE zH;Yb2Zb=1D>;{nE0m4=790fV~$%zd94AKce0XGoN{*>O9n^*y~SQ=;ng8~?9Gs)y7 z=B5J0P5>=$1L2uooWBe5i%Wps34p6(2C|r$FHh!Sv}1aCYqAfcwYdjSh!5y~CI&X3 z?-gE3yli`U>;K>X|AFE_<6klW`PadG#{ZASS;VG`xic^`Fm67^ct}D4q$G3Q;oI^2 zHeVUISwLKd+vnY44 DES+A> diff --git a/bookwyrm/static/css/icons.css b/bookwyrm/static/css/icons.css index dafaca21..536db560 100644 --- a/bookwyrm/static/css/icons.css +++ b/bookwyrm/static/css/icons.css @@ -1,10 +1,10 @@ @font-face { font-family: 'icomoon'; - src: url('fonts/icomoon.eot?jhaogg'); - src: url('fonts/icomoon.eot?jhaogg#iefix') format('embedded-opentype'), - url('fonts/icomoon.ttf?jhaogg') format('truetype'), - url('fonts/icomoon.woff?jhaogg') format('woff'), - url('fonts/icomoon.svg?jhaogg#icomoon') format('svg'); + src: url('fonts/icomoon.eot?rd4abb'); + src: url('fonts/icomoon.eot?rd4abb#iefix') format('embedded-opentype'), + url('fonts/icomoon.ttf?rd4abb') format('truetype'), + url('fonts/icomoon.woff?rd4abb') format('woff'), + url('fonts/icomoon.svg?rd4abb#icomoon') format('svg'); font-weight: normal; font-style: normal; font-display: block; @@ -115,3 +115,6 @@ .icon-heart:before { content: "\e9da"; } +.icon-plus:before { + content: "\ea0a"; +} diff --git a/bookwyrm/templates/followers.html b/bookwyrm/templates/followers.html index a5fdfd82..645e46a1 100644 --- a/bookwyrm/templates/followers.html +++ b/bookwyrm/templates/followers.html @@ -1,6 +1,16 @@ {% extends 'layout.html' %} {% load fr_display %} {% block content %} +
+

+ {% if is_self %}Your + {% else %} + {% include 'snippets/username.html' with user=user possessive=True %} + {% endif %} + followers +

+
+ {% include 'snippets/user_header.html' with user=user %}
diff --git a/bookwyrm/templates/following.html b/bookwyrm/templates/following.html index c3bf976a..2cca9127 100644 --- a/bookwyrm/templates/following.html +++ b/bookwyrm/templates/following.html @@ -1,6 +1,16 @@ {% extends 'layout.html' %} {% load fr_display %} {% block content %} +
+

+ Users following + {% if is_self %}you + {% else %} + {% include 'snippets/username.html' with user=user %} + {% endif %} +

+
+ {% include 'snippets/user_header.html' with user=user %}
diff --git a/bookwyrm/templates/shelf.html b/bookwyrm/templates/shelf.html index 8e6cc9f8..660d400c 100644 --- a/bookwyrm/templates/shelf.html +++ b/bookwyrm/templates/shelf.html @@ -1,20 +1,57 @@ {% extends 'layout.html' %} {% load fr_display %} {% block content %} + +
+
+

+ {% if is_self %}Your + {% else %} + {% include 'snippets/username.html' with user=user possessive=True %} + {% endif %} + shelves +

+
+ {% if is_self %} +
+ + + Create new shelf + + +
+ {% endif %} +
+ {% include 'snippets/user_header.html' with user=user %}
-
+
+
+
+

{{ shelf.name }}

+
+ {% if is_self %} +
+ + + Edit shelf + + +
+ {% endif %} +
+
{% include 'snippets/shelf.html' with shelf=shelf ratings=ratings %} diff --git a/bookwyrm/templates/snippets/user_header.html b/bookwyrm/templates/snippets/user_header.html index bb892757..d9ca71b2 100644 --- a/bookwyrm/templates/snippets/user_header.html +++ b/bookwyrm/templates/snippets/user_header.html @@ -1,19 +1,6 @@ {% load humanize %} {% load fr_display %}
-
-

User Profile

- {% if is_self %} -
- edit - - Edit profile - - -
- {% endif %} -
-
diff --git a/bookwyrm/templates/user.html b/bookwyrm/templates/user.html index b6d808c8..ba9fcc94 100644 --- a/bookwyrm/templates/user.html +++ b/bookwyrm/templates/user.html @@ -1,6 +1,21 @@ {% extends 'layout.html' %} {% block content %} +
+
+

User profile

+
+ {% if is_self %} +
+ + + Edit profile + + +
+ {% endif %} +
+ {% include 'snippets/user_header.html' with user=user %}
diff --git a/bookwyrm/templates/user_shelves.html b/bookwyrm/templates/user_shelves.html deleted file mode 100644 index acda58ca..00000000 --- a/bookwyrm/templates/user_shelves.html +++ /dev/null @@ -1,25 +0,0 @@ -{% extends 'layout.html' %} -{% load fr_display %} -{% block content %} -{% include 'snippets/user_header.html' with user=user %} - -
-
- -

{{ shelf.name }}

-
- -{% for shelf in shelves %} -
- {% include 'snippets/shelf.html' with shelf=shelf ratings=ratings %} -
-{% endfor %} - -{% endblock %} -