Skip to content

Commit

Permalink
Language updates and Bug fixes to user managment.
Browse files Browse the repository at this point in the history
  • Loading branch information
@usmannasir
usmannasir committed Oct 30, 2017
1 parent 6cc8ba2 commit 897a850
Show file tree
Hide file tree
Showing 17 changed files with 391 additions and 227 deletions.
4 changes: 2 additions & 2 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,8 @@ python install.py [IP Address]

# Resources

* [Official Site.](http://cyberpanel.net)
* [Documentation.](http://docs.cyberpanel.net)
* [Official Site.](https://cyberpanel.net)
* [Documentation.](https://docs.cyberpanel.net)
* [Forums.](https://forums.cyberpanel.net)


1 change: 0 additions & 1 deletion baseTemplate/static/baseTemplate/custom-js/system-status.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ app.controller('adminController', function($scope,$http,$timeout) {
$("#remoteBackups").hide();
$("#packageHome").hide();
$("#packageSub").hide();
$("#createWebsite").hide();

}
}
Expand Down
144 changes: 135 additions & 9 deletions baseTemplate/templates/baseTemplate/homePage.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@ <h2>{% trans "Home" %}</h2>



<!--- Hide statistics for non-admins--->
{% if type < 3 %}

<div ng-controller="homePageStatus" class="panel">
<div ng-controller="homePageStatus" class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Usage" %}
Expand Down Expand Up @@ -164,6 +164,8 @@ <h3 class="title-hero">
{% trans "Available Functions" %}
</h3>

{% if type == 1 %}
<!--- If type is admin--->
<div class="example-box-wrapper">


Expand Down Expand Up @@ -286,7 +288,7 @@ <h3 class="title-hero">
</a>
</div>

{% if type == 1 %}

<div class="col-md-4">
<a href="{% url 'loadTuningHome' %}" title="{% trans 'Server Tuning' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">2</span>
Expand All @@ -299,7 +301,7 @@ <h3 class="title-hero">
</a>
</div>

{% endif %}




Expand All @@ -309,7 +311,7 @@ <h3 class="title-hero">

<div class="row">

{% if type == 1 %}


<div class="col-md-4">
<a href="{% url 'serverStatusHome' %}" title="{% trans 'Server Status' %}" class="tile-box tile-box-shortcut btn-primary">
Expand Down Expand Up @@ -348,7 +350,7 @@ <h3 class="title-hero">
</a>
</div>

{% endif %}




Expand All @@ -357,7 +359,7 @@ <h3 class="title-hero">

<div class="row">

{% if type == 1 %}


<div class="col-md-4">
<a href="{% url 'securityHome' %}" title="{% trans 'Security' %}" class="tile-box tile-box-shortcut btn-primary">
Expand All @@ -371,15 +373,139 @@ <h3 class="title-hero">
</a>
</div>

</div>
</div>
<!--- If type is admin--->

{% else %}

{% endif %}
<!--- If type is user--->
<div class="example-box-wrapper">


<div class="row">

<div class="col-md-4">
<a href="{% url 'loadUsersHome' %}" title="{% trans 'User Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">4</span>
<div class="tile-header">
{% trans "Users" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>


<div class="col-md-4">
<a href="{% url 'loadWebsitesHome' %}" title="{% trans 'Website Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">5</span>
<div class="tile-header">
{% trans "Websites" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>


<div class="col-md-4">
<a href="{% url 'loadDatabaseHome' %}" title="{% trans 'Database Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">3</span>
<div class="tile-header">
{% trans "Databases" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>



</div>





<div class="row">


<div class="col-md-4">
<a href="{% url 'dnsHome' %}" title="{% trans 'Control DNS' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">4</span>
<div class="tile-header">
{% trans "DNS" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>


<div class="col-md-4">
<a href="{% url 'loadFTPHome' %}" title="{% trans 'FTP Functions' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">2</span>
<div class="tile-header">
{% trans "FTP" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>

<div class="col-md-4">
<a href="{% url 'loadBackupHome' %}" title="{% trans 'Back up' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">2</span>
<div class="tile-header">
{% trans "Back up" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>



</div>

<div class="row">



<div class="col-md-4">
<a href="{% url 'loadEmailHome' %}" title="{% trans 'Emails' %}" class="tile-box tile-box-shortcut btn-primary">
<span class="bs-badge badge-absolute">4</span>
<div class="tile-header">
{% trans "Emails" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>




</div>

</div>
</div>
<!--- If type is user--->


{% endif %}


</div>

</div>
</div>


Expand Down
4 changes: 2 additions & 2 deletions install/install.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -601,7 +601,7 @@ def download_install_CyberPanel(self,mysqlPassword):
cmd = []

cmd.append("wget")
cmd.append("http://cyberpanel.net/CyberPanel.1.4.tar.gz")
cmd.append("http://cyberpanel.net/CyberPanel.1.5.tar.gz")

res = subprocess.call(cmd)

Expand All @@ -620,7 +620,7 @@ def download_install_CyberPanel(self,mysqlPassword):

cmd.append("tar")
cmd.append("zxf")
cmd.append("CyberPanel.1.4.tar.gz")
cmd.append("CyberPanel.1.5.tar.gz")

res = subprocess.call(cmd)

Expand Down
Binary file modified locale/cn/LC_MESSAGES/django.mo
View file
Binary file not shown.
Loading

0 comments on commit 897a850

Please sign in to comment.