Merge branch 'refs/heads/master' into updates/testing

phpbb-extensions · Jun 20, 2014 · c8d2798 · c8d2798
2 parents 3f87baa + 153b1aa
commit c8d2798
Show file tree

Hide file tree

Showing 9 changed files with 988 additions and 11 deletions.
diff --git a/acp/board_announcements_module.php b/acp/board_announcements_module.php
@@ -194,6 +194,8 @@ public function main($id, $mode)
 			'S_BBCODE_FLASH'		=> true,
 			'S_LINKS_ALLOWED'		=> true,
 
+			'S_BOARD_ANNOUNCEMENTS'	=> true,
+
 			'U_ACTION'				=> $this->u_action,
 		));
 

diff --git a/adm/style/board_announcements.html b/adm/style/board_announcements.html
@@ -60,7 +60,7 @@ <h3>{L_WARNING}</h3>
 		<dl>
 			<dt><label for="board_announcements_bgcolor">{L_BOARD_ANNOUNCEMENTS_BGCOLOR}{L_COLON}</label><br /><span>{L_BOARD_ANNOUNCEMENTS_BGCOLOR_EXPLAIN}</span></dt>
 			<dd>
-				<input name="board_announcements_bgcolor" type="text" id="board_announcements_bgcolor" value="{BOARD_ANNOUNCEMENTS_BGCOLOR}" size="6" maxlength="6" />
+				<input name="board_announcements_bgcolor" type="text" id="board_announcements_bgcolor" value="{BOARD_ANNOUNCEMENTS_BGCOLOR}" size="6" maxlength="6" <!-- IF BOARD_ANNOUNCEMENTS_BGCOLOR -->style="border-right:20px solid #{BOARD_ANNOUNCEMENTS_BGCOLOR}"<!-- ENDIF --> />
 			</dd>
 		</dl>
-Original file line number
+Diff line change
@@ Expand Up / @@ -60,7 +60,7 @@ <h3>{L_WARNING}</h3> @@
     		<dl>
     			<dt><label for="board_announcements_bgcolor">{L_BOARD_ANNOUNCEMENTS_BGCOLOR}{L_COLON}</label><br /><span>{L_BOARD_ANNOUNCEMENTS_BGCOLOR_EXPLAIN}</span></dt>
     			<dd>
-    				<input name="board_announcements_bgcolor" type="text" id="board_announcements_bgcolor" value="{BOARD_ANNOUNCEMENTS_BGCOLOR}" size="6" maxlength="6" />
+    				<input name="board_announcements_bgcolor" type="text" id="board_announcements_bgcolor" value="{BOARD_ANNOUNCEMENTS_BGCOLOR}" size="6" maxlength="6" <!-- IF BOARD_ANNOUNCEMENTS_BGCOLOR -->style="border-right:20px solid #{BOARD_ANNOUNCEMENTS_BGCOLOR}"<!-- ENDIF --> />
     			</dd>
     		</dl>
@@ Expand Down @@