Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix issues 70, 71 & 72 #93

Merged
merged 1 commit into from
Oct 30, 2018
Merged

Fix issues 70, 71 & 72 #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion ticketatorapp/core/templates/core/companies/create_edit_company.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,12 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New company</h1
<hr></hr>
<!--submit-->
<button class="btn btn-default pull-right" style="margin-right: 20px" type="submit">Save</button>
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'company-list' %}"><i class="fa fa-angle-left"></i> Back</a>
{% if form.instance.id %}
<a class="btn btn-danger pull-left" style="margin-left: 20px" href="{% url 'company-delete' form.instance.id %}"><i class="fa fa-trash"></i> Delete</a>
{% else %}
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
{% endif %}
</div>
</div>
</div>
Expand Down
19 changes: 12 additions & 7 deletions ticketatorapp/core/templates/core/groups/create_edit_group.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New group</h1>
<div class="row">
<div class="col-lg-8 col-md-offset-2">
<div class="panel panel-default">

<div class="panel-heading">
{% if vars.debug == True%}
<div class="pull-left">
Expand All @@ -41,7 +41,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New group</h1>
{% if form.errors %}
<div class="alert alert-danger">
{{form.errors}}

</div>
{% endif %}
{%endif%}
Expand All @@ -57,11 +57,11 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New group</h1>
{%endif%}
<p class="help-block"></p>
{{form.name.errors}}
</div>
</div>
</div>



</div>


Expand All @@ -73,7 +73,12 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New group</h1>
<hr></hr>
<!--submit-->
<button class="btn btn-default pull-right" style="margin-right: 20px" type="submit">Save</button>
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'group-list' %}"><i class="fa fa-angle-left"></i> Back</a>
{% if form.instance.id %}
<a class="btn btn-danger pull-left" style="margin-left: 20px" href="{% url 'group-delete' form.instance.id %}"><i class="fa fa-trash"></i> Delete</a>
{% else %}
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
{% endif %}
</div>
</div>
</div>
Expand Down
23 changes: 14 additions & 9 deletions ticketatorapp/core/templates/core/priorities/create_edit_priority.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New priority</h
<div class="row">
<div class="col-lg-8 col-md-offset-2">
<div class="panel panel-default">

<div class="panel-heading">
{% if vars.debug == True%}
<div class="pull-left">
Expand All @@ -41,7 +41,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New priority</h
{% if form.errors %}
<div class="alert alert-danger">
{{form.errors}}

</div>
{% endif %}
{%endif%}
Expand All @@ -58,7 +58,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New priority</h
<p class="help-block"></p>
{{form.name.errors}}
</div>

<!-- <div class="form-group">
<label>First name</label>
{% if form.instance.first_name%}
Expand All @@ -69,7 +69,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New priority</h
<p class="help-block"></p>
{{form.first_name.errors}}
</div>

<div class="form-group">
<label>Last name</label>
{% if form.instance.last_name%}
Expand All @@ -91,11 +91,11 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New priority</h
<p class="help-block"></p>
{{form.email.errors}}
</div> -->

</div>



</div>


Expand All @@ -107,7 +107,12 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New priority</h
<hr></hr>
<!--submit-->
<button class="btn btn-default pull-right" style="margin-right: 20px" type="submit">Save</button>
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'priority-list' %}"><i class="fa fa-angle-left"></i> Back</a>
{% if form.instance.id %}
<a class="btn btn-danger pull-left" style="margin-left: 20px" href="{% url 'priority-delete' form.instance.id %}"><i class="fa fa-trash"></i> Delete</a>
{% else %}
<button class="btn btn-default pull-left" style="margin-left: 20px"type="reset">Clear form</button>
{% endif %}
</div>
</div>
</div>
Expand Down
10 changes: 7 additions & 3 deletions ticketatorapp/core/templates/core/queues/create_edit_queue.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,13 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New queue</h1>
<hr></hr>
<!--submit-->
<button class="btn btn-default pull-right" style="margin-right: 20px" type="submit">Save</button>
{%if form.instance.id%}
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'queue-delete' form.instance.id %}">Delete</a>
{%endif%}
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'queue-list' %}"><i class="fa fa-angle-left"></i> Back</a>
{% if form.instance.id %}
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'queue-delete' form.instance.id %}">Delete</a>
{% else %}
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
{% endif %}

</div>
</div>
</div>
Expand Down
22 changes: 11 additions & 11 deletions ticketatorapp/core/templates/core/rights/create_edit_right.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New rights</h1>
<div class="row">
<div class="col-lg-8 col-md-offset-2">
<div class="panel panel-default">

<div class="panel-heading">
{% if vars.debug == True%}
<div class="pull-left">
Expand Down Expand Up @@ -54,8 +54,8 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New rights</h1>
{{form.grp_src.errors}}
</div>
</div>


<div class="col-lg-3">
<div class="form-group">
<label>Destination Queue</label>
Expand All @@ -64,7 +64,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New rights</h1>
{{form.queue_dst.errors}}
</div>
</div>

<div class="col-lg-1 pull-right">
<div class="form-group">
<label class="pull-left">Enabled</label>
Expand All @@ -74,7 +74,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New rights</h1>
</div>
</div>
</div>
<hr></hr>
<hr></hr>
<div class="row">
<div class="col-lg-12">
<div class="row show-grid ">
Expand All @@ -83,12 +83,12 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New rights</h1>
<div class="col-md-3">Delete {{form.can_delete}} </div>
<div class="col-md-3">Edit {{form.can_edit}} </div>
<div class="col-md-2">Comment {{form.can_comment}}</div>

