From c47911d5c26785f2fb86871f19b571369989bb6a Mon Sep 17 00:00:00 2001 From: nataly Date: Tue, 23 Apr 2024 16:56:12 +0300 Subject: [PATCH] New new --- .../__pycache__/models.cpython-312.pyc | Bin 9398 -> 9477 bytes .../billing/__pycache__/urls.cpython-312.pyc | Bin 987 -> 1016 bytes .../0039_recurringcycle_cycle_price.py | 18 +++ ...recurringcycle_cycle_price.cpython-312.pyc | Bin 0 -> 787 bytes osinaweb/billing/models.py | 1 + .../templates/listing_pages/invoices.html | 2 +- .../templates/listing_pages/items.html | 14 +-- .../templates/listing_pages/orders.html | 8 +- .../__pycache__/urls.cpython-312.pyc | Bin 1668 -> 1797 bytes .../__pycache__/views.cpython-312.pyc | Bin 9245 -> 11183 bytes .../listing_pages/customer-invoices.html | 2 +- .../listing_pages/customer-orders.html | 2 +- .../templates/listing_pages/products.html | 4 +- osinaweb/customercore/templates/payment.html | 31 ++++- .../templates/products/osicard-plans.html | 2 +- osinaweb/customercore/views.py | 15 ++- osinaweb/db.sqlite3 | Bin 1077248 -> 1077248 bytes osinaweb/input.css | 10 +- .../osinacore/templates/add-edit-main.html | 2 +- .../add_templates/add-status-modal.html | 2 +- .../osinacore/templates/customer_index.html | 26 +++-- .../osinacore/templates/customer_main.html | 11 +- .../details_templates/business-details.html | 2 +- .../details_templates/customer-details.html | 2 +- .../details_templates/showpoints-modal.html | 4 +- .../details_templates/staff-details.html | 2 +- .../details_templates/task-details.html | 4 +- .../templates/edit_templates/edit-task.html | 2 +- osinaweb/osinacore/templates/index.html | 24 ++-- .../listing_pages/business-types.html | 4 +- .../templates/listing_pages/businesses.html | 8 +- .../templates/listing_pages/customers.html | 30 ++--- .../listing_pages/daily-reports.html | 2 +- .../templates/listing_pages/notes.html | 2 +- .../listing_pages/project-types.html | 6 +- .../templates/listing_pages/projects.html | 2 +- .../templates/listing_pages/references.html | 8 +- .../listing_pages/staff-positions.html | 6 +- .../templates/listing_pages/staffs.html | 10 +- .../templates/listing_pages/tags.html | 6 +- .../templates/listing_pages/tasks.html | 24 ++-- osinaweb/osinacore/templates/login.html | 8 +- osinaweb/osinacore/templates/main.html | 4 +- .../templates/recent-activities-page.html | 4 +- .../templates/recent-activities.html | 2 +- .../osinacore/templates/recent-status.html | 2 +- .../templates/user-recent-activities.html | 2 +- osinaweb/static/dist/output.css | 107 +++++++++++++++++- .../images/ositcom_logos/full-logo-white.png | Bin 0 -> 49613 bytes .../cloud-hosting-pricing-plans.js | 93 +++++++++++++++ .../dedicated-servers-pricing-plans.js | 93 +++++++++++++++ .../osimenu-pricing-plans.js | 45 ++++++++ .../static/js/customer_dashboard/payment.js | 24 ++-- .../shared-hosting-pricing-plans.js | 70 ++++++++++++ 54 files changed, 605 insertions(+), 147 deletions(-) create mode 100644 osinaweb/billing/migrations/0039_recurringcycle_cycle_price.py create mode 100644 osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc create mode 100644 osinaweb/static/images/ositcom_logos/full-logo-white.png create mode 100644 osinaweb/static/js/customer_dashboard/cloud-hosting-pricing-plans.js create mode 100644 osinaweb/static/js/customer_dashboard/dedicated-servers-pricing-plans.js create mode 100644 osinaweb/static/js/customer_dashboard/osimenu-pricing-plans.js create mode 100644 osinaweb/static/js/customer_dashboard/shared-hosting-pricing-plans.js diff --git a/osinaweb/billing/__pycache__/models.cpython-312.pyc b/osinaweb/billing/__pycache__/models.cpython-312.pyc index a52836bd59173d81764ebcddded97982adb31fb7..7f78fd0c48940ad810d9e15a865aa472a29e1475 100644 GIT binary patch delta 1093 zcmZ`&TS!z<6rDZho#$0&GM(`;j@~J?huTM}SsFMPW13|qq0w}md#Z_fah#0lLH7DA zicM66^!jLe5XykReMdnQMR6hMEBfgp66&+F&lD8Y{aEb1&bs@obH%d+@5#fqSZbJ_8n^xdmTZ^Yv=uKBF7fY~chR0(JpV>6%$1k>a?|ZLydDT0w_R6c} zE8lqAX15pW>|yBZ67RHHO=UojCz!#zi>;$yPsLb*m`z1y*^YFI@t$I1+sRT!Javd~ z##@dm=qW5Zh5*(SN?eZtI&t28)w5eDk2^=W!Fb!WKEu}IxcV`?U9hG-!_yhYvpK#^ zw49Wt8jZ#h`t&qy8jU^xzE`l*bOu|wk5rw%p#hJVU4zbow_FFl*u5G zEKABTVSG~g!zC@PqzOq}Sm7T}h|*Myqb#atc{}lw#FTRuJIc8@uBf~kzMq!D1T>pR z2@VMOGp=+>(2c>WdoYE)iXT5zeYW)qZjATgi|RXYppf!4SYZ$^)zm9z!~!3|g&M!> z6qQ2+!}zwQv07%AvF(4wR%;`xWo*09{v)+JlA1}2&q!vT!r9vIA=<@MM^bDoEnpzd z5=QZAC@N19n0>WQMm)ifhVyu;A5 z;^)xg2G@v`(R}$MLTf8Z Vq51OowS8CiEm=glRDq)*<0s#f6zc#0 delta 1045 zcmZ`%U2Ka{817r^|Js>!Ypd3EYnhc8k=6WcL}zs7Zx)joUq1Z~X?*)yryc4qBg8Fx zGZWm5EVCdYP26!oA`utDu`_dZE`Uwgf7 zi}+scUvk8F?CrJB;}#393dHc7eOp|ccgZs3E>*SKOkY3CjB=hej;2Z(oej)dd5ze| ztMNdz5m!4@ScnsjX7J#qSRH<=v*9~O44+5*7(5hjnF}yAL2y?)N+ZNaFA6iQ0al zJni1aHO5yI)DvtaPJ2Ig_X^f@=6Np9c(KHLM9WEOdKD$3tAzqxswlI-2L)RI0h@S` zRLMDr;49xGB+F`z3a|lR%)hr_3u&zaqS1;th39I6&{e)(d*2F2akIa3(H`2b63~6E zE*_wIFTnub^0&hvzV!#{q-~$Hoi4HwX+4F%{69U?z+%$tqy=u!LzJ5u*8&_C|Mecw@nLiYoWb|e zbcdV=nJ}xnStdK8>J^6xI^z`aE=?^mC9h^R9wSnoK7oRL7Kdi3yfY^?9eK4h!i=IwU5G7p&(H$Fd7O@=VFtg(maa5JZ`yX`G^TSq t3FNOKy~-)e2a!gkg&Eu$Z-7V0;>+h(LCe*Blf&1BzgtB4-G@_g?GGHu4Zr{Z diff --git a/osinaweb/billing/__pycache__/urls.cpython-312.pyc b/osinaweb/billing/__pycache__/urls.cpython-312.pyc index 2c4775dd82aa917f635fae5e38b5a8af9b8f77fb..7688d1d473ea85c23d7020901e9c5d824477835d 100644 GIT binary patch delta 392 zcmcc3{)3(OG%qg~0}v=XtEV+jiCdVK-ekVXzF-?>IAT;>i$7Bx delta 388 zcmeytew&^5G%qg~0}z~yP)nKawI^yXaKFN$bCZRmLt=vIbeoAb3o@>-=!5uD6GErQ nO^jQib%n+BBO3!N=LJs96{gp<9WH7+TyPJ+!V)q05VIKokg!t4 diff --git a/osinaweb/billing/migrations/0039_recurringcycle_cycle_price.py b/osinaweb/billing/migrations/0039_recurringcycle_cycle_price.py new file mode 100644 index 00000000..63e32fc5 --- /dev/null +++ b/osinaweb/billing/migrations/0039_recurringcycle_cycle_price.py @@ -0,0 +1,18 @@ +# Generated by Django 5.0.4 on 2024-04-23 11:44 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('billing', '0038_alter_invoice_pdf'), + ] + + operations = [ + migrations.AddField( + model_name='recurringcycle', + name='cycle_price', + field=models.FloatField(null=True), + ), + ] diff --git a/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc b/osinaweb/billing/migrations/__pycache__/0039_recurringcycle_cycle_price.cpython-312.pyc new file mode 100644 index 0000000000000000000000000000000000000000..ce975d657fe6e39af2fe05682f4674048a2d17dd GIT binary patch literal 787 zcmY*XF>ljA6ne`E<<#}PwaA*!Jzw$>B-w1m{2@L=ar*WTinGz3TM#UX{ z;2xI=Z+#@Jtk0Nl$}QDqIEzv$W6D?B31y_|yTZXbj+9^;x zlkOBIHn@$6X>8b^UQax5cfNQdXM5;ukGJ;5cOQ&v^|ObgT76inf8Y33Yg|<=*PEDj z&Hns~Z!P*YeM`8r85^XfWzk~HzPPE
-

