Checkbox updates with new bootstrap 3 specifications

Alexandre-T · Jan 4, 2014 · 4cc123c · 4cc123c
1 parent 8e2cb78
commit 4cc123c
Show file tree

Hide file tree

Showing 15 changed files with 186 additions and 109 deletions.
diff --git a/phpBBBootstrap/template/index_body.html b/phpBBBootstrap/template/index_body.html
@@ -17,8 +17,8 @@ <h4><a href="{U_LOGIN_LOGOUT}"><i class="icon-signin"></i> {L_LOGIN_LOGOUT}</a><
 		<!-- ENDIF -->
 		<button type="submit" name="login" value="{L_LOGIN}" class="btn btn-primary"><i class="icon-signin"></i>&nbsp;{L_LOGIN}</button>
 	</div>
-	<div class="form-group">
-		<label class="checkbox" for="autologin"><input type="checkbox" name="autologin" id="autologin" />&nbsp;<small><em>{L_LOG_ME_IN}</em></small></label>
+	<div class="checkbox">
+		<label for="autologin"><input type="checkbox" name="autologin" id="autologin" />&nbsp;<small>{L_LOG_ME_IN}</small></label>
 		{S_LOGIN_REDIRECT}
 	</div>
 	</form>

diff --git a/phpBBBootstrap/template/login_body.html b/phpBBBootstrap/template/login_body.html
@@ -58,19 +58,23 @@
 					<!-- IF S_AUTOLOGIN_ENABLED -->
 					<div class="form-group">
 						<div class="col-lg-offset-3 col-lg-9">
-							<label for="autologin" class="checkbox">
-								<input type="checkbox" name="autologin" id="autologin" tabindex="4" /> 
-								{L_LOG_ME_IN}
-							</label>
+							<div class="checkbox">
+								<label>
+									<input type="checkbox" name="autologin" id="autologin" tabindex="4" /> 
+									{L_LOG_ME_IN}
+								</label>
+							</div>
 						</div>
 					</div>
 					<!-- ENDIF -->
 					<div class="form-group">
 						<div class="col-lg-offset-3 col-lg-9">
-							<label for="viewonline" class="checkbox">
-								<input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> 
-								{L_HIDE_ME}
-							</label>					
+							<div class="checkbox">
+								<label>
+									<input type="checkbox" name="viewonline" id="viewonline" tabindex="5" /> 
+									{L_HIDE_ME}
+								</label>
+							</div>					
 						</div>
 					</div>
 					<!-- ENDIF -->

diff --git a/phpBBBootstrap/template/mcp_approve.html b/phpBBBootstrap/template/mcp_approve.html
@@ -33,17 +33,19 @@
 				</div>
 			</div>
 		<!-- ENDIF -->
-		<!-- IF 1 or S_NOTIFY_POSTER -->
+		<!-- IF S_NOTIFY_POSTER -->
 			<div class="form-group">
 				<div class="<!-- IF S_APPROVE -->col-xs-12<!-- ELSE -->col-sm-offset-4 col-sm-8<!-- ENDIF -->">
-					<label for="notify_poster" class="checkbox-inline">
-						<input type="checkbox" name="notify_poster" checked="checked"/> 
-						<!-- IF S_APPROVE -->
-							{L_NOTIFY_POSTER_APPROVAL}
-						<!-- ELSE -->
-							{L_NOTIFY_POSTER_DISAPPROVAL}
-						<!-- ENDIF -->
-					</label>
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" name="notify_poster" checked="checked"/> 
+							<!-- IF S_APPROVE -->
+								{L_NOTIFY_POSTER_APPROVAL}
+							<!-- ELSE -->
+								{L_NOTIFY_POSTER_DISAPPROVAL}
+							<!-- ENDIF -->
+						</label>
+					</div>
 				</div>
 			</div>
 		<!-- ENDIF -->

diff --git a/phpBBBootstrap/template/mcp_post.html b/phpBBBootstrap/template/mcp_post.html
@@ -197,45 +197,55 @@ <h3 class="panel-title">{L_MOD_OPTIONS}</h3>
 		<!-- IF not S_MCP_QUEUE -->
 
 			<!-- IF S_SHOW_USER_NOTES -->
-				<div class="panel panel-default" id="usernotes">
 
 					<form method="post" id="mcp_notes" action="{U_POST_ACTION}">
 
 					<!-- IF S_USER_NOTES -->
+					<div class="panel panel-default" id="usernotes">
 						<div class="panel-heading"><h3 class="panel-title">{L_FEEDBACK}</h3></div>
 						<div class="panel-body">
 							<!-- BEGIN usernotes -->
