Working on new theme (mybb#2973) (mybb#3297)

* Working on new theme (mybb#2973) - editpost - memberlist - polls - most of postbit - sendthread - showteam - most of showthread * Working on new theme mybb#2973 more sections completed * Fixing the CSS path reference (again) + search page * Adding modals * Adding reputation page Also breaks out post control styles (so they can easily be reused in places like the reputation page) * Fix post inline mod checkbox * Starting user cp * More of User CP * Thread and forum subscription pages * Thread list WIP * Fixing announcements on forumdisplay * Misc minor fixes * Fixing yesterday typo * Fix missing yesterday/today * Minor fixes * Misc forumbit fixes * Postbit updates * Beginning of moderation pages + a couple miscellaneous lang changes * Add thread closed message * More moderation pages + minor fixes * remove link to archive mode * Adding edit buddy/ignore list page * Buddy popup * RSS syndication page * Portal + a few minor revisions elsewhere * Login form on portal * Search results + minor changes elsewhere * Breadcrumb To do (probably): page drop down * Add portal page title * Working on Mod CP Mod CP menu is not fully functional (probably only works for super mods) * Banning + find user fixes * button tweaks * Announcement section of Mod CP WIP Still a few things to clean up here * Fixes warnings list on user cp dashboard * Replace default avatar image with icon It's possible I missed a spot; several of these also need the actual avatar loaded * Cleaning up announcements * Moderator listing on forum list * Report center, drafts, beginning of warn user page, misc changes some still WIP * Minor changes to report center & show thread footer * WIP moving post options in dropdown * postbit dropdown adjustments * Postbit, multiquote improvements * Moderator logs * Mod CP home page WIP * Warning logs * Moderation queue * Update fontawesome version * Finishing up mod cp * Attachments & drafts WIP * Warnings WIP * Attachments page * Fix attachments page title * Finishing up warnings to do: standardize how we handle colons * Minor warnings update * remove loginbox from moderation pages * Delayed moderation * Removing one more loginbox * Thread notes and minor delayed moderation change * Moderation language change * Finishing up moderation tools still to do: styling of moderation dropdowns in forum display, show thread * removing colons * Forum bit changes * Last post "Never" changed to "No posts yet" * Help docs * Redirect page * Various misc templates Forum jump removed from show thread, forum display * Parser changes Quotes that don't have a citation don't have a template * php code template * minor language change * Messenger WIP To do: folders in the menu * Messenger WIP Folders now shown on some pages but not all * Various moderation improvements on showthread, forumdisplay * Standardizing fontawesome set * fix for BCC on PM quick reply * Update unread PM count in welcomeblock when reading a PM * Improving PM count update * Thread list improvements * Finishing up forumdisplay Plus other minor tweaks * Fixing forum description * Forum description fix II * Cleaning up forum bit for password protected forums * Fixing forumbit logic * Fix indentation * Calendar * Finishing Calendar * Fixed hard space in usergroups template * Manage groups * Misc cleanup * Fixing page description class * Some postbit and thread list cleanup * Hide quick reply in deleted threads * Thread prefix styling * More thread prefix cleanup * fix attachment templates * Cleaning up last poster avatars * Member list avatar also switching CSS back to GitHub pages * Fix avatar upload * Fix user dropdown avatar * Icon standardization (WIP) * Fix quote * More avatars still a few things to clean up with these * Fixing usercp redirect grammar * Taming some alerts * Fix duplicate edit buttons on announcement * Fix hidden registration fields * Clean up subforums list * Fix mark read auth code mismatch * Improve modal close button Fixes quick login close button and standardizes button with template * Icons, tabs/spaces, and page titles - replacing icons with standard template - standardizing indents as spaces - swapping page title order * Clean up stats page * Finish warn user page * Profile clean up, removing more colons * Add templates used in Admin CP * Add more templates used in ACP * Improve no permission page * No permissions logged in user message * Pagination - jump to page * Fix threaded mode icon * Fixes mybb#3564 <abbr> tag on registration * changing footer HTML comments to Twig comments * Similar threads + threaded mode * Hot thread, contains posts by you icons * Adding jscripts block to <head> * Fix forum select
euantorano · Mar 23, 2019 · 7312e4e · 7312e4e
1 parent cf1a43b
commit 7312e4e
Show file tree

Hide file tree

Showing 276 changed files with 12,711 additions and 11,454 deletions.
diff --git a/calendar.php b/calendar.php
@@ -2329,6 +2329,7 @@
             }
 
             $day_bit['day'] = $day;
+            $day_bit['month'] = $monthnames[$calendar_month];
             $days[] = $day_bit;
             ++$day;
         }

