From 658095ff164a0093593277979e25fe75972dc89e Mon Sep 17 00:00:00 2001 From: nataly Date: Wed, 20 Sep 2023 17:05:47 +0300 Subject: [PATCH] New changes. --- osinaweb/db.sqlite3 | Bin 339968 -> 344064 bytes .../__pycache__/views.cpython-311.pyc | Bin 25004 -> 27608 bytes osinaweb/osinacore/views.py | 77 +++++- .../osinaweb/__pycache__/urls.cpython-311.pyc | Bin 5498 -> 6404 bytes osinaweb/osinaweb/urls.py | 8 + osinaweb/static/dist/output.css | 17 +- osinaweb/static/images/default-user.png | Bin 0 -> 2383 bytes osinaweb/static/js/pop-modals.js | 26 +- osinaweb/templates/add-business.html | 2 +- osinaweb/templates/add-customer.html | 41 +-- osinaweb/templates/add-user.html | 86 ++++-- osinaweb/templates/addbusiness-modal.html | 111 ++++++++ osinaweb/templates/addprojecttype-modal.html | 31 +++ osinaweb/templates/addreference-modal.html | 31 +++ osinaweb/templates/addtag-modal.html | 31 +++ osinaweb/templates/create-project.html | 30 +- osinaweb/templates/create-task.html | 18 +- osinaweb/templates/createtask-epic.html | 20 +- osinaweb/templates/createtask-project.html | 18 +- osinaweb/templates/index.html | 21 +- osinaweb/templates/main.html | 62 +++-- osinaweb/templates/project-details.html | 6 +- osinaweb/templates/project-types.html | 252 +++++++++++++++++ osinaweb/templates/references.html | 258 ++++++++++++++++++ osinaweb/templates/showpoints-modal.html | 35 --- osinaweb/templates/tags.html | 252 +++++++++++++++++ osinaweb/templates/task-details.html | 62 ++++- osinaweb/templates/user-details.html | 32 ++- osinaweb/templates/users.html | 2 +- 29 files changed, 1328 insertions(+), 201 deletions(-) create mode 100644 osinaweb/static/images/default-user.png create mode 100644 osinaweb/templates/addbusiness-modal.html create mode 100644 osinaweb/templates/addprojecttype-modal.html create mode 100644 osinaweb/templates/addreference-modal.html create mode 100644 osinaweb/templates/addtag-modal.html create mode 100644 osinaweb/templates/project-types.html create mode 100644 osinaweb/templates/references.html create mode 100644 osinaweb/templates/tags.html diff --git a/osinaweb/db.sqlite3 b/osinaweb/db.sqlite3 index df2bfa4fe69f3dd3018cbc9c8fb6caee1f9ec528..b86864c91eca24ffe76a60db7243097e73c12810 100644 GIT binary patch delta 5433 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 delta 1173 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 Giv9t!>ECex diff --git a/osinaweb/osinacore/views.py b/osinaweb/osinacore/views.py index c30d778e..df1b7642 100644 --- a/osinaweb/osinacore/views.py +++ b/osinaweb/osinacore/views.py @@ -13,6 +13,7 @@ from django.http import JsonResponse from .models import Task, Epic + # Pages views def signin(request): @@ -282,10 +283,32 @@ def detailed_task(request, task_id): return render(request, 'task-details.html', context) +@login_required +def project_types(request): + + context = { + + + } + return render(request, 'project-types.html', context) +@login_required +def references(request): + + context = { + + + } + return render(request, 'references.html', context) + +@login_required +def tags(request): + context = { + } + return render(request, 'tags.html', context) @@ -361,6 +384,30 @@ def update_status_modal(request, *args, **kwargs): } return render(request, 'update-status-modal.html', context) +def add_projecttype_modal(request, *args, **kwargs): + context = { + + } + return render(request, 'addprojecttype-modal.html', context) + +def add_reference_modal(request, *args, **kwargs): + context = { + + } + return render(request, 'addreference-modal.html', context) + +def add_tag_modal(request, *args, **kwargs): + context = { + + } + return render(request, 'addtag-modal.html', context) + +def add_business_modal(request, *args, **kwargs): + context = { + + } + return render(request, 'addbusiness-modal.html', context) + @@ -577,10 +624,36 @@ def save_business(request): phone_number = phone_number, ) business.save() + + return render(request, 'add-business.html') + +@login_required +def save_business_modal(request): + if request.method == 'POST': + name = request.POST.get('name') + email= request.POST.get('email') + financial_number = request.POST.get('financial_number') + phone_number = request.POST.get('phone_number') + vat = request.POST.get('vat') + commercial_registration = request.POST.get('commercial_registration') + website = request.POST.get('website') + business_type = request.POST.get('business_type') + logo = request.POST.get('logo') + business = Business( + name = name, + email = email, + financial_number = financial_number, + vat = vat, + commercial_registration = commercial_registration, + website = website, + business_type = business_type, + logo = logo, + phone_number = phone_number, + ) + business.save() - - return render(request, 'add-business.html') + return render(request, 'addbusiness-modal.html') def save_customer(request): diff --git a/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc b/osinaweb/osinaweb/__pycache__/urls.cpython-311.pyc index 658ea88b59a7272bc06392a3b963125249ba9883..bd506fa8f0bb3408e845091c150f9e3bedb67408 100644 GIT binary patch delta 1607 zcmZ{j&r@1g6vu%cpoqv1K?G5n&KL!YC?*l9&S211<1{Tzg{V-1@HARQ=K<}M$&4;K z(=JJ0Cc|{)s-@E|$k;`e?WWtl*SRZp{SRK3&8EHQz8Ao0@|bttx!=#Z=iGblB2Z}yrEMzR z=tw&#WvFzsBV|$gluEZcQVyjDRGRNdd6agk6zxa_Dg}yETIfjJ&!+F+&}e?5ukt+B zZpVsy_cVe1%clmv{ zW=!~f;Q3kGMXTm|_NF9ei^+9%q>8x99NmdJbl~vng7^@oo<0e14x5v;fbb;1eV3M9T74TWC&#BDdg{{+}l_s zzF9H4Cc?S|>jc*25b|l2k6%>DMC@0;2uTT&1d?(%YCY4*GfH)TW1M(Ht-B&5BuEfQ z$g?;*qENQB$>t*w7A06Duqe+Vy`fNdef&xA;+6R-@12S^4T!;tsVox*cEEV!&-0fZSW(B(6Y<9%f8}7=f6aV0`7Ze3kL{ zgx26l;(g|?sj+OEbI+%{O<>s92uHw1-pl^K~JjW^mDkPyRWVIAfGahmb_DyKJ{I47D9MVOahp1{1k#rU?u zMHB1)f*9WvAtgbIKuX?W5f22(Ic&@`e^+?s^cV}wFEX8D{vPx9ng39jad`s=%s;%6 f{p#s{#v+a|+IY0kIik%;iG delta 793 zcmZ{iF=!J}7{_zrOOsfVl;+N+m!wgG?In#Ga)@wE(llwSX{$kNbF~^BY#qcYA}ENh z;LtI08M3L1?Re6`;^O8eya#V|aBy;Zn;;6l_a&$Zz2pA;zxVs@``^90=Y=2H@Lni% z%p;Cp_2Aam(2H=)dvEBiad#-NQP^y*dNTIGM}Nw9V1zWqc^7`>+=Dg4vul+ZWmKjHefXi}^M)Ra&|m3~o86~#=hdwfALHQDpA zn6dwaK#@X`L6OHLP4ubWS?jj;#|fAeOa>-T=AG9#=7TE3KjYw^>V)udO{%5IkabN4 zK0@tj6WelR0Y{Qx>XpV$T4b(Cz@}g`u(>I@)sIYc9/', views.createtask_project, name='createtaskproject'), path('createtaskepic/', views.createtask_epic, name='createtaskepic'), path('taskdetails//', views.detailed_task, name='detailed-task'), + path('projecttypes/', views.project_types, name='projecttypes'), + path('references/', views.references, name='references'), + path('tags/', views.tags, name='tags'), path("fetch_related_tasks/", views.fetch_related_tasks, name="fetch_related_tasks"), @@ -57,6 +60,10 @@ urlpatterns = [ path('addtime/', views.add_time_modal, name='addtime'), path('timeline/', views.timeline_modal, name='timeline'), path('deletetask/', views.delete_task_modal, name='deletetask'), + path('addprojecttype/', views.add_projecttype_modal, name='addprojecttype'), + path('addreference/', views.add_reference_modal, name='addreference'), + path('addtag/', views.add_tag_modal, name='addtag'), + path('addbusinesscustomer/', views.add_business_modal, name='addbusinesscustomer'), # Save Urls path('save_note/', views.save_note, name='save_note'), @@ -64,6 +71,7 @@ urlpatterns = [ path('save_epic/', views.save_epic, name='save_epic'), path('save_task/', views.save_task, name='save_task'), path('save_business/', views.save_business, name='save_business'), + path('save_business_modal/', views.save_business_modal, name='save_business_modal'), path('save_customer/', views.save_customer, name='save_customer'), path('save_status/', views.save_status, name='save_status'), ] diff --git a/osinaweb/static/dist/output.css b/osinaweb/static/dist/output.css index 4bf46954..f95c28a4 100644 --- a/osinaweb/static/dist/output.css +++ b/osinaweb/static/dist/output.css @@ -840,6 +840,10 @@ video { height: 70px; } +.h-\[80px\] { + height: 80px; +} + .h-fit { height: -moz-fit-content; height: fit-content; @@ -993,8 +997,8 @@ video { width: 55%; } -.w-\[55px\] { - width: 55px; +.w-\[60\%\] { + width: 60%; } .w-\[60px\] { @@ -1009,6 +1013,10 @@ video { width: 80%; } +.w-\[80px\] { + width: 80px; +} + .w-\[95\%\] { width: 95%; } @@ -1489,6 +1497,11 @@ video { padding-right: 1.25rem; } +.px-6 { + padding-left: 1.5rem; + padding-right: 1.5rem; +} + .px-8 { padding-left: 2rem; padding-right: 2rem; diff --git a/osinaweb/static/images/default-user.png b/osinaweb/static/images/default-user.png new file mode 100644 index 0000000000000000000000000000000000000000..d0220395cfa1df3a8a28f9dfc23076c582c9f26b GIT binary patch literal 2383 zcmV-V39$BwP)(Gi?p#bRc#Ss^h2+4Gh#^^nLX;m_BC;DKKQz$<4_I$_v+NEtyYr)8 zcW<(vsx49pnSS%WdHuR)x?it(^5hAW(T5jHMT>-C)B*s0ngC!UeLMGSi#Y%ovwc0; z6^~EKx7t5iMo7Xi(8(S2L8rG1y7UkUG>D(BczjOKb%mjgAPK`j#~-0jqoih&Bu-yf zJU-^(|Fff15Q>CO0O$sQm@-42k^+EU5=U9&C=rCB0Yx}2y>V~!qc|#}MyenQ!@!)- zBQPg$gE^*UHWFK}FxqGEIfiUD*_qjZnL5gH*hj2$SUq#YJa`bR_#lZ8bHbx~uh zNDQER9iw{}f{+NI;p~8n#9g^@BSbbwpsFeg732w;FmzLncgEVBO zGcY?RWsWybkrH}%99ocsVc<;r%dmzNV(m+7Vf(gi(A?YvuWj(B`Cs$%FgiL0ckbSW z$NxR%G!r?|6_59Yxj-mEWQftYrvaK${81eH0XuxwcFs}CkMGMZ*uP2b8u(!E@u-*yW;Ty zzrW;L5E@YoawYJ+Ev?YTt^s#kSIQi2dIxNr@w26_E zN2njYFCf_Oh#sNc|Nxb;yPgw&BDThtfqV;*|t2NX9b~*FKy}P;=lix3l4Mx zZ9>~5(wIBi%8d|d(P42fbx%7%6xo#ZeXbzFmP2~w*6rJ}n=FbVo3g%FDoEzxv{u~~ z+JZJIz)=t-i=>B#e^Ak^BMNQF`rZ^o{iB-NqBqrZg{6*kMD@V zi1>N@I{b3uhU|xifhdWJa_Gpb*G9|_Zd-^(qwxBsH_U(S0$Dq8A3glj{8!hm$&HdJ z@n?Y!E;T3n!5U>rD?e1m6;lJP<{@RCby?aJgT!T=vQ{-JderWQsevVkvI3B}m8_{!U@{WEQ+HbER#bF`BE0c z0`Gyb`^x%0D+tx3O^R#<6F8PwS}EYYFl={A=GFtY&(wuRNn=ApN#%@U;Jx5I2`10y zc0q(yY`}Sj%*sBpz-O zXWcGQx#T%tvk3BLb#>TFXbnDY5p<8m1)+@JAEuS6Xf({PmjnXtvES*m1-JJhp`v8d zX4W!CTCg>?HLMwqK6Vs@Dl`XvwiSs+g8pjB5OO#_b+c&!r&bwacu#PHW&trG|l zB|6tI5zYGb>w{d;H9Ekq*oCIeOgcu8U>tM?H&}!sbc3?d0BPRD{A(>%1ITg zCI?;wq0?i^T~~NIy`043Xo$1oYP(pd-1$bj*g2H`o3h9fbTmzS6K49a!szHOgaNMZ{CEd zsVTQTg+mk(()RI76~uys!Gw6&>E|d;BocvGY^zy5LsYkh0z90ah6m|1WHOmT8#}+o zh?XgYg%Uw5Xqenh$2Pbg0$}Z3k4BzGPF3}myr1LgYS{PZKFU~LT7sEJGw}Dq0xT{r zdfAhnq9J>)$YHEslnRmy<(bZ6;t0kPp-)DB@Pamip5K_pco}1$f^JU{s+nge;!QsS_J?A002ovPDHLkV1mN6 Bcs~FD literal 0 HcmV?d00001 diff --git a/osinaweb/static/js/pop-modals.js b/osinaweb/static/js/pop-modals.js index 266177e5..b94d7e95 100644 --- a/osinaweb/static/js/pop-modals.js +++ b/osinaweb/static/js/pop-modals.js @@ -1,5 +1,5 @@ document.addEventListener("DOMContentLoaded", function () { - + // Function to open a modal with dimensions function openModalWithDimensions(url, width, height) { const modalUrl = url; openModal(modalUrl); @@ -9,6 +9,7 @@ document.addEventListener("DOMContentLoaded", function () { iframe.style.width = width; } + // Function to open a modal function openModal(url) { const modalContainer = document.getElementById("popUpModal"); const iframe = document.getElementById("popupModalFrame"); @@ -19,6 +20,7 @@ document.addEventListener("DOMContentLoaded", function () { modalContainer.style.display = "flex"; } + // Function to close the modal function closeModal() { const modalContainer = document.getElementById("popUpModal"); const iframe = document.getElementById("popupModalFrame"); @@ -29,27 +31,32 @@ document.addEventListener("DOMContentLoaded", function () { modalContainer.style.display = "none"; } - function addButtonClickListener(buttonId, width, height) { - const button = document.getElementById(buttonId); - if (button) { + // Function to add a click listener to buttons by class name + function addButtonClickListener(className, width, height) { + const buttons = document.querySelectorAll(`.${className}`); + buttons.forEach(button => { button.addEventListener("click", () => { const modalUrl = button.getAttribute("data-modal-url"); openModalWithDimensions(modalUrl, width, height); }); - } + }); } - // Add button click listeners with dimensions + // Add button click listeners with dimensions for specific class names addButtonClickListener("addStatusButton", "450px", "200px"); addButtonClickListener("addNoteButton", "400px", "225px"); - addButtonClickListener("addFileButton", "500px", "320px"); - addButtonClickListener("addCredentialsButton", "500px", "300px"); addButtonClickListener("updateStatusButton", "fit-content", "160px"); addButtonClickListener("showPointsButton", "600px", "450px"); addButtonClickListener("addPointButton", "500px", "225px"); addButtonClickListener("timelineButton", "600px", "450px"); addButtonClickListener("addTimeButton", "300px", "270px"); addButtonClickListener("deleteTaskButton", "fit-content", "130px"); + addButtonClickListener("addFileButton", "500px", "320px"); + addButtonClickListener("addCredentialsButton", "500px", "300px"); + addButtonClickListener("addProjectTypeButton", "fit-content", "160px"); + addButtonClickListener("addReferenceButton", "fit-content", "160px"); + addButtonClickListener("addTagButton", "fit-content", "160px"); + addButtonClickListener("addBusinessButton", "550px", "500px"); const closeButton = document.getElementById("closeModalButton"); closeButton.addEventListener("click", () => { @@ -62,7 +69,4 @@ document.addEventListener("DOMContentLoaded", function () { closeModal(); } }); - - // TO RELOAD THE TOP WINDOW AFTER ADDING - // window.top.location.reload(); }); diff --git a/osinaweb/templates/add-business.html b/osinaweb/templates/add-business.html index 639bc57a..62534e46 100644 --- a/osinaweb/templates/add-business.html +++ b/osinaweb/templates/add-business.html @@ -100,7 +100,7 @@ - + diff --git a/osinaweb/templates/main.html b/osinaweb/templates/main.html index e61ace82..c97b33b8 100644 --- a/osinaweb/templates/main.html +++ b/osinaweb/templates/main.html @@ -31,15 +31,50 @@ Home -
-
- -

