View | Details | Raw Unified | Return to bug 31028
Collapse All | Expand All

(-)a/installer/data/mysql/atomicupdate/bug_31028.pl (+23 lines)
Lines 71-75 return { Link Here
71
            );
71
            );
72
        }
72
        }
73
73
74
        if ( ( $dbh->selectrow_array('SELECT COUNT(*) FROM additional_contents WHERE location=?', undef, 'CatalogConcernTemplate') )[0] == 0 ) { # Check to make idempotent
75
            my $cc_template = <<~ 'END_TEMPLATE';
76
                **Describe the concern**
77
                A clear and concise description of what the concern is.
78
79
                **To Reproduce**
80
                Steps to reproduce the behavior:
81
                1. Go to '...'
82
                2. Click on '....'
83
                3. Scroll down to '....'
84
                4. See error
85
86
                **Expected behavior**
87
                A clear and concise description of what you expected to happen.
88
            END_TEMPLATE
89
90
            $dbh->do(
91
                qq{
92
                    INSERT INTO additional_contents ( category, code, location, title, content, lang, published_on ) VALUES ('html_customizations', 'CatalogConcernTemplate_1', 'CatalogConcernTemplate', 'Catalog concern template text', "$cc_template", 'default', CAST(NOW() AS date) )
93
                }
94
            );
95
        }
96
74
    },
97
    },
75
}
98
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc (-4 / +11 lines)
Lines 1-9 Link Here
1
[% USE AdditionalContents %]
1
[% USE AdditionalContents %]
2
[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode ) %]
2
[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode ) %]
3
[% SET CatalogConcernTemplate = AdditionalContents.get( location => "CatalogConcernTemplate", lang => lang, library => logged_in_user.branchcode ) %]
3
<!-- Add concern modal -->
4
<!-- Add concern modal -->
4
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
5
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
5
    <div class="modal-dialog" role="document">
6
    <div class="modal-dialog" role="document">
6
        <div class="modal-content">
7
        <div class="modal-content modal-lg">
7
            <div class="modal-header">
8
            <div class="modal-header">
8
                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
9
                <button type="button" class="closebtn" data-dismiss="modal" aria-label="Close"><span aria-hidden="true">&times;</span></button>
9
                <h4 class="modal-title" id="addConcernLabel">Add concern</h4>
10
                <h4 class="modal-title" id="addConcernLabel">Add concern</h4>
Lines 22-32 Link Here
22
                        [% END %]
23
                        [% END %]
23
                        <li>
24
                        <li>
24
                            <label class="required" for="message">Please describe your concern: </label>
25
                            <label class="required" for="message">Please describe your concern: </label>
25
                            <textarea id="message_add" name="message" required="required"></textarea>
26
                            <textarea id="message_add" name="message" required="required" rows="15">
27
                            [%- IF CatalogConcernTemplate && CatalogConcernTemplate.content && CatalogConcernTemplate.content.count > 0 -%]
28
                            [%- FOREACH template IN CatalogConcernTemplate.content -%]
29
                            [%- template.content | $raw -%]
30
                            [%- END -%]
31
                            [%- END -%]
32
                            </textarea>
26
                            <span class="required">Required</span>
33
                            <span class="required">Required</span>
27
                            [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
34
                            [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
28
                            [% FOREACH help IN CatalogConcernHelp.content %]
35
                            [%- FOREACH help IN CatalogConcernHelp.content -%]
29
                            <p id="helpBlock" class="help-block">[% help.content | $raw %]</p>
36
                            <p id="helpBlock" class="help-block">[%- help.content | $raw -%]</p>
30
                            [%- END -%]
37
                            [%- END -%]
31
                            [%- END -%]
38
                            [%- END -%]
32
                        </li>
39
                        </li>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-1 / +1 lines)
Lines 487-493 Link Here
487
            [% END %]
487
            [% END %]
488
        [% END %]
488
        [% END %]
489
    [% ELSE %]
489
    [% ELSE %]
490
        [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp' ] %]
490
        [% SET available_options = [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'OpacLibraryInfo', 'CatalogConcernHelp', 'CatalogConcernTemplate' ] %]
491
        [% FOREACH l IN available_options.sort %]
491
        [% FOREACH l IN available_options.sort %]
492
            [% IF l == location %]
492
            [% IF l == location %]
493
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
493
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc (-5 / +11 lines)
Lines 1-8 Link Here
1
[% USE AdditionalContents %]
1
[% USE AdditionalContents %]
2
[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
2
[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
3
[% SET CatalogConcernTemplate = AdditionalContents.get( location => "CatalogConcernTemplate", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
3
<!-- Add concern modal -->
4
<!-- Add concern modal -->
4
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernModalLabel" aria-hidden="true">
5
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernModalLabel" aria-hidden="true">
5
    <div class="modal-dialog">
6
    <div class="modal-dialog modal-lg">
6
        <div class="modal-content">
7
        <div class="modal-content">
7
            <div class="modal-header">
8
            <div class="modal-header">
8
                <h3 class="modal-title" id="addConcernModalLabel">Report a concern</h3>
9
                <h3 class="modal-title" id="addConcernModalLabel">Report a concern</h3>
Lines 14-23 Link Here
14
                <fieldset id="concern_fieldset">
15
                <fieldset id="concern_fieldset">
15
                    <div class="form-group">
16
                    <div class="form-group">
16
                        <label for="message">Please decribe your concerns: </label>
17
                        <label for="message">Please decribe your concerns: </label>
17
                        <textarea class="form-control" name="message" id="message_add" aria-describedby="helpBlock" required="required"></textarea>
18
                        <textarea class="form-control" name="message" id="message_add" aria-describedby="helpBlock" required="required" rows="15">
19
                        [%- IF CatalogConcernTemplate && CatalogConcernTemplate.content && CatalogConcernTemplate.content.count > 0 -%]
20
                        [%- FOREACH template IN CatalogConcernTemplate.content -%]
21
                        [%- template.content | $raw -%]
22
                        [%- END -%]
23
                        [%- END -%]
24
                        </textarea>
18
                        [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
25
                        [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
19
                        [% FOREACH help IN CatalogConcernHelp.content %]
26
                        [%- FOREACH help IN CatalogConcernHelp.content -%]
20
                        <p id="helpBlock" class="help-block">[% help.content | $raw %]</p>
27
                        <p id="helpBlock" class="help-block">[%- help.content | $raw -%]</p>
21
                        [%- END -%]
28
                        [%- END -%]
22
                        [%- END -%]
29
                        [%- END -%]
23
                    </div>
30
                    </div>
24
- 

Return to bug 31028