fixing line break problem, changing Cirrus' font url to protocol-relative URL

2015-01-10 20:23:08 +00:00
parent 9fab39129a
commit edbcd4b817
7 changed files with 29 additions and 27 deletions
--- a/modules/webadmin/tmpl/add_edit_chan.tmpl
+++ b/modules/webadmin/tmpl/add_edit_chan.tmpl
@@ -64,7 +64,7 @@
 									<td><div class="checkboxSwitch"><input type="checkbox" name="<? VAR Name ?>" id="opt_<? VAR Name ?>" value="true"<? IF Checked ?> checked="checked"<? ENDIF ?><? IF Disabled ?> disabled="disabled"<? ENDIF ?> /> <label for="opt_<? VAR Name ?>"></label> </div></td>
 									<td><? VAR DisplayName ?></td>		 
 								</tr>
-								<? ENDLOOP ?>	
+<? ENDLOOP ?>	
 							</tbody>
 						</table>	
 					</div>
@@ -77,7 +77,7 @@
 			<? INC *Embed ?>
 		</div>
 		<? ENDIF ?>
-	<? ENDLOOP ?>
+<? ENDLOOP ?>
 	
 	<div class="btn-group pull-right">
 		<input class="btn btn-danger" type="reset" value="Reset">
--- a/modules/webadmin/tmpl/add_edit_network.tmpl
+++ b/modules/webadmin/tmpl/add_edit_network.tmpl
@@ -58,7 +58,7 @@
 							<option value="">Default</option>
 								<? LOOP BindHostLoop ?>
 									<option value="<? VAR BindHost ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? VAR BindHost ?></option>
-								<? ENDLOOP ?>
+<? ENDLOOP ?>
 						</select>
 					<? ELSE ?>
 						<input class="form-control" type="text" name="bindhost" value="<? VAR BindHost ?>"/>
@@ -81,7 +81,8 @@
 			<div class="form-group">
 				<label for="inputServers" class="col-sm-2 control-label">Servers of this IRC network:</label>
 					<div class="col-sm-10">
-						<textarea class="form-control" name="servers" rows="5"><? LOOP ServerLoop ?><? VAR Server ?><? ENDLOOP ?></textarea>
+						<textarea class="form-control" name="servers" rows="5"><? LOOP ServerLoop ?><? VAR Server ?>
+<? ENDLOOP ?></textarea>
 						<span class="help-block">One server per line, "host [[+]port] [password]", + means SSL</span>
 					</div>
 			</div>	
@@ -157,7 +158,7 @@
 						<td><? VAR BufferCount ?></td>
 						<td><? VAR Options ?></td>
 					</tr>
-					<? ENDLOOP ?>
+<? ENDLOOP ?>
 				</tbody>
 			</table>
 			<? ENDIF ?>
@@ -196,7 +197,7 @@
 						</td>
 						<td><? VAR Description ?></td>
 					</tr>
-				<? ENDLOOP ?>
+<? ENDLOOP ?>
 				</tbody>
 			</table>

@@ -205,7 +206,7 @@
 			<h3>Module <? VAR ModName ?></h3>
 			<? INC *Embed ?>
 		<? ENDIF ?>
-	<? ENDLOOP ?>
+<? ENDLOOP ?>

 	<div class="btn-group pull-right">
 		<input class="btn btn-danger" type="reset" value="Reset">
--- a/modules/webadmin/tmpl/add_edit_user.tmpl
+++ b/modules/webadmin/tmpl/add_edit_user.tmpl
@@ -46,7 +46,8 @@
 				<div class="form-group">
 					<label for="inputAllowedIP" class="col-sm-2 control-label">Allowed IPs:</label>
 						<div class="col-sm-10">
-							<textarea class="form-control class="form-control" data-provide="markdown" id="inputAllowedIP" name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ?><? ENDLOOP ?></textarea>
+							<textarea class="form-control class="form-control" data-provide="markdown" id="inputAllowedIP" name="allowedips" cols="70" rows="5"><? LOOP AllowedHostLoop ?><? VAR Host ?>
+<? ENDLOOP ?></textarea>
 							<div class="alert alert-info help-block">Leave empty to allow connections from all IPs. Otherwise, one entry per line, wildcards * and ? are available.</div>
 						</div>
 				</div>		
@@ -160,7 +161,7 @@
 					<td><? VAR Server DEFAULT="-N/A-" ?></td>
 					<td><? VAR IRCNick ?></td>
 				</tr>
-				<? ENDLOOP ?>
+<? ENDLOOP ?>
 			</tbody>
 		</table>
     	<? ELSE ?>
@@ -203,7 +204,7 @@
 						</td>
 						<td><? VAR Description ?></td>
 				</tr>
-				<? ENDLOOP ?>
+<? ENDLOOP ?>
 			</tbody>
 		</table>
 
