forked from mmmaly/chcemvediet
-
Notifications
You must be signed in to change notification settings - Fork 4
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#334 Workaround with fixed amend templatetag
- Loading branch information
1 parent
66b2740
commit f7c302a
Showing
9 changed files
with
60 additions
and
80 deletions.
There are no files selected for viewing
14 changes: 4 additions & 10 deletions
14
chcemvediet/apps/inforequests/templates/admin/inforequests/action/delete_confirmation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,11 @@ | ||
| {% extends "admin/delete_confirmation.html" %} | ||
| {% load amend prepend before after from poleno.amend %} | ||
| {% load amend from poleno.amend %} | ||
|
|
||
| {% block content %} | ||
| {% amend %} | ||
| {{ block.super }} | ||
| {% after path="./ul[last()]" %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% endafter %} | ||
| {% prepend path=".//form" %} | ||
| {% include "admin/inforequests/mixins/snoozed_actions_mixin.html" %} | ||
| {% endprepend %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endbefore %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% include "admin/inforequests/mixins/snoozed_actions_mixin.html" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endamend %} | ||
| {% endblock %} |
14 changes: 4 additions & 10 deletions
14
...t/apps/inforequests/templates/admin/inforequests/action/delete_selected_confirmation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,17 +1,11 @@ | ||
| {% extends "admin/delete_selected_confirmation.html" %} | ||
| {% load amend prepend before after from poleno.amend %} | ||
| {% load amend from poleno.amend %} | ||
|
|
||
| {% block content %} | ||
| {% amend %} | ||
| {{ block.super }} | ||
| {% after path="./ul[last()]" %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% endafter %} | ||
| {% prepend path=".//form" %} | ||
| {% include "admin/inforequests/mixins/snoozed_actions_mixin.html" %} | ||
| {% endprepend %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endbefore %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% include "admin/inforequests/mixins/snoozed_actions_mixin.html" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endamend %} | ||
| {% endblock %} |
10 changes: 3 additions & 7 deletions
10
chcemvediet/apps/inforequests/templates/admin/inforequests/branch/delete_confirmation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| {% extends "admin/delete_confirmation.html" %} | ||
| {% load amend before after from poleno.amend %} | ||
| {% load amend from poleno.amend %} | ||
|
|
||
| {% block content %} | ||
| {% amend %} | ||
| {{ block.super }} | ||
| {% after path="./ul[last()]" %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% endafter %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endbefore %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endamend %} | ||
| {% endblock %} |
10 changes: 3 additions & 7 deletions
10
...t/apps/inforequests/templates/admin/inforequests/branch/delete_selected_confirmation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,10 @@ | ||
| {% extends "admin/delete_selected_confirmation.html" %} | ||
| {% load amend before after from poleno.amend %} | ||
| {% load amend from poleno.amend %} | ||
|
|
||
| {% block content %} | ||
| {% amend %} | ||
| {{ block.super }} | ||
| {% after path="./ul[last()]" %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% endafter %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endbefore %} | ||
| {% include "admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endamend %} | ||
| {% endblock %} |
9 changes: 2 additions & 7 deletions
9
.../apps/inforequests/templates/admin/inforequests/inforequestemail/delete_confirmation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,9 @@ | ||
| {% extends "admin/delete_confirmation.html" %} | ||
| {% load amend before after from poleno.amend %} | ||
| {% load amend from poleno.amend %} | ||
|
|
||
| {% block content %} | ||
| {% amend %} | ||
| {{ block.super }} | ||
| {% after path="./ul[last()]" %} | ||
| <div></div> | ||
| {% endafter %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endbefore %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endamend %} | ||
| {% endblock %} |
9 changes: 2 additions & 7 deletions
9
...orequests/templates/admin/inforequests/inforequestemail/delete_selected_confirmation.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,14 +1,9 @@ | ||
| {% extends "admin/delete_selected_confirmation.html" %} | ||
| {% load amend before after from poleno.amend %} | ||
| {% load amend from poleno.amend %} | ||
|
|
||
| {% block content %} | ||
| {% amend %} | ||
| {{ block.super }} | ||
| {% after path="./ul[last()]" %} | ||
| <div></div> | ||
| {% endafter %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endbefore %} | ||
| {% include "utils/admin/bulk_delete_mixin.html" %} | ||
| {% endamend %} | ||
| {% endblock %} |
20 changes: 12 additions & 8 deletions
20
...forequests/templates/admin/inforequests/mixins/delete_nested_inforequest_email_mixin.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,12 @@ | ||
| {% if outbound %} | ||
| <p>The following outbound messages will be deleted:</p> | ||
| <ul>{{ outbound|unordered_list }}</ul> | ||
| {% endif %} | ||
| {% if inbound %} | ||
| <p>The following inbound messages will be marked undecided:</p> | ||
| <ul>{{ inbound|unordered_list }}</ul> | ||
| {% endif %} | ||
| {% load after from poleno.amend %} | ||
|
|
||
| {% after path="./ul[last()]" %} | ||
| {% if outbound %} | ||
| <p>The following outbound messages will be deleted:</p> | ||
| <ul>{{ outbound|unordered_list }}</ul> | ||
| {% endif %} | ||
| {% if inbound %} | ||
| <p>The following inbound messages will be marked undecided:</p> | ||
| <ul>{{ inbound|unordered_list }}</ul> | ||
| {% endif %} | ||
| {% endafter %} |
22 changes: 13 additions & 9 deletions
22
chcemvediet/apps/inforequests/templates/admin/inforequests/mixins/snoozed_actions_mixin.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,13 @@ | ||
| {% if snoozed_actions %} | ||
| <p> | ||
| <label><input name="snooze" type="checkbox" /> Extend snooze of previous actions by | ||
| {{ ADMIN_EXTEND_SNOOZE_BY_DAYS }} days from today? All of the following actions will be | ||
| snoozed: | ||
| </label> | ||
| </p> | ||
| <ul>{{ snoozed_actions|unordered_list }}</ul> | ||
| {% endif %} | ||
| {% load prepend from poleno.amend %} | ||
|
|
||
| {% prepend path=".//form" %} | ||
| {% if snoozed_actions %} | ||
| <p> | ||
| <label><input name="snooze" type="checkbox" /> Extend snooze of previous actions by | ||
| {{ ADMIN_EXTEND_SNOOZE_BY_DAYS }} days from today? All of the following actions will be | ||
| snoozed: | ||
| </label> | ||
| </p> | ||
| <ul>{{ snoozed_actions|unordered_list }}</ul> | ||
| {% endif %} | ||
| {% endprepend %} |
32 changes: 17 additions & 15 deletions
32
poleno/utils/templates/utils/admin/bulk_delete_mixin.html
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,16 +1,18 @@ | ||
| {% load set_attributes from poleno.amend %} | ||
| {% load before set_attributes from poleno.amend %} | ||
|
|
||
| {% if delete_warnings %} | ||
| <ul class="messagelist"> | ||
| {% for warning in delete_warnings %} | ||
| <li class="warning">{{ warning }}</li> | ||
| {% endfor %} | ||
| </ul> | ||
| {% endif %} | ||
| {% if delete_constraints %} | ||
| <div class="errornote"> | ||
| <p>Delete not allowed.</p> | ||
| <ul>{{ delete_constraints|unordered_list }}</ul> | ||
| </div> | ||
| {% set_attributes path=".//form//input[@type='submit']" disabled=True %} | ||
| {% endif %} | ||
| {% before path=".//form//input[@type='submit']" %} | ||
| {% if delete_warnings %} | ||
| <ul class="messagelist"> | ||
| {% for warning in delete_warnings %} | ||
| <li class="warning">{{ warning }}</li> | ||
| {% endfor %} | ||
| </ul> | ||
| {% endif %} | ||
| {% if delete_constraints %} | ||
| <div class="errornote"> | ||
| <p>Delete not allowed.</p> | ||
| <ul>{{ delete_constraints|unordered_list }}</ul> | ||
| </div> | ||
| {% set_attributes path=".//form//input[@type='submit']" disabled=True %} | ||
| {% endif %} | ||
| {% endbefore %} |