Merge branch 'Bug3506' into ptfs-master

liblime · May 3, 2010 · dcc100f · dcc100f
2 parents 1e35a1e + cf8741a
commit dcc100f
Showing 1 changed file with 1 addition and 13 deletions.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
@@ -293,24 +293,12 @@ function refocus(calendar) {
 	    <label><strong>Superlibrarian Authorization Required</strong></label>
 	    </p><p>
 	    <label for="auth_username">Username:</label>
-	    <input type="text" id="auth_username" name="auth_username" />
+	    <input type="text" id="auth_username" name="auth_username" /></p><p>
 	    <label for="auth_password">Password:</label>
 	    <input type="password" id="auth_password" name="auth_password" />
 	    </p>
 	<!-- /TMPL_IF -->
 <!-- /TMPL_IF -->    
-<!-- TMPL_IF NAME="RESERVE_WAITING" -->
-        <!-- TMPL_IF NAME="DisableHoldsIssueOverrideUnlessAuthorised" -->
-            <p>
-            <label><strong>Superlibrarian Authorization Required</strong></label>
-            </p><p>
-            <label for="auth_username">Username:</label>
-            <input type="text" id="auth_username" name="auth_username" />
-            <label for="auth_password">Password:</label>
-            <input type="password" id="auth_password" name="auth_password" />
-            </p>
-        <!-- /TMPL_IF -->
-<!-- /TMPL_IF -->    
 
 <!-- TMPL_IF NAME="DisableHoldsIssueOverrideUnlessAuthorised" -->
     <p>