Skip to content

Commit

Permalink
Attachment field added. Closes #9.
Browse files Browse the repository at this point in the history
  • Loading branch information
ajrbyers committed Aug 31, 2017
1 parent 3b42a95 commit 3b22d69
Show file tree
Hide file tree
Showing 8 changed files with 58 additions and 40 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ <h2>3. Notify the Copyeditor</h2>
<div class="content">
<p>You can send a message to the copyeditor or skip it.</p>
<div class="card">
<form method="POST">
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div class="card-divider">
<h4>To {{ copyedit.copyeditor.full_name }}</h4>
Expand All @@ -23,6 +23,8 @@ <h5>From {{ request.user.full_name }}</h5>
<div class="card-section">
<p>Subject: <strong>Copyedit Assignment</strong></p>
<textarea rows="10" name="content_email">{{ user_message_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
Expand Down
2 changes: 1 addition & 1 deletion src/templates/admin/production/assigned_article.html
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ <h2>Actions</h2>
<i class="fa fa-plus-circle action-icon">&nbsp;</i>Add New Typesetter
</a></li>
{% endif %}
{% if galleys or production_assignment.typeset_tasks and not production_assignment.closed %}
{% if galleys and not production_assignment.closed %}
<li><a data-open="productionmodal">
<i class="fa fa-check action-icon">&nbsp;</i>Mark production as complete
</a><li>
Expand Down
4 changes: 3 additions & 1 deletion src/templates/admin/production/notify_typesetter.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ <h2>4. Notify the Typesetter</h2>
<div class="content">
<p>You can send a message to the typesetter or skip it.</p>
<div class="card">
<form method="POST">
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div class="card-divider">
<h4>To {{ typeset_task.typesetter.full_name }}</h4>
Expand All @@ -26,6 +26,8 @@ <h5>From {{ request.user.full_name }}</h5>
<div class="card-section">
<p>Subject: <strong>Typesetting Request</strong></p>
<textarea rows="10" name="user_message_content">{{ user_message_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
Expand Down
6 changes: 4 additions & 2 deletions src/templates/admin/proofing/notify_proofreader.html
Original file line number Diff line number Diff line change
Expand Up @@ -17,15 +17,17 @@
<div class="content">
<p>You can send a message to the proofreader or skip it.</p>
<div class="card">
<form method="POST">
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div class="card-divider">
<h4>To {{ proofing_task.proofreader.full_name }}</h4>
<h5>From {{ request.user.full_name }}</h5>
</div>
<div class="card-section">
<p>Subject: <strong>Proofreader Request</strong></p>
<p>Subject: <strong>Proofreader Request</strong></p>
<textarea rows="10" name="content_email">{{ user_message_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
Expand Down
4 changes: 3 additions & 1 deletion src/templates/admin/proofing/notify_typesetter_changes.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ <h2>Notify the Typesetter</h2>
<div class="content">
<p>You can send a message to the typesetter or skip it.</p>
<div class="card">
<form method="POST">
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div class="card-divider">
<h4>To {{ proofing_task.proofreader.full_name }}</h4>
Expand All @@ -28,6 +28,8 @@ <h5>From {{ request.user.full_name }}</h5>
<div class="card-section">
<p>Subject: <strong>Proofreading Feedback, Typesetting Request</strong></p>
<textarea rows="10" name="content_email">{{ notification_email_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
Expand Down
2 changes: 2 additions & 0 deletions src/templates/admin/review/assignment_notification.html
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ <h5>From {{ request.user.full_name }}</h5>
<div class="card-section">
<p>Subject: <strong>Editor Assignment</strong></p>
<textarea rows="10" name="content_email">{{ email_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
Expand Down
72 changes: 39 additions & 33 deletions src/templates/admin/review/notify_reviewer.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,51 +4,57 @@

{% block title %}Add Review Assignment{% endblock title %}
{% block title-section %}Add Review Assignment{% endblock %}
{% block css %}<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}
{% block css %}
<link href="{% static "common/css/jquery-te-1.4.0.css" %}" rel="stylesheet">{% endblock %}

{% block breadcrumbs %}
{{ block.super }}
{% include "elements/breadcrumbs/review_base.html" %}
<li>Send Review Notification</li>
{{ block.super }}
{% include "elements/breadcrumbs/review_base.html" %}
<li>Send Review Notification</li>
{% endblock breadcrumbs %}

{% block body %}

<div class="large-12 columns">
<div class="box">
<div class="title-area">
<h2>3. Notify the Reviewer</h2>
</div>
<div class="content">
<p>You can send a message to the reviewer or skip it.</p>
<div class="card">
<div class="card-divider">
<h4>To {{ review.reviewer.full_name }}</h4>
<h5>From {{ request.user.full_name }}</h5>
<div class="large-12 columns">
<div class="box">
<div class="title-area">
<h2>3. Notify the Reviewer</h2>
</div>
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}

<p>Subject: <strong>Review Assignment</strong></p>
<textarea rows="10" name="content_email">{{ email_content|linebreaksbr }}</textarea>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
<button type="submit" class="button success" name="send"><i class="fa fa-envelope-o">&nbsp;</i>Send</button>
<button type="submit" class="button warning" name="skip"><i class="fa fa-step-forward">&nbsp;</i>Skip</button>
<div class="content">
<p>You can send a message to the reviewer or skip it.</p>
<form method="POST" enctype="multipart/form-data">
<div class="card">
<div class="card-divider">
<h4>To {{ review.reviewer.full_name }}</h4>
<h5>From {{ request.user.full_name }}</h5>
</div>

{% csrf_token %}

<p>Subject: <strong>Review Assignment</strong></p>
<textarea rows="10" name="content_email">{{ email_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
<button type="submit" class="button success" name="send"><i
class="fa fa-envelope-o">&nbsp;</i>Send
</button>
<button type="submit" class="button warning" name="skip"><i class="fa fa-step-forward">&nbsp;</i>Skip
</button>
</div>
</div>
</div>
</form>
</form>
</div>
</div>
</div>
</div>
</div>
</div>

{% endblock body %}

{% block js %}
{{ block.super }}
<script type="text/javascript" src="{% static "common/js/jquery-te-1.4.0.min.js" %}" charset="utf-8"></script>
<script type="text/javascript">$("textarea").jqte();</script>
{{ block.super }}
<script type="text/javascript" src="{% static "common/js/jquery-te-1.4.0.min.js" %}" charset="utf-8"></script>
<script type="text/javascript">$("textarea").jqte();</script>
{% endblock js %}
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,13 @@ <h2>Notify the Author</h2>
<h4>To {{ article.correspondence_author.full_name }}</h4>
<h5>From {{ request.user.full_name }}</h5>
</div>
<form method="POST">
<form method="POST" enctype="multipart/form-data">
{% csrf_token %}
<div class="card-section">
<p>Subject: <strong>Revision Request</strong></p>
<textarea rows="10" name="email_content">{{ email_content|linebreaksbr }}</textarea>
<label for="attachment"><p>Attachment (You can select multiple files): </p></label>
<input type="file" name="attachment" multiple>
</div>
<div class="card-divider">
<div class="button-group">
Expand Down

0 comments on commit 3b22d69

Please sign in to comment.