Invoices

+

Invoices

diff --git a/osinaweb/billing/templates/listing_pages/items.html b/osinaweb/billing/templates/listing_pages/items.html index 2b18a490..a83a288e 100644 --- a/osinaweb/billing/templates/listing_pages/items.html +++ b/osinaweb/billing/templates/listing_pages/items.html @@ -60,15 +60,15 @@ {% for product in products %} -

{{product.title}}

+

{{product.title}}

-

{{product.item_type}}

+

{{product.item_type}}

-

${{product.amount}}

+

${{product.amount}}

@@ -129,19 +129,19 @@ {% for service in services %} -

{{service.title}}

+

{{service.title}}

-

{{service.customer.user.first_name}} {{service.customer.user.last_name}}

+

{{service.customer.user.first_name}} {{service.customer.user.last_name}}

-

{{service.item_type}}

+

{{service.item_type}}

-

${{service.amount}}

+

${{service.amount}}

diff --git a/osinaweb/billing/templates/listing_pages/orders.html b/osinaweb/billing/templates/listing_pages/orders.html index 5f26d295..dc13d514 100644 --- a/osinaweb/billing/templates/listing_pages/orders.html +++ b/osinaweb/billing/templates/listing_pages/orders.html @@ -5,7 +5,7 @@
-