</div>
</div>
</div>




<!--line separator -->
Expand All @@ -99,11 +99,11 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New rights</h1>
<hr></hr>
<!--submit-->
<button class="btn btn-default pull-right" style="margin-right: 20px" type="submit">Save</button>
<a href="{% url 'right-list' %}" class="btn btn-default pull-left" style="margin-left: 20px">Back</a>
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'right-list' %}"><i class="fa fa-angle-left"></i> Back</a>
{% if form.instance.id %}
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'right-delete' form.instance.id %}">Delete</a>
<a class="btn btn-danger pull-left" style="margin-left: 20px" href="{% url 'right-delete' form.instance.id %}"><i class="fa fa-trash"></i> Delete</a>
{% else %}
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
{% endif %}
</div>
</div>
Expand Down
33 changes: 18 additions & 15 deletions ticketatorapp/core/templates/core/states/create_edit_state.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New state</h1>
<div class="row">
<div class="col-lg-8 col-md-offset-2">
<div class="panel panel-default">

<div class="panel-heading">
{% if vars.debug == True%}
<div class="pull-left">
Expand All @@ -54,7 +54,7 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New state</h1>
{% if form.errors %}
<div class="alert alert-danger">
{{form.errors}}

</div>
{% endif %}
{%endif%}
Expand Down Expand Up @@ -90,34 +90,37 @@ <h1 class="page-header"><i class="glyphicon glyphicon-user"></i> New state</h1>
{% if form.instance.color %}
<input name="color" type="text" data-format="hex" class="form-control" value="{{form.instance.color}}" />
{% else %}
<input name="color" type="text" data-format="hex" class="form-control" value="" />
<input name="color" type="text" data-format="hex" class="form-control" value="" />
{%endif%}
<span class="input-group-addon"><i></i></span>
<span class="input-group-addon"><i></i></span>
</div>
<p class="help-block"></p>
{{form.color.errors}}
</div>
<script type="text/javascript">
$(function() {
$('#color').colorpicker();
});
<script type="text/javascript">
$(function() {
$('#color').colorpicker();
});
</script>

</div>
<!-- final div -->

<!-- final div -->
</div>

<!--line separator -->
<div class="row">
<div class="colg-lg-9">
<div class="form-group">
<hr></hr>

<button class="btn btn-default pull-right" style="margin-right: 20px" type="submit">Save</button>
{%if form.instance.id%}
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'state-delete' form.instance.id %}">Delete</a>
{%endif%}
<a class="btn btn-default pull-left" style="margin-left: 20px" href="{% url 'state-list' %}"><i class="fa fa-angle-left"></i> Back</a>
{% if form.instance.id %}
<a class="btn btn-danger pull-left" style="margin-left: 20px" href="{% url 'state-delete' form.instance.id %}"><i class="fa fa-trash"></i> Delete</a>
{% else %}
<button class="btn btn-default pull-left" style="margin-left: 20px" type="reset">Clear form</button>
{% endif %}
</div>
</div>
</div>
Expand Down
8 changes: 4 additions & 4 deletions ticketatorapp/core/templates/core/tickets/create_edit_ticket.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,13 +32,13 @@ <h2>{{form_ticket.instance.subject}}</h2>
<button form="ticketform" class="btn btn-default btn-sm pull-right" style="margin-right: 3px;" type="submit" name="save-signal">Save</button>
<button form="ticketform" class="btn btn-default btn-sm pull-right" style="margin-right: 5px;" type="submit" name="update-signal">Update</button>
<div class="btn-group pull-right" style="margin-right: 5px;">
<button class="btn btn-danger btn-sm" type="button" data-target=".bs-example-modal-lg" data-toggle="modal">Delete</button>
<button class="btn btn-danger btn-sm" type="button" data-target=".bs-example-modal-lg" data-toggle="modal"><i class="fa fa-trash"></i> Delete</button>
</div>
{% include "core/tickets/delete_modal_ticket.html" %}

{% else %}
<button form="ticketform" class="btn btn-default btn-sm pull-right" style="margin-right: 5px" type="submit" name="save-signal" >Create</button>
<button form="ticketform" class="btn btn-default btn-sm pull-right" style="margin-right: 5px" type="reset" name="save-signal">Clear</button>
<button form="ticketform" class="btn btn-default btn-sm pull-right" style="margin-right: 5px" type="reset" name="save-signal">Clear form</button>
{%endif%}
<div class="clearfix"></div>

Expand Down Expand Up @@ -418,7 +418,7 @@ <h4 class="modal-title" id="myModalLabel">Add new microtask</h4>
<td id="buttons">
<input type="hidden" id="idmk" name="idmk" value="{{mk.id}}">
<a class="btn btn-info btn-xs edit-mk" href="#" data-url="{% url 'tickets-get-microtask' mk.id %}"><i class="fa fa-pencil"></i> Edit </a>
<a class="btn btn-danger btn-xs del-mk" href="#" data-url="{% url 'tickets-del-microtasks' %}"><i class="fa fa-trash-o"></i> Delete </a>
<a class="btn btn-danger btn-xs del-mk" href="#" data-url="{% url 'tickets-del-microtasks' %}"><i class="fa fa-trash"></i> Delete </a>
</td>
</tr>
{% endfor %}
Expand Down Expand Up @@ -468,4 +468,4 @@ <h3>{{e.log_user}} <small>{{e.log_date}}</small></h3>
var get_percentage_url = "{% url 'tickets-get-percentage' form_ticket.instance.id %}";
</script>
{% endif %}
{% endblock %}
{% endblock %}
Loading