-								<strong>{L_REPORTED_BY}: {usernotes.REPORT_BY} &laquo; {usernotes.REPORT_AT}</strong>
-								<!-- IF S_CLEAR_ALLOWED --><div class="right-box"><input type="checkbox" name="marknote[]" value="{usernotes.ID}" /></div><!-- ENDIF -->
-								<div class="postbody">{usernotes.ACTION}</div>
-
+								<blockquote>
+								<!-- IF S_CLEAR_ALLOWED -->
+									<span class="checkbox pull-right">										
+										<label><input type="checkbox" name="marknote[]" value="{usernotes.ID}" />{L_DELETE}</label>
+									</span>
+								<!-- ENDIF -->
+								{usernotes.ACTION}
+								<small>{L_REPORTED_BY}: {usernotes.REPORT_BY} &laquo; {usernotes.REPORT_AT}</small>								
+								</blockquote>
+								<!-- IF not usernotes.S_LAST_ROW -->
 								<hr/>
+								<!-- ENDIF -->
 							<!-- END usernotes -->
-
+						
 							<!-- IF S_CLEAR_ALLOWED -->
+							</div>
+							<div class="panel-footer">
 								<fieldset class="btn-group">
-									<input class="btn btn-warning" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
-									<input class="btn btn-info" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
+									<input class="btn btn-default" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
+									<input class="btn btn-default" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
 								</fieldset>
 							<!-- ENDIF -->
 						</div>
+					</div>
 					<!-- ENDIF -->
-
-					<h4>{L_ADD_FEEDBACK}</h4>
-					<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
-
-					<fieldset>
-						<textarea name="usernote" rows="4" cols="76" class="form-control"></textarea>
-					</fieldset>
-
-					<fieldset class="btn-group">
-						<input class="btn btn-primary" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />
-						<input class="btn btn-default" type="reset" value="{L_RESET}" />
-					</fieldset>
-					{S_FORM_TOKEN}
-					</form>
-
-				</div>
+					<div class="panel panel-default" id="usernotes">
+						<div class="panel-heading"><h3 class="panel-title">{L_ADD_FEEDBACK}</h3></div>
+						<div class="panel-body"><p>{L_ADD_FEEDBACK_EXPLAIN}</p>
+						<fieldset>
+							<textarea name="usernote" rows="4" cols="76" class="form-control"></textarea>
+						</fieldset>
+						</div>
+						<div class="panel-footer">
+								{S_FORM_TOKEN}
+							<fieldset class="btn-group">
+								<input class="btn btn-default" type="reset" value="{L_RESET}" />
+								<input class="btn btn-primary" type="submit" name="action[add_feedback]" value="{L_SUBMIT}" />
+							</fieldset>
+						</div>
+					</div>
+				</form>
 			<!-- ENDIF -->
 
 			<!-- IF S_SHOW_REPORTS -->

diff --git a/phpBBBootstrap/template/mcp_warn_post.html b/phpBBBootstrap/template/mcp_warn_post.html
@@ -32,9 +32,13 @@ <h4 class="fieldset">{L_ADD_WARNING}</h4>
 			<div class="form-group">
 				<textarea name="warning" id="warning" class="form-control" cols="40" rows="3">{L_WARNING_POST_DEFAULT}</textarea>
 				<span class="help-block">{L_ADD_WARNING_EXPLAIN}</span>
-			</div>
+			</div>			
 			<!-- IF S_CAN_NOTIFY -->
-				<label class="checkbox" for="notify_user"><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label>
+			<div class="form-group">
+				<div class="checkbox">
+					<label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label>
+				</div>
+			</div>
 			<!-- ENDIF -->
 		</fieldset>
 	</div>

diff --git a/phpBBBootstrap/template/mcp_warn_user.html b/phpBBBootstrap/template/mcp_warn_user.html
@@ -19,11 +19,16 @@ <h3 class="panel-title">{L_WARN_USER}&nbsp;: «&nbsp;{USERNAME_FULL}&nbsp;»</h3
 			<div class="col-md-8 corps">
 				<h4 class="fieldset">{L_ADD_WARNING}</h4>
 				<p>{L_ADD_WARNING_EXPLAIN}</p>
-
 				<fieldset>
-					<textarea class="form-control" name="warning" id="warning" cols="40" rows="3"></textarea>
+					<div class="form-group">
+						<textarea class="form-control" name="warning" id="warning" cols="40" rows="3"></textarea>
+					</div>
 					<!-- IF S_CAN_NOTIFY -->
-						<label class="checkbox" for="notify_user"><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label>
+					<div class="form-group">
+						<div class="checkbox">
+							<label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label>
+						</div>
+					</div>
 					<!-- ENDIF -->
 				</fieldset>
 			</div>