Sales

-
-
- + +
+
+
+ +

Utilities

+
+
+ + +
+
+ +
-
@@ -59,7 +94,6 @@
-

Customers

 @@ -67,7 +101,6 @@
-

Businesses

 @@ -75,8 +108,7 @@
- -

Users

+

Staff Profiles
@@ -100,7 +132,6 @@
-

My Projects

 @@ -108,14 +139,12 @@
-

My Tasks
-

My Tickets

 @@ -180,8 +209,7 @@ class="text-slate-700 font-semibold">Working on Osina

diff --git a/osinaweb/templates/project-details.html b/osinaweb/templates/project-details.html index dc881a8c..de7a028a 100644 --- a/osinaweb/templates/project-details.html +++ b/osinaweb/templates/project-details.html @@ -236,8 +236,7 @@ {%endfor%}
- +
@@ -280,8 +279,7 @@
-
diff --git a/osinaweb/templates/project-types.html b/osinaweb/templates/project-types.html new file mode 100644 index 00000000..5cdccdcb --- /dev/null +++ b/osinaweb/templates/project-types.html @@ -0,0 +1,252 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

+
+
+ + +
+
+ + + +
+
+ + +
+ +
+
+

Project Types

+ + +
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+
+

Project Type

+
+
+ Actions +
+
+ + +
+ +
+
+

