diff --git a/img/test.png b/img/test.png
index 1d736af2d..7b46d9ec2 100644
Binary files a/img/test.png and b/img/test.png differ
diff --git a/include/parser.php b/include/parser.php
index 7cf86d445..bc8b6204d 100644
--- a/include/parser.php
+++ b/include/parser.php
@@ -1,4 +1,4 @@
-
+', '', ''.$text.'
');
return $text;
-}
\ No newline at end of file
+}
diff --git a/include/search_idx.php b/include/search_idx.php
index a4ba7134e..1e49827da 100644
--- a/include/search_idx.php
+++ b/include/search_idx.php
@@ -318,4 +318,4 @@ function strip_search_index($post_ids)
}
$db->query('DELETE FROM '.$db->prefix.'search_matches WHERE post_id IN('.$post_ids.')') or error('Unable to delete search index word match', __FILE__, __LINE__, $db->error());
-}
\ No newline at end of file
+}
diff --git a/include/template/main.tpl b/include/template/main.tpl
index 2bab7ebe0..1d91dabaa 100644
--- a/include/template/main.tpl
+++ b/include/template/main.tpl
@@ -30,9 +30,9 @@
-
-
-
+
+
+
diff --git a/lang/English/admin_users.php b/lang/English/admin_users.php
index 49fad72c4..76d6639a1 100644
--- a/lang/English/admin_users.php
+++ b/lang/English/admin_users.php
@@ -58,8 +58,6 @@
'Last post after label' => 'Last post is after',
'Date help' => '(yyyy-mm-dd hh:mm:ss)',
'Last post before label' => 'Last post is before',
-'Last visit after label' => 'Last visit is after',
-'Last visit before label' => 'Last visit is before',
'Registered after label' => 'Registered after',
'Registered before label' => 'Registered before',
'Order by label' => 'Order by',
@@ -67,7 +65,6 @@
'Order by e-mail' => 'Email',
'Order by posts' => 'Number of posts',
'Order by last post' => 'Last post',
-'Order by last visit' => 'Last visit',
'Order by registered' => 'Registered',
'Ascending' => 'Ascending',
'Descending' => 'Descending',
diff --git a/lang/English/help.php b/lang/English/help.php
index 7b4e533a6..92895668f 100644
--- a/lang/English/help.php
+++ b/lang/English/help.php
@@ -25,16 +25,10 @@
'Links and images' => 'Links and images',
'Links info' => 'You can create links to other documents or to email addresses using the following tags:',
-'This help page' => 'This help page',
'My email address' => 'My email address',
'Images info' => 'If you want to display an image you can use the img tag. The text appearing after the "=" sign in the opening tag is used for the alt attribute and should be included whenever possible.',
'FluxBB bbcode test' => 'FluxBB bbcode test',
-'Test topic' => 'Test topic',
-'Test post' => 'Test post',
-'Test forum' => 'Test forum',
-'Test user' => 'Test user',
-
'Quotes' => 'Quotes',
'Quotes info' => 'If you want to quote someone, you should use the quote tag.',
'Quotes info 2' => 'If you don\'t want to quote anyone in particular, you can use the quote tag without specifying a name.',
diff --git a/lang/English/profile.php b/lang/English/profile.php
index 5687e355c..b1aa3ab22 100644
--- a/lang/English/profile.php
+++ b/lang/English/profile.php
@@ -81,7 +81,6 @@
'Realname' => 'Real name',
'Location' => 'Location',
'Website' => 'Website',
-'Invalid website URL' => 'The website URL you entered is invalid.',
'Jabber' => 'Jabber',
'ICQ' => 'ICQ',
'MSN' => 'MSN Messenger',
diff --git a/lang/English/update.php b/lang/English/update.php
index f7554bc48..d4e64b6f8 100644
--- a/lang/English/update.php
+++ b/lang/English/update.php
@@ -70,4 +70,8 @@
'Username BBCode error' => 'Usernames may not contain any of the text formatting tags (BBCode) that the forum uses. Please choose another username.',
'Username duplicate error' => 'Someone is already registered with the username %s. The username you entered is too similar. The username must differ from that by at least one alphanumerical character (a-z or 0-9). Please choose a different username.',
+'JavaScript disabled' => 'JavaScript seems to be disabled. %s.',
+'Click here to continue' => 'Click here to continue',
+'Required field' => 'is a required field in this form.'
+
);
diff --git a/misc.php b/misc.php
index 1458c314e..846831332 100644
--- a/misc.php
+++ b/misc.php
@@ -239,7 +239,7 @@
{
$mail_subject = sprintf($lang_common['Report notification'], $forum_id, $subject);
$mail_message = sprintf($lang_common['Report message 1'], $pun_user['username'], get_base_url().'/viewtopic.php?pid='.$post_id.'#p'.$post_id)."\n";
- $mail_message .= "\n".sprintf($lang_common['Report message 2'], $reason)."\n";
+ $mail_message .= sprintf($lang_common['Report message 2'], $reason)."\n";
$mail_message .= "\n".'--'."\n".$lang_common['Email signature'];
require PUN_ROOT.'include/email.php';
diff --git a/style/Air/base_admin.css b/style/Air/base_admin.css
index 2948b81bf..45f192a5b 100644
--- a/style/Air/base_admin.css
+++ b/style/Air/base_admin.css
@@ -123,41 +123,25 @@
text-align: center;
}
-#users2 .tcl, #bans1 .tcl {
- width: auto;
+#users2 .tcl, #users2 .tc3, #users2 .tc5, #bans1 .tcl, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
+ width: 15%;
text-align: left;
}
#users2 .tc2, #bans1 .tc2 {
- width: 18%;
- text-align: left;
-}
-
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
- width: 12%;
+ width: 22%;
text-align: left;
}
#users2 .tc4, #bans1 .tc4 {
- width: 10%;
+ width: 8%;
text-align: center;
}
-#users2 .tcr {
- width: 20%;
- white-space: nowrap;
-}
-
-#bans1 .tcr {
- width: 15%;
+#users2 .tcr, #bans1 .tcr {
white-space: nowrap;
}
-#users2 .tcmod {
- width: 10%;
- text-align: center;
-}
-
.plugin p {
padding: 12px 18px 0;
}
diff --git a/style/Earth.css b/style/Earth.css
index 930836fb8..7c20aec94 100644
--- a/style/Earth.css
+++ b/style/Earth.css
@@ -767,8 +767,8 @@ MAIN POSTS
}
.pun .blockpost .postleft, .pun .blockpost .postfootleft {
- width: 194px;
- padding: 7px 12px 7px 12px;
+ width: 206px;
+ padding: 7px 0 7px 12px;
float: left;
margin-left: -218px;
position: relative;
diff --git a/style/Earth/base_admin.css b/style/Earth/base_admin.css
index 2948b81bf..45f192a5b 100644
--- a/style/Earth/base_admin.css
+++ b/style/Earth/base_admin.css
@@ -123,41 +123,25 @@
text-align: center;
}
-#users2 .tcl, #bans1 .tcl {
- width: auto;
+#users2 .tcl, #users2 .tc3, #users2 .tc5, #bans1 .tcl, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
+ width: 15%;
text-align: left;
}
#users2 .tc2, #bans1 .tc2 {
- width: 18%;
- text-align: left;
-}
-
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
- width: 12%;
+ width: 22%;
text-align: left;
}
#users2 .tc4, #bans1 .tc4 {
- width: 10%;
+ width: 8%;
text-align: center;
}
-#users2 .tcr {
- width: 20%;
- white-space: nowrap;
-}
-
-#bans1 .tcr {
- width: 15%;
+#users2 .tcr, #bans1 .tcr {
white-space: nowrap;
}
-#users2 .tcmod {
- width: 10%;
- text-align: center;
-}
-
.plugin p {
padding: 12px 18px 0;
}
diff --git a/style/Fire.css b/style/Fire.css
index 430455d2b..c4951dd1c 100644
--- a/style/Fire.css
+++ b/style/Fire.css
@@ -767,8 +767,8 @@ MAIN POSTS
}
.pun .blockpost .postleft, .pun .blockpost .postfootleft {
- width: 194px;
- padding: 7px 12px 7px 12px;
+ width: 206px;
+ padding: 7px 0 7px 12px;
float: left;
margin-left: -218px;
position: relative;
diff --git a/style/Fire/base_admin.css b/style/Fire/base_admin.css
index 2948b81bf..45f192a5b 100644
--- a/style/Fire/base_admin.css
+++ b/style/Fire/base_admin.css
@@ -123,41 +123,25 @@
text-align: center;
}
-#users2 .tcl, #bans1 .tcl {
- width: auto;
+#users2 .tcl, #users2 .tc3, #users2 .tc5, #bans1 .tcl, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
+ width: 15%;
text-align: left;
}
#users2 .tc2, #bans1 .tc2 {
- width: 18%;
- text-align: left;
-}
-
-#users2 .tc3, #users2 .tc5, #bans1 .tc3, #bans1 .tc5, #bans1 .tc6 {
- width: 12%;
+ width: 22%;
text-align: left;
}
#users2 .tc4, #bans1 .tc4 {
- width: 10%;
+ width: 8%;
text-align: center;
}
-#users2 .tcr {
- width: 20%;
- white-space: nowrap;
-}
-
-#bans1 .tcr {
- width: 15%;
+#users2 .tcr, #bans1 .tcr {
white-space: nowrap;
}
-#users2 .tcmod {
- width: 10%;
- text-align: center;
-}
-
.plugin p {
padding: 12px 18px 0;
}