improvemenst

This commit is contained in:
habi
2022-04-16 15:54:50 +05:00
3 changed files with 18 additions and 8 deletions

View File

@@ -41,7 +41,7 @@
<nav id="navBar" class="navbar navbar-expand-lg navbar-light bg-light"> <nav id="navBar" class="navbar navbar-expand-lg navbar-light bg-light">
<div class="header-logo"> <div class="header-logo">
<a href="/websites/{{ domainName }}"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a> <a href="{% url 'index' %}"><img src="{% static 'filemanager/images/fileManager.png' %}"> <span style="display: none" id="domainNameInitial">{{ domainName }}</span></a>
</div> </div>
<!--- second bar ----> <!--- second bar ---->

View File

@@ -333,12 +333,6 @@
data-original-title=".icon-comments-alt" aria-describedby="tooltip896208"></i> data-original-title=".icon-comments-alt" aria-describedby="tooltip896208"></i>
<span>{% trans "Community" %}</span> <span>{% trans "Community" %}</span>
</a> </a>
<a href="{% url 'Filemanager' %}"
title="{% trans 'FileManager' %}">
<i class="glyph-icon tooltip-button icon-link" title="{% trans 'FileManager' %}"
data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
<span>{% trans "FileManager" %}</span>
</a>
{% endif %} {% endif %}
</li> </li>
@@ -741,6 +735,14 @@
{% if admin %} {% if admin %}
<li class="header"><span>{% trans "Server" %}</span></li> <li class="header"><span>{% trans "Server" %}</span></li>
<li>
<a href="{% url 'Filemanager' %}"
title="{% trans 'FileManager' %}">
<i class="glyph-icon tooltip-button icon-link" title="{% trans 'FileManager' %}"
data-original-title=".icon-cloud-upload" aria-describedby="tooltip896208"></i>
<span>{% trans "FileManager" %}</span>
</a>
</li>

View File

@@ -300,6 +300,7 @@ def getthemedata(request):
def FileManager(request): def FileManager(request):
<<<<<<< HEAD
### Load Custom CSS ### Load Custom CSS
try: try:
from baseTemplate.models import CyberPanelCosmetic from baseTemplate.models import CyberPanelCosmetic
@@ -330,8 +331,15 @@ def FileManager(request):
template = 'baseTemplate/FileManager.html' template = 'baseTemplate/FileManager.html'
else: else:
return redirect("https://cyberpanel.net/adons") return redirect("https://cyberpanel.net/adons")
=======
val = request.session['userID']
currentACL = ACLManager.loadedACL(val)
>>>>>>> d4e55339a16ee8d0b686a3699ac95a485364e69b
if currentACL['admin'] == 1:
pass
else:
return ACLManager.loadErrorJson('FilemanagerAdmin', 0)
proc = httpProc(request, template,) proc = httpProc(request, template,)