Development

+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + +
+

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+ + + + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/references.html b/osinaweb/templates/references.html new file mode 100644 index 00000000..a0cb7f87 --- /dev/null +++ b/osinaweb/templates/references.html @@ -0,0 +1,258 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

+
+
+ + +
+
+ + + +
+
+ + +
+ +
+
+

References

+ + +
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+
+

Reference

+
+
+

Date

+
+
+ Actions +
+
+ + +
+ +
+
+

Nat

+
+
+

28-2-2023

+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + +
+

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+ + + + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/showpoints-modal.html b/osinaweb/templates/showpoints-modal.html index cbb31b20..1cc2a940 100644 --- a/osinaweb/templates/showpoints-modal.html +++ b/osinaweb/templates/showpoints-modal.html @@ -59,41 +59,6 @@ - - diff --git a/osinaweb/templates/tags.html b/osinaweb/templates/tags.html new file mode 100644 index 00000000..94bb8507 --- /dev/null +++ b/osinaweb/templates/tags.html @@ -0,0 +1,252 @@ +{% extends "main.html" %} +{%load static%} +{% block content %} + +
+
+
+
+

Recent Note:

+

Send an Email to Salim.

+
+
+ + +
+
+ + + +
+
+ + +
+ +
+
+

Tags

+ + +
+
+
+ + +
+
+
+ +
+
+ +
+
+ +
+
+

