(MT #4108) Notes in serial

The public and nonpublic notes was redundant with two areas in the page, one was inactive, and in edit subscription page, the subscription history area had two redundant blocks for notes, this fix it.

Signed-off-by: Colin Campbell <colin.campbell@ptfs-europe.com>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
index ae4932e..9b839d9 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-add.tmpl
@@ -1106,13 +1106,6 @@ $(document).ready(function() {
             <textarea name="missinglist" id="missinglist" cols="60" rows="5"><!-- TMPL_VAR name="missinglist" --></textarea>
             </li>
             <li>
-                <label for="opacnote">Note for OPAC</label>
-            <textarea name="opacnote" id="opacnote" cols="60" rows="5"><!-- TMPL_VAR name="opacnote" --></textarea>
-            </li>
-            <li>
-                <label for="librariannote">Note for staff</label>
-            <textarea name="librariannote" id="librariannote" cols="60" rows="5"><!-- TMPL_VAR name="librariannote" --></textarea>
-            </li>
                </ol>
         </fieldset>
     <fieldset class="action"><input type="submit" value="Save subscription history"  /></fieldset>

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
index 86c3efc..a0d6ad2 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/subscription-detail.tmpl
@@ -95,9 +95,7 @@ function popup(subscriptionid) {
                <!-- TMPL_IF NAME="staffdisplaycount" --><li><span class="label">Number of issues to display to staff</span>:&nbsp;<!-- TMPL_VAR NAME="staffdisplaycount" -->&nbsp;</li><!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="opacdisplaycount" --><li><span class="label">Number of issues to display to the public</span>:&nbsp;<!-- TMPL_VAR NAME="opacdisplaycount" -->&nbsp;</li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="letter" --><li><span class="label">Patron alert with:</span> <!-- TMPL_VAR name="letter" -->&nbsp;</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="notes" --><li><span class="label">Notes:</span> <!-- TMPL_VAR name="notes" --></li><!-- /TMPL_IF -->
         <!-- TMPL_IF name="hasRouting" --><li><span class="label">Routing:</span> yes</li><!-- /TMPL_IF -->
-        <!-- TMPL_IF name="internalnotes" --><li><span class="label">Management Notes:</span> <!-- TMPL_VAR name="internalnotes" --></li><!-- /TMPL_IF -->
      </ul>
     </div>
     <div id="subscription_planning">
@@ -353,8 +351,8 @@ function popup(subscriptionid) {
             </tr>
             <tr><td><label>Received issues</label></td><td><!-- TMPL_VAR name="recievedlist" --></td></tr>
             <tr><td><label>Missing issues</label></td><td><!-- TMPL_VAR name="missinglist" --></td></tr>
-            <tr><td><label>Nonpublic note</label></td><td><!-- TMPL_VAR name="librariannote" --></td></tr>
-            <tr><td><label>Public note</label></td><td><!-- TMPL_VAR name="opacnote" --></td></tr>
+            <tr><td><label>Nonpublic note</label></td><td><!-- TMPL_VAR name="internalnotes" --></td></tr>
+            <tr><td><label>Public note</label></td><td><!-- TMPL_VAR name="notes" --></td></tr>
         </table>
     </div>