Attachment 111561 Details for Bug 26456 – Bug 26456: (follow-up) Add markup comments

[patch] Bug 26456: (follow-up) Add markup comments

Bug-26456-follow-up-Add-markup-comments.patch (text/plain), 8.49 KB, created by Katrin Fischer on 2020-10-13 13:19:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Katrin Fischer

Created: 2020-10-13 13:19:28 UTC

Size: 8.49 KB

patch

obsolete

>From 576bb679bb24c649c67e1d09cdb052d4e532f8bb Mon Sep 17 00:00:00 2001
>From: Owen Leonard <oleonard@myacpl.org>
>Date: Mon, 14 Sep 2020 15:21:55 +0000
>Subject: [PATCH] Bug 26456: (follow-up) Add markup comments
>
>This patch adds comments to the template to highlight the markup
>structure.
>
>Also changed: Some form hints have been wrapped in <div class="hint"> to
>make it consistent with other pages.
>
>This patch should have no effect on functionality.
>
>Signed-off-by: David Nind <david@davidnind.com>
>
>Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>
>---
> .../en/modules/admin/marc_subfields_structure.tt   | 41 +++++++++++-----------
> 1 file changed, 21 insertions(+), 20 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>index 80c062d5d2..d58b224451 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tt
>@@ -35,7 +35,7 @@
>         <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo;
>         <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo;
>         <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC frameworks</a> &rsaquo;
>-        <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode | html %]&amp;searchfield=[% tagfield | uri %]">
>+        <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=[% frameworkcode | uri %]&amp;searchfield=[% tagfield | uri %]">
>             [% IF ( frameworkcode ) %][% frameworkcode | html %][% ELSE %]Default[% END %] framework structure
>         </a> &rsaquo;
>         [% IF ( add_form ) %]
>@@ -56,7 +56,7 @@
>         [% IF ( else ) %]
>             Tag [% tagfield | html %] Subfield structure
>         [% END %]
>-    </div>
>+    </div> 
> 
>     <div class="main container-fluid">
>         <div class="row">
>@@ -159,11 +159,11 @@
>                                                             <option value="10">items (10)</option>
>                                                         [%- END -%]
>                                                         </select>
>-                                                        (ignore means that the subfield does not display in the record editor)
>+                                                        <div class="hint">Ignore means that the subfield does not display in the record editor</div>
>                                                     </li>
>                                                 </ol>
>-                                            </fieldset>
>-                                        </div>
>+                                            </fieldset> 
>+                                        </div> 
> 
>                                         <div id="advanced[% loo.urisubfieldcode | html %]" class="contraints">
>                                             <fieldset class="rows">
>@@ -202,12 +202,12 @@
>                                                         [% ELSE %]
>                                                             <input type="checkbox" id="isurl[% loo.row | html %]" name="isurl[% loo.row | html %]" value="1" />
>                                                         [% END %]
>-                                                        (if checked, it means that the subfield is a URL and can be clicked)
>+                                                        <div class="hint">If checked, it means that the subfield is a URL and can be clicked</div>
>                                                     </li>
>                                                     <li>
>                                                         <label for="link[% loo.row | html %]">Link:</label>
>                                                         <input type="text" id="link[% loo.row | html %]" name="link" value="[% loo.link | html %]" size="10" maxlength="80" />
>-                                                        (an index name, e.g. title or Local-Number)
>+                                                        <div class="hint">An index name, e.g. title or Local-Number</div>
>                                                     </li>
>                                                     <li>
>                                                         <label for="kohafield[% loo.row | html %]">Koha link:</label>
>@@ -225,10 +225,10 @@
>                                                         <input type="hidden" name="kohafield" value="[% loo.kohafield | html %]"/>
>                                                     </li>
>                                                 </ol>
>-                                            </fieldset>
>-                                        </div>
>+                                            </fieldset> 
>+                                        </div> 
> 
>-                                        <div id="oth[% loo.urisubfieldcode | html %]" class="contraints">
>+                                        <div id="oth[% loo.urisubfieldcode | html %]" class="constraints">
>                                             <fieldset class="rows">
>                                                 <legend>Other options (choose one)</legend>
>                                                 <ol>
>@@ -270,17 +270,17 @@
>                                                         </select>
>                                                     </li>
>                                                 </ol>
>-                                            </fieldset>
>-                                        </div>
>-                                    </div>
>-                                [% END %]
>-                            </div>
>+                                            </fieldset> 
>+                                        </div> 
>+                                    </div>
>+                                [% END # /FOREACH loo %]
>+                            </div>
> 
>                             <fieldset class="action">
>                                 <input type="submit" value="Save changes" /> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=[% tagfield  | uri %]&amp;frameworkcode=[% frameworkcode | uri %]" class="cancel">Cancel</a>
>                             </fieldset>
>                         </form>
>-                    [% END %]
>+                    [% END # /IF ( add_form ) %]
> 
>                     [% IF ( delete_confirm ) %]
>                         <div class="dialog alert">
>@@ -304,8 +304,8 @@
>                                 <input type="hidden" name="frameworkcode" value="[% frameworkcode | html %]" />
>                                 <button type="submit" class="deny"><i class="fa fa-fw fa-remove"></i> No, do not delete</button>
>                             </form>
>-                        </div>
>-                    [% END %]
>+                        </div> 
>+                    [% END # /IF ( delete_confirm ) %]
> 
>                     [% IF ( delete_confirmed ) %]
>                         <h3>Data deleted</h3>
>@@ -317,6 +317,7 @@
> 
>                     [% IF ( else ) %]
>                         <h1>MARC subfield structure admin for [% tagfield | html %] [% IF ( frameworkcode ) %](framework [% frameworkcode | html %])[% ELSE %](default framework)[% END %]</h1>
>+
>                         <p>This screen shows the subfields associated with the selected tag. You can edit subfields or add a new one by clicking on edit.</p>
>                         <p>The column 'Koha field' shows that the subfield is linked with a Koha field.</p>
> 
>@@ -365,7 +366,7 @@
>                                     </tr>
>                                 [% END %]
>                             </tbody>
>-                        </table>
>+                        </table> 
> 
>                         <form action="[% script_name | html %]" method="get">
>                             <fieldset class="action"><input type="hidden" name="op" value="add_form" />
>@@ -376,7 +377,7 @@
>                             </fieldset>
>                         </form>
> 
>-                    [% END %]
>+                    [% END # /IF else %]
> 
>                 </main>
>             </div> 
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 26456: 110065 | 110066 | 111306 | 111307 | 111363 | 111364 | 111560 | 111561