Tag Name

+
+
+ Actions +
+
+ + +
+ +
+
+

Web Development

+
+
+
+ +
+
+ +
+
+
+
+
+
+
+
+ + +
+

USERS ACTIVITY

+
+ + + +
+
+
+
+
+ user profile +
+
+

Nataly

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Salim

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+
+
+ user profile +
+
+

Emile

+

11:30 AM

+
+
+
+ +
+
+ + +
+

Closed - Create the Osina home page

+
+ + +
+ + +
+
+
+ + +
+
+
+ + + + + + + + + + + + + + +{% endblock content %} \ No newline at end of file diff --git a/osinaweb/templates/task-details.html b/osinaweb/templates/task-details.html index c3e501ba..eef1439c 100644 --- a/osinaweb/templates/task-details.html +++ b/osinaweb/templates/task-details.html @@ -56,14 +56,17 @@
-
-

Task Details - Start - with Osina main - page

-
- +
+

Task Name

+
+
+
+ +
@@ -110,7 +113,7 @@

Points:

-
+ +
+
+
+

Fix the LaylNhar Header Lorem ipsum dolor sit amet consectetur, + adipisicing elit. Mollitia, dolorum. Earum error atÍb dol

+
+
+ + +
+
+ +
+
+

Fix the LaylNhar Header

+
+
+ + +
+
+ +
+
+

Fix the LaylNhar Header Lorem ipsum dolor sit amet + consectetur + adipisicing elit. Autem sit esse, cupiditate voluptas, dolorem nisi sunt, molestiae eaque neque + cumque ex amet! Sequi aliquid quos ullam, sapiente iste impedit explicabo?

+
+
+ +
+
diff --git a/osinaweb/templates/user-details.html b/osinaweb/templates/user-details.html index 014f75bd..95d8dba8 100644 --- a/osinaweb/templates/user-details.html +++ b/osinaweb/templates/user-details.html @@ -58,16 +58,13 @@
-
-
-
- user-image -
-
-

Nataly

-
+
+
+
+

Nataly Ab

+
+
+
+

Position: Developer

+
+

First Name: Nataly

@@ -107,7 +108,18 @@

Email: nataly.aw@ositcom.net

- +
+

Mobile Number: 71196733

+
+
+

Active: True

+
+
+

Intern: False

+
diff --git a/osinaweb/templates/users.html b/osinaweb/templates/users.html index 09ff19ce..6397fed2 100644 --- a/osinaweb/templates/users.html +++ b/osinaweb/templates/users.html @@ -75,7 +75,7 @@ + Staff