Skip to content

Commit

Permalink
Template style tweaks
Browse files Browse the repository at this point in the history
  • Loading branch information
@chrismaddalena
chrismaddalena committed Sep 26, 2019
1 parent 7c5383d commit c755472
Show file tree
Hide file tree
Showing 7 changed files with 23 additions and 19 deletions.
2 changes: 1 addition & 1 deletion ghostwriter/reporting/templates/reporting/finding_form.html
View file
Expand Up @@ -8,7 +8,7 @@
<ul class="breadcrumb" style="margin: 0;">
<li class="breadcrumb-item"><a href="{% url 'home:dashboard' %}">Dashboard</a></li>
<li class="breadcrumb-item"><a href="{% url 'reporting:findings' %}">Findings</a></li>
<li class="breadcrumb-item active" aria-current="page">New Finding</li>
<li class="breadcrumb-item active" aria-current="page">Finding Form</li>
</ul>
</nav>
{% endblock %}
Expand Down
6 changes: 3 additions & 3 deletions ghostwriter/reporting/templates/reporting/report_list.html
View file
Expand Up @@ -62,12 +62,12 @@
<td nowrap>{{ report.last_update }}</td>
{% if report.complete %}
{% if report.delivered %}
<td>Delivered</td>
<td><span class="badge badge-success">Delivered</span></td>
{% else %}
<td>Complete, Awaiting Delivery</td>
<td><span class="badge badge-warning">Awaiting Delivery</span></td>
{% endif %}
{% else %}
<td>In Progress</td>
<td><span class="badge badge-primary">In Progress</span></td>
{% endif %}
<td >{{ report.created_by }}</td>
<td><a href="{% url 'reporting:activate_report' report.id %}"><i style="font-size: 15px" class="far fa-edit"></i></button></td>
Expand Down
3 changes: 1 addition & 2 deletions ghostwriter/rolodex/templates/rolodex/client_form.html
View file
Expand Up @@ -7,8 +7,7 @@
<nav aria-label="breadcrumb" style="padding-left: 20px;">
<ul class="breadcrumb" style="margin: 0;">
<li class="breadcrumb-item"><a href="{% url 'home:dashboard' %}">Dashboard</a></li>
<li class="breadcrumb-item"><a href="{% url 'rolodex:client_detail' client.id %}">{{ client }}</a></li>
<li class="breadcrumb-item active" aria-current="page">Edit</li>
<li class="breadcrumb-item active" aria-current="page">Client Form</li>
</ul>
</nav>
{% endblock %}
Expand Down
2 changes: 2 additions & 0 deletions ghostwriter/rolodex/templates/rolodex/project_list.html
View file
Expand Up @@ -50,6 +50,8 @@
</form>
</div>

<p><strong>Note:</strong> New projects are added under a client! <i class="far fa-smile-wink"></i></p>

{% if filter.qs|length == 0 %}
<p>There are no projects to display.</p>
{% else %}
Expand Down
2 changes: 1 addition & 1 deletion ghostwriter/shepherd/templates/shepherd/domain_form.html
View file
Expand Up @@ -8,7 +8,7 @@
<ul class="breadcrumb" style="margin: 0;">
<li class="breadcrumb-item"><a href="{% url 'home:dashboard' %}">Dashboard</a></li>
<li class="breadcrumb-item"><a href="{% url 'shepherd:domains' %}">Domains</a></li>
<li class="breadcrumb-item active" aria-current="page">New Domain</li>
<li class="breadcrumb-item active" aria-current="page">Domain Form</li>
</ul>
</nav>
{% endblock %}
Expand Down
2 changes: 1 addition & 1 deletion ghostwriter/shepherd/templates/shepherd/server_form.html
View file
Expand Up @@ -8,7 +8,7 @@
<ul class="breadcrumb" style="margin: 0;">
<li class="breadcrumb-item"><a href="{% url 'home:dashboard' %}">Dashboard</a></li>
<li class="breadcrumb-item"><a href="{% url 'shepherd:servers' %}">Servers</a></li>
<li class="breadcrumb-item active" aria-current="page">New Server</li>
<li class="breadcrumb-item active" aria-current="page">Server Form</li>
</ul>
</nav>
{% endblock %}
Expand Down
25 changes: 14 additions & 11 deletions ghostwriter/shepherd/templates/shepherd/update.html
View file
Expand Up @@ -24,15 +24,10 @@ <h2>Domain Update Control Panel</h2>
<h6><i class="fas fa-cloud-download-alt"></i> Pull Domains from Namecheap</h6>
<hr>

<p>Update the domain library by pulling the latest list of domain's from the configured Namecheap account.</p>

{% if enable_namecheap %}
<form action="{% url 'shepherd:update_namecheap' %}" method="POST">
{% csrf_token %}
<input type="hidden" id="user_id" name="user_id" value='{{ user.get_username }}'>
<button class="button">Pull from Namecheap</button>
</form>
{% endif %}
<p>The domain library sync with Mamecheap was last requested on:</p>
<p style="font-size: 20px; padding: 10 10 10 10">
<strong>{{ namecheap_last_update_requested }}</strong>
</p>

{% if namecheap_last_update_completed %}
{% if namecheap_last_update_completed == 'Failed' %}
Expand All @@ -52,6 +47,14 @@ <h6><i class="fas fa-cloud-download-alt"></i> Pull Domains from Namecheap</h6>
{% endif %}
{% endif %}

{% if enable_namecheap %}
<form action="{% url 'shepherd:update_namecheap' %}" method="POST">
{% csrf_token %}
<input type="hidden" id="user_id" name="user_id" value='{{ user.get_username }}'>
<button class="btn btn-primary">Pull from Namecheap</button>
</form>
{% endif %}

<!-- Domain Categories Section -->
<h6><i class="fas fa-heartbeat"></i> Domain Categories</h6>
<hr>
Expand Down Expand Up @@ -84,7 +87,7 @@ <h6><i class="fas fa-heartbeat"></i> Domain Categories</h6>
<form action="{% url 'shepherd:update_cat' %}" method="POST">
{% csrf_token %}
<input type="hidden" id="user_id" name="user_id" value='{{ user.get_username }}'>
<button class="button">Start Update</button>
<button class="btn btn-primary">Start Update</button>
</form>

<!-- DNS Section -->
Expand Down Expand Up @@ -120,6 +123,6 @@ <h6><i class="fas fa-server"></i> DNS Records</h6>
<form action="{% url 'shepherd:update_dns' %}" method="POST">
{% csrf_token %}
<input type="hidden" id="user_id" name="user_id" value='{{ user.get_username }}'>
<button class="button">Start Update</button>
<button class="btn btn-primary">Start Update</button>
</form>
{% endblock %}

0 comments on commit c755472

Please sign in to comment.