diff --git a/forumdisplay.php b/forumdisplay.php
@@ -586,7 +586,7 @@
         $announcement['announcementlink'] = get_announcement_link($announcement['aid']);
         $announcement['subject'] = $parser->parse_badwords($announcement['subject']);
         $announcement['subject'] = htmlspecialchars_uni($announcement['subject']);
-        $postdate = my_date('relative', $announcement['startdate']);
+        $announcement['postdate'] = my_date('relative', $announcement['startdate']);
 
         $announcement['username'] = htmlspecialchars_uni($announcement['username']);
 
@@ -939,6 +939,7 @@
     'subAction' => $subAction,
     'multipage' => $multipage,
     'threadcount' => $threadcount,
+    'announcements' => $announcements,
     'threadCache' => $threadCache,
     'perpage' => $perpage,
     'prefixselect' => $prefixselect,
@@ -951,4 +952,4 @@
     'sorting' => $sorting,
     'customTools' => $customTools,
     'hasModTools' => $hasModTools
-]));
+]));
diff --git a/inc/functions.php b/inc/functions.php
@@ -637,27 +637,28 @@ function get_child_list($fid)
  * @param string $error The error message to be shown
  * @param string $title The title of the message shown in the title of the page and the error table
  */
-function error($error="", $title="")
+function error($error_message="", $title="", $error_page="")
 {
     global $db, $lang, $mybb, $plugins;
 
-    $error = $plugins->run_hooks("error", $error);
+    $error_message = $plugins->run_hooks("error", $error_message);
 
     // AJAX error message?
     if ($mybb->get_input('ajax', MyBB::INPUT_INT)) {
         // Send our headers.
         @header("Content-type: application/json; charset={$lang->settings['charset']}");
-        echo json_encode(array("errors" => array($error)));
+        echo json_encode(array("errors" => array($error_message)));
         exit;
     }
 
     $timenow = my_date('relative', TIME_NOW);
     reset_breadcrumb();
     add_breadcrumb($lang->error);
-    
+
     output_page(\MyBB\template('error/error.twig', [
         'title' => $title,
-        'error' => $error
+        'error_message' => $error_message,
+        'error_page' => $error_page,
     ]));
 
     exit;
@@ -755,12 +756,14 @@ function error_no_permission()
         }
     }
 