diff --git a/phpBBBootstrap/template/memberlist_email.html b/phpBBBootstrap/template/memberlist_email.html
@@ -1,12 +1,10 @@
 <!-- INCLUDE overall_header.html -->
 
-<h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2>
-
 <form method="post" action="{S_POST_ACTION}" id="post" class="form-horizontal">
-
-	<div class="content">
+<div class="panel panel-default">
+	<div class="panel-heading"><h2 class="panel-title"><i class="icon-envelope"></i>&nbsp;{L_SEND_EMAIL_USER} {USERNAME}</h2></div>
+	<div class="panel-body">
 		<!-- IF ERROR_MESSAGE --><p class="alert alert-danger">{ERROR_MESSAGE}</p><!-- ENDIF -->
-		<fieldset>
 		<!-- IF S_SEND_USER -->
 			<div class="form-group">
 				<label class="control-label col-md-3">{L_RECIPIENT}</label>
@@ -49,19 +47,20 @@ <h2 class="titlespace">{L_SEND_EMAIL_USER} {USERNAME}</h2>
 			</div>
 		</div>
 		<div class="form-group">
-			<div class="col-md-offset-3 col-md-9"> 
-				<label class="checkbox-inline" for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label>
+			<div class="col-md-offset-3 col-md-9">
+				<div class="checkbox">
+					<label for="cc_email"><input type="checkbox" name="cc_email" id="cc_email" value="1" checked="checked" tabindex="5" /> {L_CC_EMAIL}</label>
+				</div> 
 			</div>
 		</div>
+	</div>
+	<div class="panel-footer">
+		<fieldset>
+			<input type="submit" tabindex="6" name="submit" class="btn btn-primary" value="{L_SEND_EMAIL}" />
 		</fieldset>
-		<div class="row">
-			<fieldset class="col-md-offset-3 col-md-9">
-				<input type="submit" tabindex="6" name="submit" class="btn btn-primary" value="{L_SEND_EMAIL}" />
-			</fieldset>
-		</div>
 	</div>
-	{S_FORM_TOKEN}
-
+</div>
+{S_FORM_TOKEN}
 </form>
 
 <!-- INCLUDE overall_footer.html -->
diff --git a/phpBBBootstrap/template/posting_editor.html b/phpBBBootstrap/template/posting_editor.html
@@ -103,7 +103,9 @@
 	<!-- IF S_DELETE_ALLOWED -->
 	<div class="form-group">
 		<div class="col-sm-offset-2 col-sm-10">
-			<label class="checkbox" for="delete"><input type="checkbox" name="delete" id="delete" /> {L_DELETE_POST}</label>
+			<div class="checkbox">
+				<label><input type="checkbox" name="delete" id="delete" /> {L_DELETE_POST}</label>
+			</div>
 			<span class="help-block">{L_DELETE_POST_WARN}</span>
 		</div>
 	</div>
@@ -209,33 +211,47 @@ <h4 class="panel-title">{L_POSTED_ATTACHMENTS}</h4>
 			<!-- IF S_SHOW_ATTACH_BOX --><li><a href="#attach" data-toggle="tab">{L_ADD_ATTACHMENT}</a></li><!-- ENDIF -->
 			<!-- IF S_SHOW_POLL_BOX or S_POLL_DELETE --><li><a href="#poll" data-toggle="tab">{L_ADD_POLL}</a><!-- ENDIF -->
 		</ul>
-		<div id="myTabContent" class="tab-content">
+		<div id="myTabContent" class="tab-content forum-top-buffer">
 			<div class="tab-pane fade in active" id="options">
 				<fieldset>
 					<!-- IF S_BBCODE_ALLOWED or S_SMILIES_ALLOWED or S_LINKS_ALLOWED or S_SIG_ALLOWED or S_NOTIFY_ALLOWED or S_LOCK_TOPIC_ALLOWED or S_LOCK_POST_ALLOWED -->
 					<div class="form-group">
 						<label class="control-label col-sm-2">{L_OPTIONS}</label>
 						<div class="col-sm-10">
 							<!-- IF S_BBCODE_ALLOWED -->
-								<label class="checkbox" for="disable_bbcode"><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="disable_bbcode" id="disable_bbcode"{S_BBCODE_CHECKED} /> {L_DISABLE_BBCODE}</label>
+								</div>
 							<!-- ENDIF -->
 							<!-- IF S_SMILIES_ALLOWED -->
-								<label class="checkbox" for="disable_smilies"><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="disable_smilies" id="disable_smilies"{S_SMILIES_CHECKED} /> {L_DISABLE_SMILIES}</label>
+								</div>
 							<!-- ENDIF -->
 							<!-- IF S_LINKS_ALLOWED -->
