Added Services Page, Bug fix to Website Creation!

This commit is contained in:
usmannasir
2018-01-13 21:41:22 +05:00
parent db9195540e
commit 024783b2a3
30 changed files with 723 additions and 36 deletions

View File

@@ -51,7 +51,7 @@
<div class="form-group">
<label class="col-sm-3 control-label">{% trans "Domain Name" %}</label>
<div class="col-sm-6">
<input ng-pattern="/([\da-z\.-]+\.[a-z\.]{2,6}|[\d\.]+)([\/:?=&#]{1}[\da-z\.-]+)*[\/\?]?$/i" name="dom" type="text" class="form-control" ng-model="domainNameCreate" placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>
<input ng-pattern="/*/i" name="dom" type="text" class="form-control" ng-model="domainNameCreate" placeholder="{% trans "Do not enter WWW, it will be auto created!" %}" required>
</div>
<div ng-show="websiteCreationForm.dom.$error.pattern" class="current-pack">{% trans "Invalid Domain (Note: You don't need to add 'http' or 'https')" %}</div>
</div>

View File

@@ -16,12 +16,59 @@
<div class="panel">
<div class="panel-body">
<h3 class="title-hero">
{% trans "Available Functions" %}
</h3>
<div class="example-box-wrapper">
<div class="row">
{% if type == 3 %}
<div class="row">
<div class="col-md-4">
<a href="{% url 'listWebsites' %}" title="{% trans 'List Websites' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "List 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 'modifyWebsite' %}" title="{% trans 'Modify Website' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Modify Website" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
<div class="col-md-4">
<a href="{% url 'deleteWebsite' %}" title="{% trans 'Delete Website' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Website" %}
</div>
<div class="tile-content-wrapper">
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
</div>
{% else %}
<div class="row">
<div class="col-md-4">
<a href="{% url 'createWebsite' %}" title="{% trans 'Create Website' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
@@ -60,11 +107,7 @@
</div>
<div class="row">
{% if viewStatus == 1 %}
<div class="row">
<div class="col-md-4">
<a href="{% url 'siteState' %}" title="{% trans 'Suspend/Unsuspend Website' %}" class="tile-box tile-box-shortcut btn-primary">
@@ -77,10 +120,9 @@
</a>
</div>
{% endif %}
<div class="col-md-4">
<div class="col-md-4">
<a href="{% url 'deleteWebsite' %}" title="{% trans 'Delete Website' %}" class="tile-box tile-box-shortcut btn-primary">
<div class="tile-header">
{% trans "Delete Website" %}
@@ -89,12 +131,14 @@
<i class="glyph-icon icon-dashboard"></i>
</div>
</a>
</div>
</div>
</div>
{% endif %}
</div>
</div>
</div>

View File

@@ -32,12 +32,7 @@ def loadWebsitesHome(request):
admin = Administrator.objects.get(pk=val)
viewStatus = 1
if admin.type == 3:
viewStatus = 0
return render(request,'websiteFunctions/index.html',{"viewStatus":viewStatus})
return render(request,'websiteFunctions/index.html',{"type":admin.type})
except KeyError:
return redirect(loadLoginPage)
@@ -50,6 +45,12 @@ def createWebsite(request):
packages = admin.package_set.all()
packagesName = []
if admin.type == 3:
final = {'error': 1, "error_message": "Not enough privilege"}
final_json = json.dumps(final)
return HttpResponse(final_json)
for items in packages:
packagesName.append(items.packageName)