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

(-)a/installer/data/mysql/atomicupdate/bug_31028.pl (+6 lines)
Lines 62-66 return { Link Here
62
            }
62
            }
63
        );
63
        );
64
64
65
        $dbh->do(
66
            q{
67
                INSERT INTO additional_contents ( category, code, location, branchcode, title, content, lang, published_on ) VALUES ('html_customizations', 'CatalogConcernHelp', 'CatalogConcernHelp', NULL, 'CatalogConcernHelp', 'Please describe your concern clearly and the library will try to deal with it as quickly as possible', 'default', CAST(NOW() AS date) )
68
            }
69
        );
70
65
    },
71
    },
66
}
72
}
(-)a/koha-tmpl/intranet-tmpl/prog/en/includes/modals/add_catalog_concern.inc (-1 / +7 lines)
Lines 1-3 Link Here
1
[% USE AdditionalContents %]
2
[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode ) %]
1
<!-- Add concern modal -->
3
<!-- Add concern modal -->
2
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
4
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernLabel">
3
    <div class="modal-dialog" role="document">
5
    <div class="modal-dialog" role="document">
Lines 22-28 Link Here
22
                            <label class="required" for="message">Please describe your concern: </label>
24
                            <label class="required" for="message">Please describe your concern: </label>
23
                            <textarea id="message_add" name="message" required="required"></textarea>
25
                            <textarea id="message_add" name="message" required="required"></textarea>
24
                            <span class="required">Required</span>
26
                            <span class="required">Required</span>
25
                            <p id="helpBlock" class="help-block">A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern</p>
27
                            [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
28
                            [% FOREACH help IN CatalogConcernHelp.content %]
29
                            <p id="helpBlock" class="help-block">[% help.content | $raw %]</p>
30
                            [%- END -%]
31
                            [%- END -%]
26
                        </li>
32
                        </li>
27
                    </ol>
33
                    </ol>
28
                </fieldset>
34
                </fieldset>
(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/additional-contents.tt (-1 / +1 lines)
Lines 484-490 Link Here
484
            [% END %]
484
            [% END %]
485
        [% END %]
485
        [% END %]
486
    [% ELSE %]
486
    [% ELSE %]
487
        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote' ] %]
487
        [% FOREACH l IN [ 'OpacNavRight', 'opacheader', 'OpacCustomSearch', 'OpacMainUserBlock', 'opaccredits', 'OpacLoginInstructions', 'OpacNav', 'OpacNavBottom', 'OpacSuggestionInstructions', 'ArticleRequestsDisclaimerText', 'OpacMoreSearches', 'OpacMySummaryNote', 'CatalogConcernHelp' ] %]
488
            [% IF l == location %]
488
            [% IF l == location %]
489
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
489
                <option value="[% l | html %]" selected="selected">[% l | html %]</option>
490
            [% ELSE %]
490
            [% ELSE %]
(-)a/koha-tmpl/opac-tmpl/bootstrap/en/includes/modals/catalog_concern.inc (-2 / +7 lines)
Lines 1-3 Link Here
1
[% USE AdditionalContents %]
2
[% SET CatalogConcernHelp = AdditionalContents.get( location => "CatalogConcernHelp", lang => lang, library => logged_in_user.branchcode || default_branch ) %]
1
<!-- Add concern modal -->
3
<!-- Add concern modal -->
2
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernModalLabel" aria-hidden="true">
4
<div class="modal" id="addConcernModal" tabindex="-1" role="dialog" aria-labelledby="addConcernModalLabel" aria-hidden="true">
3
    <div class="modal-dialog">
5
    <div class="modal-dialog">
Lines 13-19 Link Here
13
                    <div class="form-group">
15
                    <div class="form-group">
14
                        <label for="message">Please decribe your concerns: </label>
16
                        <label for="message">Please decribe your concerns: </label>
15
                        <textarea class="form-control" name="message" id="message_add" aria-describedby="helpBlock" required="required"></textarea>
17
                        <textarea class="form-control" name="message" id="message_add" aria-describedby="helpBlock" required="required"></textarea>
16
                        <p id="helpBlock" class="help-block">A short summary of what the library policy is for dealing with such concerns and what constitutes a valid concern</p>
18
                        [%- IF CatalogConcernHelp && CatalogConcernHelp.content && CatalogConcernHelp.content.count > 0 -%]
19
                        [% FOREACH help IN CatalogConcernHelp.content %]
20
                        <p id="helpBlock" class="help-block">[% help.content | $raw %]</p>
21
                        [%- END -%]
22
                        [%- END -%]
17
                    </div>
23
                    </div>
18
                </fieldset>
24
                </fieldset>
19
            </div>
25
            </div>
20
- 

Return to bug 31028