-								<label class="checkbox" for="disable_magic_url"><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="disable_magic_url" id="disable_magic_url"{S_MAGIC_URL_CHECKED} /> {L_DISABLE_MAGIC_URL}</label>
+								</div>
 							<!-- ENDIF -->
 							<!-- IF S_SIG_ALLOWED -->
-								<label class="checkbox" for="attach_sig"><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED} /> {L_ATTACH_SIG}</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="attach_sig" id="attach_sig"{S_SIGNATURE_CHECKED} /> {L_ATTACH_SIG}</label>
+								</div>
 							<!-- ENDIF -->
 							<!-- IF S_NOTIFY_ALLOWED -->
-								<label class="checkbox" for="notify"><input type="checkbox" name="notify" id="notify"{S_NOTIFY_CHECKED} /> {L_NOTIFY_REPLY}</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="notify" id="notify"{S_NOTIFY_CHECKED} /> {L_NOTIFY_REPLY}</label>
+								</div>
 							<!-- ENDIF -->
 							<!-- IF S_LOCK_TOPIC_ALLOWED -->
-								<label class="checkbox" for="lock_topic"><input type="checkbox" name="lock_topic" id="lock_topic"{S_LOCK_TOPIC_CHECKED} /> {L_LOCK_TOPIC}</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="lock_topic" id="lock_topic"{S_LOCK_TOPIC_CHECKED} /> {L_LOCK_TOPIC}</label>
+								</div>
 							<!-- ENDIF -->
 							<!-- IF S_LOCK_POST_ALLOWED -->
-								<label class="checkbox" for="lock_post"><input type="checkbox" name="lock_post" id="lock_post"{S_LOCK_POST_CHECKED} /> {L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</label>
+								<div class="checkbox">
+									<label><input type="checkbox" name="lock_post" id="lock_post"{S_LOCK_POST_CHECKED} /> {L_LOCK_POST} [{L_LOCK_POST_EXPLAIN}]</label>
+								</div>
 							<!-- ENDIF -->
 						</div>
 					</div>

diff --git a/phpBBBootstrap/template/posting_poll_body.html b/phpBBBootstrap/template/posting_poll_body.html
@@ -6,14 +6,6 @@
 
 	<fieldset>
 	<!-- IF S_SHOW_POLL_BOX -->
-		<!-- IF S_POLL_DELETE -->
-			<div class="form-group">
-				<label class="control-label col-sm-2" for="poll_delete">{L_POLL_DELETE} </label>
-				<div class="col-sm-10">
-					<input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> />
-				</div>
-			</div>
-		<!-- ENDIF -->
 		<div class="form-group">
 			<label class="control-label col-sm-2" for="poll_title">{L_POLL_QUESTION} </label>
 			<div class="col-sm-10">
@@ -26,6 +18,18 @@
 				<textarea name="poll_option_text" id="poll_option_text" rows="5" cols="35" class="form-control">{POLL_OPTIONS}</textarea>
 			</div>
 		</div>
+		<!-- IF S_POLL_DELETE -->
+			<div class="form-group">				
+				<div class="col-sm-offset-2 col-sm-10">
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> />
+							{L_POLL_DELETE} 
+						</label>
+					</div>
+				</div>
+			</div>
+		<!-- ENDIF -->
 
 		<hr/>
 
@@ -54,7 +58,12 @@
 			<div class="form-group">
 				<label class="control-label col-sm-2" for="poll_vote_change">{L_POLL_VOTE_CHANGE} </label>
 				<div class="col-sm-10">
-					<label class="checkbox-inline" for="poll_vote_change"><input type="checkbox" id="poll_vote_change" name="poll_vote_change" {VOTE_CHANGE_CHECKED} /> {L_POLL_VOTE_CHANGE_EXPLAIN}</label>
+					<div class="checkbox">
+						<label>
+							<input type="checkbox" id="poll_vote_change" name="poll_vote_change" {VOTE_CHANGE_CHECKED} /> 
+							{L_POLL_VOTE_CHANGE_EXPLAIN}
+						</label>
+					</div>
 				</div>
 			</div>
 		<!-- ENDIF -->
@@ -63,7 +72,11 @@
 		<div class="form-group">
 			<label class="control-label col-sm-2" for="poll_delete">{L_POLL_DELETE} </label>
 			<div class="col-sm-10">
-				<label class="checkbox" for="poll_delete"><input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> /></label>
+				<div class="checkbox">
+					<label>
+						<input type="checkbox" name="poll_delete" id="poll_delete"<!-- IF S_POLL_DELETE_CHECKED --> checked="checked"<!-- ENDIF --> />
+					</label>
+				</div>
 			</div>
 		</div>
 	<!-- ENDIF -->