-    $errorpage = \MyBB\template('error/no_permission.twig', [
+    $error_message = \MyBB\template('error/no_permission_message.twig');
+
+    $error_page = \MyBB\template('error/no_permission.twig', [
         'username' => $username,
         'redirect_url' => $redirect_url
     ]);
 
-    error($errorpage);
+    error($error_message, $lang->error_nopermission, $error_page);
 }
 
 /**
@@ -2464,7 +2467,7 @@ function build_forum_jump($pid=0, $selitem=0, $addselect=1, $depth="", $showextr
                 $forum_link = "'".str_replace('{fid}', "'+option", FORUM_URL);
             }
         }
-        
+
         $forumjump = \MyBB\template('misc/forumjump.twig', [
             'showextras' => $showextras,
             'forumjumpbits' => $forumjumpbits,
@@ -2874,7 +2877,7 @@ function build_mycode_inserter($bind="message", $smilies = true)
 function build_clickable_smilies()
 {
     global $cache, $smiliecache, $theme, $templates, $lang, $mybb, $smiliecount;
-    
+
     $clickablesmilies = '';
 
     if ($mybb->settings['smilieinserter'] != 0 && $mybb->settings['smilieinsertercols'] && $mybb->settings['smilieinsertertot']) {

diff --git a/inc/functions_forumlist.php b/inc/functions_forumlist.php
@@ -35,6 +35,7 @@ function build_forumbits($pid=0, $depth=1)
 	$parent_counters['viewers'] = 0;
 	$forum_list = $comma = '';
 	$donecount = 0;
+	$more_count = 0;
 
 	// Foreach of the forums in this parent
 	foreach($fcache[$pid] as $parent)
@@ -272,7 +273,10 @@ function build_forumbits($pid=0, $depth=1)
 				{
 					if(subforums_count($fcache[$pid]) > $donecount)
 					{
-						$forum_list .= $comma.$lang->sprintf($lang->more_subforums, (subforums_count($fcache[$pid]) - $donecount));
+						$more_count = subforums_count($fcache[$pid]) - $donecount;
+						$forum_list .= \MyBB\template('forumbit/subforums_more.twig', [
+							'more_count' => $more_count
+						]);
 					}
 				}
 				continue;

diff --git a/inc/languages/english/calendar.lang.php b/inc/languages/english/calendar.lang.php
@@ -33,22 +33,24 @@
 
 $l['calendar'] = "Calendar";
 
-$l['jump_month'] ="Jump to month:";
+$l['jump_month'] ="Jump to month";
+
+$l['go_week'] = "Go to Week";
 
 $l['birthdays_on_day'] = "Birthdays on {1}";
 $l['birthdayhidden'] = "Hidden";
 
 $l['event'] = "event";
 $l['events'] = "events";
 $l['add_event'] = "Add Event";
-$l['event_date'] = "Event Date:";
+$l['event_date'] = "Event Date";
 $l['event_recurring_start_date'] = "Start Date:";
 $l['event_recurring_end_date'] = "End Date:";
 $l['event_recurring_repeat_days'] = "Event Repeats On:";
-$l['event_name'] = "Event Name:";
-$l['event_details'] = "Event Details:";
-$l['event_options'] = "Options:";
-$l['private_option'] = "<b>Private</b> Only you will be able to view this event. (Registered Users Only).";
+$l['event_name'] = "Event Name";
+$l['event_details'] = "Event Details";
+$l['event_options'] = "Options";
+$l['private_option'] = "<b>Private:</b> Only you will be able to view this event. (Registered Users Only).";
 $l['delete_option'] = "<b>Delete:</b> Delete this event.";
 $l['post_event'] = "Post Event";
 $l['day_view'] = "Day View";
@@ -57,7 +59,7 @@
 $l['event_author'] = "Event Author:";
 $l['edit_event'] = "Edit Event";
 $l['view_event'] = "View Event";
-$l['no_events'] = "This day does not have any events associated with it.<p><a href=\"calendar.php?action=addevent&amp;calendar={1}&amp;day={2}&amp;month={3}&amp;year={4}\">Post an Event</a>.</p>";
+$l['no_events'] = "This day does not have any events associated with it.";
 $l['years_old'] = "{1} Years Old";
 $l['alt_edit'] = "Edit this event";
 $l['alt_delete'] = "Delete this event";
@@ -91,16 +93,16 @@
 $l['delete_2'] = "<b>Note:</b> This process cannot be undone.";
 $l['delete_now'] = "Delete Now";
 $l['delete_no_checkbox'] = "The event was not deleted because you didn't check the \"Delete\" checkbox.";
-$l['jump_to_calendar'] = "Jump to calendar:";
-$l['select_calendar'] = "Calendar:";
+$l['jump_to_calendar'] = "Jump to calendar";
+$l['select_calendar'] = "Calendar";
 $l['type_single'] = "Single day event";
 $l['type_ranged'] = "Ranged or recurring event";
-$l['enter_time'] = "Time:";
-$l['start_time'] = "Starts:";
-$l['end_time'] = "Finishes:";
-$l['timezone'] = "Time Zone:";
+$l['enter_time'] = "Time";
+$l['start_time'] = "Starts";
+$l['end_time'] = "Finishes";
+$l['timezone'] = "Time Zone";
 $l['ignore_timezone'] = "<strong>Ignore time zone:</strong> This event should use the time zone of the viewer.";
-$l['repeats'] = "Repeats:";
+$l['repeats'] = "Repeats";
 $l['does_not_repeat'] = "Does not repeat";
 $l['repeats_daily'] = "Daily";
 $l['repeats_weekdays'] = "Every weekday (Mon-Fri)";
@@ -119,8 +121,9 @@
 $l['every'] = "every";
 $l['year_or_years'] = "year(s)";
 $l['of'] = "of";
-$l['move_to_calendar'] = "Move to Calendar:";
+$l['move_to_calendar'] = "Move to Calendar";
 $l['weekly_overview'] = "Weekly Overview";
+$l['through'] = "through";
 $l['previous_week'] = "Previous Week";
 $l['next_week'] = "Next Week";
 $l['first'] = "First";
@@ -129,8 +132,8 @@
 $l['fourth'] = "Fourth";
 $l['last'] = "Last";
 $l['all_day'] = "All Day";
-$l['starts'] = "Starts: ";
-$l['finishes'] = "Finishes: ";
+$l['starts'] = "Starts ";
+$l['finishes'] = "Finishes ";
 
 $l['error_incorrectday'] = "The day you have entered does not appear to exist. Please go back and try again.";
 $l['error_invalidevent'] = "The event you specified is either invalid or doesn't exist.";

diff --git a/inc/languages/english/editpost.lang.php b/inc/languages/english/editpost.lang.php
@@ -13,15 +13,15 @@
 $l['delete_2'] = "<b>Note:</b> If this post is the first post in a thread deleting it will result in deletion of the whole thread.";
 $l['subject'] = "Subject";
 $l['your_message'] = "Your Message";
-$l['post_options'] = "Post Options:";
-$l['editreason'] = "Edit Reason:";
+$l['post_options'] = "Post Options";
+$l['editreason'] = "Edit Reason";
 $l['options_sig'] = "<strong>Signature:</strong> include your signature. (registered users only)";
 $l['options_emailnotify'] = "<strong>Email Notification:</strong> receive an email whenever there is a new reply. (registered users only)";
 $l['options_disablesmilies'] = "<strong>Disable Smilies:</strong> disable smilies from showing in this post.";
 $l['preview_post'] = "Preview Post";
 $l['update_post'] = "Update Post";
 $l['add_poll'] = "Add Poll";
-$l['poll'] = "Poll:";
+$l['poll'] = "Poll";
 $l['poll_desc'] = "Optionally you may attach a poll to this thread.";
 $l['poll_check'] = "I want to post a poll";
 $l['num_options'] = "Number of options:";

diff --git a/inc/languages/english/forumdisplay.lang.php b/inc/languages/english/forumdisplay.lang.php
@@ -6,24 +6,28 @@
  */
 
 $l['post_thread'] = "Post Thread";
-$l['moderated_by'] = "Moderated By:";
+$l['moderated_by'] = "Moderated by:";
 $l['nothreads'] = "Sorry, but there are currently no threads in this forum with the specified date and time limiting options.";
 $l['nopermission'] = "Sorry, but you do not have permission to view threads in this forum.";
-$l['search_forum'] = "Search this Forum:";
+$l['search_forum'] = "Search Forum";
+$l['enter_keywords'] = "Enter Keywords...";
 $l['thread'] = "Thread";
 $l['author'] = "Author";
+$l['reply'] = "Reply";
 $l['replies'] = "Replies";
 $l['views'] = "Views";
 $l['lastpost'] = "Last Post";
+$l['lastpost_by'] = "Last post by";
 $l['rating'] = "Rating";
 $l['prefix'] = "Prefix:";
 $l['prefix_all'] = "Prefix: Any/No Prefix";
 $l['prefix_any'] = "Prefix: Any Prefix";
 $l['prefix_none'] = "Prefix: No Prefix";
-$l['markforum_read'] = "Mark this forum read";
-$l['subscribe_forum'] = "Subscribe to this forum";
-$l['unsubscribe_forum'] = "Unsubscribe from this forum";
-$l['clear_stored_password'] = "Clear stored forum password";
+$l['markforum_read'] = "Mark Read";
+$l['subscribe_forum'] = "Subscribe";
+$l['unsubscribe_forum'] = "Unsubscribe";
+$l['clear_stored_password'] = "Clear Password";
+$l['sort_threads'] = "Sort Threads";
 $l['sort_by_subject'] = "Sort by: Subject";
 $l['sort_by_lastpost'] = "Sort by: Last Post";
 $l['sort_by_starter'] = "Sort by: Author";
@@ -47,15 +51,17 @@
 $l['posts_by_you'] = "Contains Posts by You";
 $l['no_new_thread'] = "No New Posts";
 $l['hot_thread'] = "Hot Thread (No New)";
+$l['hot'] = "Hot Thread";
 $l['locked_thread'] = "Locked Thread";
+$l['by'] = "by";
 $l['goto_first_unread'] = "Go to first unread post";
 $l['pages'] = "Pages:";
 $l['pages_last'] = "last";
 $l['users_browsing_forum'] = "Users browsing this forum:";
 $l['users_browsing_forum_guests'] = "{1} Guest(s)";
 $l['users_browsing_forum_invis'] = "{1} Invisible User(s)";
 $l['delayed_moderation'] = "Delayed Moderation";
-$l['inline_thread_moderation'] = "Inline Thread Moderation:";
+$l['inline_thread_moderation'] = "Inline Thread Moderation";
 $l['close_threads'] = "Close Threads";
 $l['open_threads'] = "Open Threads";
 $l['stick_threads'] = "Stick Threads";
@@ -95,8 +101,9 @@
 $l['select_all'] = "Select all <strong>{1}</strong> threads in this forum.";
 $l['clear_selection'] = "Clear Selection.";
 $l['deleted_thread'] = "Deleted Thread";
+$l['awaiting_approval'] = "Awaiting Approval";
+$l['sticky'] = "Sticky Thread";
 
 $l['error_containsnoforums'] = "Sorry, but the forum you are currently viewing does not contain any child forums.";
 
 $l['inline_edit_description'] = '(Click and hold to edit)';
-