Attachment 90789 Details for Bug 23159 – Bug 23159: (followup) re-add comments"

[patch] Bug 23159: (followup) re-add comments"

Bug-23159-followup-re-add-comments.patch (text/plain), 6.80 KB, created by Mark Tompsett on 2019-06-19 14:09:38 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mark Tompsett

Created: 2019-06-19 14:09:38 UTC

Size: 6.80 KB

patch

obsolete

>From 7c8398ebea90986524f950717c8a584da678a6dc Mon Sep 17 00:00:00 2001
>From: Mark Tompsett <mtompset@hotmail.com>
>Date: Wed, 19 Jun 2019 14:06:28 +0000
>Subject: [PATCH] Bug 23159: (followup) re-add comments"
>
>This reverts the previous followup, so that all patches
>can be pushed without only pushing the first one.
>---
> .../prog/en/modules/cataloguing/addbiblio.tt       | 42 +++++++++++-----------
> 1 file changed, 21 insertions(+), 21 deletions(-)
>
>diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>index c9e4ab6819..b13ed094c2 100644
>--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tt
>@@ -489,9 +489,9 @@
>                                     <button type="submit" class="new" onclick="confirmnotdup('view'); return false;"><i class="fa fa-fw fa-save"></i> No, save as new record</button>
>                                 [% END %]
>                             </form>
>-                        </div>
>-                    [% END %]
>-                [% END %]
>+                        </div> 
>+                    [% END # /IF duplicatebiblionumber %]
>+                [% END # /UNLESS number %]
> 
>                 [% IF ( done ) %]
>                     <script>
>@@ -528,7 +528,7 @@
>                     [% ELSE %]
>                         
>                         <div class="btn-group"><a href="#" id="saveandview" class="btn btn-default"><i class="fa fa-save"></i> Save</a></div>
>-                    [% END %]
>+                    [% END # /IF CAN_user_editcatalogue_edit_items %]
> 
>                     [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
>                         <div class="btn-group"><a class="btn btn-default" href="#" id="z3950search"><i class="fa fa-search"></i> Z39.50/SRU search</a></div>
>@@ -571,8 +571,8 @@
>                                     </a>
>                                 </li>
>                             [% END %]
>-                        </ul>
>-                    </div>
>+                        </ul> 
>+                    </div> 
>                     [% UNLESS (circborrowernumber) %][%# Hide in fast cataloging %]
>                         [% IF (biblionumber) %]
>                             [% IF ( BiblioDefaultViewmarc ) %]
>@@ -595,7 +595,7 @@
>                         [% ELSE %]
>                             <a class="btn btn-default" id="cancel" href="/cgi-bin/koha/cataloguing/addbooks.pl">Cancel</a>
>                         [% END %]
>-                    [% END %]
>+                    [% END # /UNLESS circborrowernumber %]
>                     <div class="toolbar-tabs-container">
>                         [% IF ( BIG_LOOP.size > 1 ) %]
>                             <ul class="toolbar-tabs">
>@@ -697,7 +697,7 @@
>                                                     size="1"
>                                                     maxlength="1"
>                                                     value="[% innerloo.indicator2 | html %]" />
>-                                            [% END %] -
>+                                            [% END # /IF innerloo.fixedfield %] -
> 
>                                             [% UNLESS advancedMARCEditor %]
>                                                 <a href="#" tabindex="1" class="expandfield" onclick="ExpandField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Click to Expand this Tag">[% innerloo.tag_lib | html %]</a>
>@@ -712,8 +712,8 @@
>                                                 <a href="#" tabindex="1" class="buttonMinus" onclick="UnCloneField('tag_[% innerloo.tag | html %]_[% innerloo.index | html %][% innerloo.random | html %]'); return false;" title="Delete this Tag">
>                                                     <img src="[% interface | html %]/[% theme | html %]/img/delete-tag.png" alt="Delete this Tag" />
>                                                 </a>
>-                                            </span>
>-                                        </div>
>+                                            </span> 
>+                                        </div> 
> 
>                                         [% FOREACH subfield_loo IN innerloo.subfield_loop %]
>                                             
>@@ -789,7 +789,7 @@
>                                                         [% END %]
>                                                     [% END %]
>                                                     </select>
>-                                                [% END %]
>+                                                [% END  # /IF (mv.type...) %]
>                                                 [% IF ( subfield_loo.mandatory ) %]
>                                                     <span class="required">Required</span>
>                                                 [% END %]
>@@ -803,15 +803,15 @@
>                                                         </a>
>                                                     [% END %]
>                                                 </span>
>-                                            </div>
>+                                            </div> 
>                                             
>-                                            [% END %]
>-                                    </div>
>+                                        [% END # /FOREACH subfield_loop %]
>+                                    </div> 
>                                 [% END %]
>-                            [% END %]
>-                        </div>
>-                    [% END %]
>-                </div>
>+                            [% END # /FOREACH BIG_LOO.innerloop %]
>+                        </div> 
>+                    [% END # /FOREACH BIG_LOOP %]
>+                </div>
> 
>                 [%# Fields for fast cataloging %]
>                 <input type="hidden" name="barcode" value="[% barcode | html %]" />
>@@ -820,8 +820,8 @@
>                 <input type="hidden" name="stickyduedate" value="[% stickyduedate | html %]" />
>                 <input type="hidden" name="duedatespec" value="[% duedatespec | html %]" />
>                 [%# End of fields for fast cataloging %]
>-            </form>
>-        </div>
>-    </div>
>+            </form> 
>+        </div> 
>+    </div> 
> 
> [% INCLUDE 'intranet-bottom.inc' %]
>-- 
>2.11.0

Actions: View | Diff | Splinter Review

Attachments on bug 23159: 90786 | 90789 | 90790 | 90791 | 90792 | 90793 | 90794 | 90873 | 90874 | 90875