@@ -251,7 +252,7 @@
 								<b><? VAR DisplayName ?></b>
 							</td>
 						</tr>
-						<? ENDLOOP ?>
+<? ENDLOOP ?>
 					</tbody>
 				</table>						
 			</div>
@@ -300,7 +301,8 @@
 		<div class="form-group">
 			<label for="inputCTCPreplies" class="col-sm-2 control-label">CTCP Replies:</label>
 				<div class="col-sm-10">
-					<textarea class="form-control" id="inputCTCPreplies" name="ctcpreplies" cols="70" rows="3"><? LOOP CTCPLoop ?><? VAR CTCP ?><? ENDLOOP ?></textarea>
+					<textarea class="form-control" id="inputCTCPreplies" name="ctcpreplies" cols="70" rows="3"><? LOOP CTCPLoop ?><? VAR CTCP ?>
+<? ENDLOOP ?></textarea>
 					<div class="alert alert-info help-block">One reply per line. Example: TIME Buy a watch!</div>
 				</div>
 		</div>
@@ -313,7 +315,7 @@
 						<option value="">- Global -</option>
 							<? LOOP SkinLoop ?>
 								<option value="<? VAR Name ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?>Default<? ELSE ?><? VAR Name ?><? ENDIF ?></option>
-							<? ENDLOOP ?>
+<? ENDLOOP ?>
 					</select>
 					<? ELSE ?>
 					<p>No other skins found!</p>
@@ -333,7 +335,7 @@
 				</div>
 		</div>
 		<? ENDIF ?>
-		<? ENDLOOP ?>
+<? ENDLOOP ?>

 	<div class="btn-group pull-right">
 		<input class="btn btn-danger" type="reset" value="Reset">
--- a/modules/webadmin/tmpl/settings.tmpl
+++ b/modules/webadmin/tmpl/settings.tmpl
@@ -65,7 +65,7 @@
 						<? ENDIF ?>
 						</td>
 					</tr>
-				<? ENDLOOP ?>
+<? ENDLOOP ?>
 					<tr>
 						<form action="add_listener" method="post">
 							<? INC _csrf_check.tmpl ?>
@@ -121,7 +121,7 @@
 					<select class="form-control" id="inputSkins" name="skin">
 						<? LOOP SkinLoop ?>
 							<option value="<? VAR Name ?>"<? IF Checked ?> selected="selected"<? ENDIF ?>><? IF Name == "_default_" ?>Default<? ELSE ?><? VAR Name ?><? ENDIF ?></option>
-						<? ENDLOOP ?>
+<? ENDLOOP ?>
 					</select>
 				</div>
 		</div>
@@ -176,7 +176,8 @@
 		<div class="form-group">
 			<label for="inputMOTD" class="col-sm-2 control-label">MOTD:</label>
 				<div class="col-sm-10">
-					<textarea type="text" class="form-control" id="inputMOTD" name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?><? ENDLOOP ?></textarea>
+					<textarea type="text" class="form-control" id="inputMOTD" name="motd" cols="70" rows="5" class="monospace"><? LOOP MOTDLoop ?><? VAR Line ?>
+<? ENDLOOP ?></textarea>
 					<div class="alert alert-info help-block">"Message of the Day", sent to all ZNC users on connect.</div>
 				</div>
 		</div>
@@ -184,10 +185,8 @@
 		<div class="form-group">
 			<label for="inputBindHosts" class="col-sm-2 control-label">BindHosts:</label>
 				<div class="col-sm-10">
-					<textarea type="text" class="form-control" id="inputBindHosts" name="bindhosts" rows="5">
-					<? LOOP BindHostLoop ?>
-					<? VAR BindHost ?>
-					<? ENDLOOP ?>
+					<textarea type="text" class="form-control" id="inputBindHosts" name="bindhosts" rows="5"><? LOOP BindHostLoop ?><? VAR BindHost ?>
+<? ENDLOOP ?>
 					</textarea>
 					<div class="alert alert-info help-block">One host name or IP entry per line.</div>
 				</div>
@@ -225,7 +224,7 @@
 						</td>
 						<td class="mod_descr"><? VAR Description ?></td>
 					</tr>
-					<? ENDLOOP ?>
+<? ENDLOOP ?>
 				</tbody>
 			</table>

@@ -239,4 +238,4 @@
 	</div>
 </div>

-<? INC Footer.tmpl ?>
+<? INC Footer.tmpl ?>
--- a/modules/webadmin/tmpl/traffic.tmpl
+++ b/modules/webadmin/tmpl/traffic.tmpl
@@ -126,7 +126,7 @@
 					<td><? VAR AllTotal TOP ?></td>
 				</tr>
 				<? ENDIF ?>
-			<? ENDLOOP ?>
+<? ENDLOOP ?>
 			</tbody>
 		</table>
 <? ENDIF ?>