Orders

+

Orders

@@ -60,15 +60,15 @@ {% for order in orders %} -

{{order.order_id}}

+

{{order.order_id}}

-

{{order.customer.user.first_name}} {{order.customer.user.last_name}}

+

{{order.customer.user.first_name}} {{order.customer.user.last_name}}

-

${{order.get_cart_total}}

+

${{order.get_cart_total}}

diff --git a/osinaweb/customercore/__pycache__/urls.cpython-312.pyc b/osinaweb/customercore/__pycache__/urls.cpython-312.pyc index ad780d28aae488fda4089b65d7b83c34272d99c3..03734bb57496bbfd94cd1ee6e421eef9124fabfc 100644 GIT binary patch delta 407 zcmZqSZRJxx&CAQh00a?h)YBHTFfcp@abQ3Y%J{6YQT;EY0TV+iV~T7lbCv>30fJ7E zTf?@R8NyHJjS{Ss*HoCS!z9DZlUq4CkjYAvE4NZNzbGZOs966NUvg=2Nq%l>(d4O2 z=O?!@PYA9OD@d%&P0cIO&o9md(xtjdiN%@8K&45gm1#w(sZe1Qb;*fEDOl8jg#9#y zCQGtxWGdpHe2+z31LTog0zjkUL1x864MPJc zQ}y$UGjmh(N^kK2ML+^j{^SYF6Pf)q1t*uVY}CI6QXUVIjfYAXfgE&8Ff%W+Br~xj zH9k2bH90%Kw4_J~C_XujwJJy%$N)L0_&<>Nz|6?Vc$Y!uE`#t#E(TW43!JhuO0UbC zU6ePwVC#Q{CEz9tM~C!;)azmz7sWJIR9#`Q0*OdYaJ?>~c~L}j1IHB>%gIJ;*+SAY lLa)mjUz9bzVC8j%#T%$<@@zI!-m(v>!u(8)+(n8&+W_N7W#a$< diff --git a/osinaweb/customercore/__pycache__/views.cpython-312.pyc b/osinaweb/customercore/__pycache__/views.cpython-312.pyc index 0e8a7865f0a4a00c95e8fb8474164ecfcc60fe11..df8fa745e3f0f61c2bc09a06823f77f6a721b83d 100644 GIT binary patch delta 3185 zcmd^BT}&I<6`nix_-|(XH?{%W#O5b}NrAFTcL^c8n*a;xZj$Y?6;=8`jb{RO3`Tdx zDkej4t5h4RR)pSFNq31h*=;LOP#X!gFI6A5shX84RaitdvUpfkkyfj!+a#n)RaI*5 z8Dod8`re0LX}&r4oO93IpYNPIH->*c>ioSZIvCm>|El#uB)aUZMegO+Pda5rHm3vU z0}3yDt}wU3gSPWEviAyezE+kf*2zAK!JIkf-|R%6vS^*un%}b2Q9m3aKQXtXhRrSW zT}1V7TfSq7fIdnh)&{->#8!Yd@~Sn4j%;SFVT3x!4{W#WT~z-neN^%1wAMMPO{HTNY^FvW0}tmLN+OGKa(bd4Trpkz0$n}WA$*L(0=QWr>R3`X!s26K zc2Q7a5m9K^ZMf}!2lvt5MQ|9RkY^t7;ng>9PTc1^^8>qLs3wG;fLR z+u{rPR~}jzZ(v8Nvp?cYE=zvsiDUDZ{5ixyh*{zgr`V{OhI!>DCQv)zPlG!LjAPI@%66I&??MOO{QN ziPwBEgiY1Z&r2Sg&TZIl?;rKNpbO-^y08T?x{wMQ{-PExf1;)`gJ*AD(Cr(J>S(9# zgwcJ7k$D{%To81#F6z82%1+rOyLHpMjO@`xz#E+GT@~hCc18md8!Z)uNkt^xwc)FV zb!$x(yX@E9sb+GkP9oE8yP0-cU;rPu*hUZejA5jUlsp>n#b|QP6-M`@j({Ke%oXOm zy4Tox=~!KLA0@4$>L1jlB$5Lgp~?hCm;)0C8{aHXz(I2>=Z?fWD`T4(e0bh>z&ol} zmw_0qgM8?2;C+{UBaF<<(>M8xJKl|t)8QqXL4F|Z^UyV)%}gsaF@m&%A@^f!iOXPF z!MKN9@GCvS{#NE^+t@8nwc(f=}cT!OXl&6oGY0o z6wOE_NF4_Ef*W7{@(fNU6nu#6`bGm^2crdy_QBbNGNUCk(=k6e?SHYus6(S*hiPLd zDdp_tj4&mx9On$^Q)Jcuk{hZ@2`Q?dz9IR@C;oQF0`27KqyCkI0&U3$ylbg}< zN_siH%{S!-cAVa&$;HWQxou}derU%fEzK^@UUzJ}n)1Wo-M83RXRAT$<*mV(f-HoPUYYztq?5AFz_qEKHD>hptSI*>&5WGC>?=HGUovJFL; z-}N?Ayce+#i>7;R!C{-}BNkElBO5m?ZvMUIZ!9`ZJ_}Bw6d4UY-&?XyDsg%YD*hUs ze#wFrHJjE-){(FF_YaPYV91gf!m$2N4;gaFEXQ*yt=)G+ZC{B~6&?rp28B7ky1l*8 zm>ff(bJ@|z4!HC1A}Ek?v?XUEt7@4k1si#;u6xS?uY=!@0Nw$Bb>nvd zs%$xmC!uc;qIy~4w?KClz@X3+NYen{qp)rv-3@iejfvzyd5MAw6oM43+>q|^Y;NoV zR+O>*eZW7Z9v_42Q<7_#TM)fVXBN*Cg=j&D?nuFvzU986)K!qWc0A#S93wXDF(%QH zAAI6qyrH6}vEXSedSV4nY{%{2bwz*dTN}IYI=rNHODI>pz&3h+`SAQ9m<1IQ1zN^30BNhEtfdr*t$oo9Ua{>QRyK_k84e+eNSMJ@G+`=#P*=q(7qAG W$Ft}VI)xs;f+DD8Zy3;^|GxphjM~Bg delta 1853 zcmZ8iU2GIp6rMXj`#1al*WK=RyM_Ku>y`ycF|a8Olm!ySXo*!sn=N-}ciru_cc+2Y zS!onwzyQUY7^0xn#3*UinDs$lOoYgbiJ`%yW@3mBCWa>pXkv^H-ZRVA>PhySbIGt??v zs03>nbcaU@?G)dzL>PlK)0)_WlC|67b;Rr+T3)v#z}`wz);75v)DD17`kYlkO6@gk z9HCyiX!`)A=pOquw1rBJYmRM^QbCl67!g%b6C)YC853= z<`nVJRb=paY>0VHEzLQnaxKHr-b6(R)&J9C1wb*UcNTYS)6WzqyU9?hXU>d`WY z!wwzkEN3k1qHf1d?80vB!CqZ>m%~2Y4tPbv{>#p)Z0EG5M&v>S(rgXr@^WxJuv3dQ z{5YgL3vrfmfPU(;^SYBRbOpEJ@JrpS^iP1V!Tk4Gb!lyl6>d7s>8`?NcneMW;*wi; z7p$<_5nZpDM}rlEL={NqQZO*bao$gDgYq$NIdDKt&&>;Gl?hWlnQTk?Rydy}UbOfqmSSQpR+gUM$ zaaF6gv3a*z=%eA0@H4=(0MEYf%(9{_EP%1yi7M}Uvi zijO^$N&0OfM5mhqjv2PBvR~y3dcLW<_ZN5QLitR2)!nw@Zd>fV|0 zvb$AjYLo#UWF1xbN{AyhP? zc+3$&N?;uWfZJ~fGo(n&GMd>=(|jU{%Jgia4{7x4#8&AnV|`h>oA?aL5D=!#gQKYS zNm4?{MW;OR0k~cpZnB`k5tzaT+QX^9+APqpVtd2N#+-xxxhdmSB(j^i4M{EK@5AZDJNS>CCQyb2pronX$?-lCL)eB03nwiE>F*9Cg|`W+CSRE&xEUkp%#=YAR^Q z0bXUWJ~MMu`B7E{!v+e@X*n{@+?AgHPEPOG%
-

Invoices

+

Invoices

diff --git a/osinaweb/customercore/templates/listing_pages/customer-orders.html b/osinaweb/customercore/templates/listing_pages/customer-orders.html index 5a091f30..891afe32 100644 --- a/osinaweb/customercore/templates/listing_pages/customer-orders.html +++ b/osinaweb/customercore/templates/listing_pages/customer-orders.html @@ -5,7 +5,7 @@
-

My Orders

+

My Orders

diff --git a/osinaweb/customercore/templates/listing_pages/products.html b/osinaweb/customercore/templates/listing_pages/products.html index 00976714..1e37cd5c 100644 --- a/osinaweb/customercore/templates/listing_pages/products.html +++ b/osinaweb/customercore/templates/listing_pages/products.html @@ -67,9 +67,11 @@
- +
diff --git a/osinaweb/customercore/templates/payment.html b/osinaweb/customercore/templates/payment.html index fb3da4fb..c7b23be0 100644 --- a/osinaweb/customercore/templates/payment.html +++ b/osinaweb/customercore/templates/payment.html @@ -16,7 +16,36 @@
diff --git a/osinaweb/customercore/templates/products/osicard-plans.html b/osinaweb/customercore/templates/products/osicard-plans.html index 7ede451d..d840ca9c 100644 --- a/osinaweb/customercore/templates/products/osicard-plans.html +++ b/osinaweb/customercore/templates/products/osicard-plans.html @@ -13,7 +13,7 @@ -
@@ -123,7 +131,7 @@
-

Invoices

+

Invoices

diff --git a/osinaweb/osinacore/templates/customer_main.html b/osinaweb/osinacore/templates/customer_main.html index 370de6cf..bd445bd5 100644 --- a/osinaweb/osinacore/templates/customer_main.html +++ b/osinaweb/osinacore/templates/customer_main.html @@ -450,11 +450,14 @@ {% endblock modules_section %} - - {% block content %} - replace me - {% endblock content %} + +
+ {% block content %} + replace me + {% endblock content %} +
+
diff --git a/osinaweb/osinacore/templates/details_templates/business-details.html b/osinaweb/osinacore/templates/details_templates/business-details.html index 51718b37..6511ae69 100644 --- a/osinaweb/osinacore/templates/details_templates/business-details.html +++ b/osinaweb/osinacore/templates/details_templates/business-details.html @@ -81,7 +81,7 @@ -
 diff --git a/osinaweb/osinacore/templates/listing_pages/customers.html b/osinaweb/osinacore/templates/listing_pages/customers.html index d115ec10..d3f3a388 100644 --- a/osinaweb/osinacore/templates/listing_pages/customers.html +++ b/osinaweb/osinacore/templates/listing_pages/customers.html @@ -5,7 +5,7 @@
-

Customers

+

Customers

 - {% for customer in customers %} - - {% if customer.status == 'Active' %} - - {% endif %} - - {% if customer.status == 'Terminated' %} - - {% endif %} - - {% if customer.status == 'Suspended' %} - - {% endif %} - diff --git a/osinaweb/osinacore/templates/listing_pages/daily-reports.html b/osinaweb/osinacore/templates/listing_pages/daily-reports.html index d42c4cf5..f85c2ac4 100644 --- a/osinaweb/osinacore/templates/listing_pages/daily-reports.html +++ b/osinaweb/osinacore/templates/listing_pages/daily-reports.html @@ -4,7 +4,7 @@
-

{% if request.user.is_superuser %}Daily Reports{% else %} My Daily Reports{% endif%}

+

{% if request.user.is_superuser %}Daily Reports{% else %} My Daily Reports{% endif%}

-

Notes

+

Notes

diff --git a/osinaweb/osinacore/templates/listing_pages/project-types.html b/osinaweb/osinacore/templates/listing_pages/project-types.html index 8c2e6e87..4080dff0 100644 --- a/osinaweb/osinacore/templates/listing_pages/project-types.html +++ b/osinaweb/osinacore/templates/listing_pages/project-types.html @@ -5,7 +5,7 @@
-

Project Types

+

Project Types

-

{{type.name}}

+

{{type.name}}

 diff --git a/osinaweb/osinacore/templates/listing_pages/businesses.html b/osinaweb/osinacore/templates/listing_pages/businesses.html index 4ed77f8e..9c1d5fcc 100644 --- a/osinaweb/osinacore/templates/listing_pages/businesses.html +++ b/osinaweb/osinacore/templates/listing_pages/businesses.html @@ -6,7 +6,7 @@
-

Businesses

+

Businesses

-

{{business.name}}

+

{{business.name}}

 -

{{business.customer.user.first_name}} {{business.customer.user.last_name}}

+

{{business.customer.user.first_name}} {{business.customer.user.last_name}}

 -

{{business.type.name}}

+

{{business.type.name}}

-

{{customer.user.first_name}} +

{{customer.user.first_name}} {{customer.user.last_name}}

 -

{{customer.user.username}}

+

{{customer.user.username}}

 -

{{customer.status}}

- 		+ +

{{customer.status}}

 -

{{customer.status}}

- 		{% if customer.business_set.all %} {% for business in customer.business_set.all %} -

{{business.name}}

+

{{business.name}}

{% endfor %} {% else %} -

None

+

None

{% endif %} 		-

{{type.name}}

+

{{type.name}}

 @@ -74,7 +74,7 @@ - -

{{reference.name}}

+

{{reference.name}}

 -

{{reference.formatted_date}}

+

{{reference.formatted_date}}

 @@ -82,7 +82,7 @@ - -

{{position.name}}

+

{{position.name}}

 @@ -75,7 +75,7 @@ - -

{{staff.user.email}}

+

{{staff.user.email}}

 @@ -95,12 +95,12 @@ user-image -

{{staff.user.first_name}} {{staff.user.last_name}}

+

{{staff.user.first_name}} {{staff.user.last_name}}

 -

{{staff.user.email}}

+

{{staff.user.email}}

 diff --git a/osinaweb/osinacore/templates/listing_pages/tags.html b/osinaweb/osinacore/templates/listing_pages/tags.html index 4daa3566..a355ac2c 100644 --- a/osinaweb/osinacore/templates/listing_pages/tags.html +++ b/osinaweb/osinacore/templates/listing_pages/tags.html @@ -5,7 +5,7 @@
-

Tags

+

Tags

 -

{{tag.name}}

+

{{tag.name}}

 @@ -74,7 +74,7 @@ -