Working on new theme mybb#2973

more sections completed

inc/languages/english/global.lang.php

@@ -66,14 +66,14 @@
 $l['wrong_forum_password'] = "The password you entered is incorrect. Please try again.";
 
 $l['reset_button'] = "Reset";
-$l['username'] = "Username:";
-$l['username1'] = "Email:";
-$l['username2'] = "Username/Email:";
-$l['password'] = "Password:";
-$l['login_username'] = "Username:";
-$l['login_username1'] = "Email:";
-$l['login_username2'] = "Username/Email:";
-$l['login_password'] = "Password:";
+$l['username'] = "Username";
+$l['username1'] = "Email";
+$l['username2'] = "Username/Email";
+$l['password'] = "Password";
+$l['login_username'] = "Username";
+$l['login_username1'] = "Email";
+$l['login_username2'] = "Username/Email";
+$l['login_password'] = "Password";
 $l['lost_password'] = "Lost Password?";
 $l['remember_me'] = "Remember me";
 $l['remember_me_desc'] = "If ticked, your login details will be remembered on this computer, otherwise, you will be logged out as soon as you close your browser.";
@@ -313,7 +313,7 @@
 $l['post_fetch_error'] = 'There was an error fetching the posts.';
 
 $l['smilieinsert'] = "Smilies";
-$l['smilieinsert_getmore'] = "get more";
+$l['smilieinsert_getmore'] = "Get More";
 $l['on'] = "On";
 $l['off'] = "Off";
 $l['remote_avatar_disabled_default_avatar'] = "<a href='usercp.php?action=avatar'>You are currently using a remote avatar, which has been disabled. The default avatar will be used instead.</a>";

inc/languages/english/member.lang.php

@@ -37,12 +37,13 @@
 $l['request_user_pass'] = "Request Login Credentials";
 $l['profile'] = "Profile of {1}";
 $l['registration_date'] = "Registration Date:";
-$l['date_of_birth'] = "Date of Birth:";
+$l['date_of_birth'] = "Date of Birth";
 $l['birthdayhidden'] = "Hidden";
 $l['birthday'] = "Birthday:";
 $l['local_time'] = "Local Time:";
 $l['local_time_format'] = "{1} at {2}";
 $l['users_forum_info'] = "{1}'s Forum Info";
+$l['about_user'] = "About {1}";
 $l['joined'] = "Joined:";
 $l['lastvisit'] = "Last Visit:";
 $l['total_posts'] = "Total Posts:";
@@ -57,6 +58,7 @@
 $l['homepage'] = "Homepage:";
 $l['pm'] = "Private Message:";
 $l['send_pm'] = "Send {1} a private message.";
+$l['send_message'] = "Send Message";
 $l['avatar']  = "Avatar:";
 $l['warning_level'] = "Warning Level:";
 $l['warn'] = "Warn";
@@ -71,7 +73,7 @@
 $l['ban_remaining'] = "remaining";
 
 $l['users_additional_info'] = "Additional Info About {1}";
-$l['email'] = "Email:";
+$l['email'] = "Email";
 $l['send_user_email'] = "Send {1} an email.";
 $l['users_signature'] = "{1}'s Signature";
 $l['agreement'] = "Registration Agreement";
@@ -83,7 +85,8 @@
 $l['registration'] = "Registration";
 $l['required_fields'] = "Required Fields";
 $l['complex_password'] = "<abbr title=\"A password that is at least {1} characters long and contains an upper case letter, a lower case letter and a number.\">Complex</abbr> Password:";
-$l['confirm_email'] = "Confirm Email:";
+$l['confirm_email'] = "Confirm Email";
+$l['confirm_email_desc'] = "Please enter your email address twice for confirmation.";
 $l['optional_fields'] = "Optional Fields";
 $l['website_url'] = "Your Website URL:";
 $l['birthdate'] = "Birthdate:";
@@ -92,7 +95,7 @@
 $l['contact_info'] = "Contact Information";
 $l['i_agree'] = "I Agree";
 $l['account_details'] = "Account Details";
-$l['account_prefs'] = "Account Preferences:";
+$l['account_prefs'] = "Account Preferences";
 $l['invisible_mode'] = "Hide me from the Who's Online list.";
 $l['allow_notices'] = "Receive emails from the Administrators.";
 $l['hide_email'] = "Hide your email from other members.";
@@ -136,13 +139,14 @@
 $l['error_invalid_birthday'] = 'The birthday you entered is invalid. Please enter a valid birthday.';
 $l['error_awaitingcoppa'] = "You cannot login using this account as it is still awaiting COPPA validation from a parent or guardian.<br /><br />A parent or legal guardian will need to download, fill in and submit to us a completed copy of our <a href=\"member.php?action=coppa_form\">COPPA Compliance &amp; Permission form</a>.<br /><br />Once we receive a completed copy of this form, the account will be activated.";
 
-$l['lang_select'] = "Language Settings:";
+$l['lang_select'] = "Language Settings";
 $l['lang_select_desc'] = "If you live in a country that speaks a language other than the forums default, you may be able to select an installed, read-able language pack below.";
 $l['lang_select_default'] = "Use Default";
 
 $l['submit_registration'] = "Submit Registration!";
-$l['confirm_password'] = "Confirm Password:";
-$l['referrer'] = "Referrer:";
+$l['confirm_password'] = "Confirm Password";
+$l['confirm_password_desc'] = "Please enter your password twice for confirmation.";
+$l['referrer'] = "Referrer";
 $l['referrer_desc'] = "If you were referred to these forums by another member you can enter their name below. If not, simply leave this field blank.";
 $l['resend_activation'] = "Resend Account Activation";
 $l['request_activation'] = "Request Activation Code";
@@ -164,10 +168,10 @@
 $l['not_specified'] = "Not Specified";
 $l['membdayage'] = "({1} years old)";
 $l['mod_options'] = "Moderator Options";
-$l['edit_in_mcp'] = "Edit this user in Mod CP";
-$l['ban_in_mcp'] = "Ban this user in Mod CP";
+$l['edit_in_mcp'] = "Edit User";
+$l['ban_in_mcp'] = "Ban User";
 $l['purgespammer'] = "Purge Spammer";
-$l['edit_usernotes'] = "Edit user notes in Mod CP";
+$l['edit_usernotes'] = "Edit User Notes";
 $l['no_usernotes'] = "There are currently no notes on this user";
 $l['view_all_notes'] = "View all notes";
 $l['view_notes_for'] = "View notes for {1}";
@@ -177,8 +181,8 @@
 $l['reputation_vote'] = "Rate";
 $l['reputation_details'] = "Details";
 $l['already_logged_in'] = "Notice: You are already currently logged in as {1}.";
-$l['admin_edit_in_acp'] = "Edit this user in Admin CP";
-$l['admin_ban_in_acp'] = "Ban this user in Admin CP";
+$l['admin_edit_in_acp'] = "Edit User in Admin CP";
+$l['admin_ban_in_acp'] = "Ban User in Admin CP";
 $l['admin_options'] = "Administrator Options";
 
 $l['redirect_registered_activation'] = "Thank you for registering on {1}, {2}.<p>To complete your registration, please check your email for account activation instructions. Until you activate your account you may not be able to post on these forums";
@@ -236,10 +240,10 @@
 $l['instant_email_subscribe'] = "Instant email notification";
 $l['instant_pm_subscribe'] = "Instant PM notification";
 
-$l['remove_from_buddy_list'] = "Remove from Buddy List";
-$l['add_to_buddy_list'] = "Add to Buddy List";
-$l['remove_from_ignore_list'] = "Remove from Ignore List";
-$l['add_to_ignore_list'] = "Add to Ignore List";
+$l['remove_from_buddy_list'] = "Remove Buddy";
+$l['add_to_buddy_list'] = "Add Buddy";
+$l['remove_from_ignore_list'] = "Stop Ignoring";
+$l['add_to_ignore_list'] = "Ignore User";
 $l['report_user'] = "Report User";
 
 $l['newregistration_subject'] = "New registration at {1}";

inc/languages/english/online.lang.php

@@ -81,6 +81,7 @@
 $l['page'] = "Page";
 $l['users_online'] = "Who's Online";
 $l['on_username'] = "Username";
+$l['sort_results'] = "Sort results by:";
 $l['time'] = "Time";
 $l['location'] = "Location";
 $l['online_today'] = "Who Was Online Today";

inc/views/base/announcements/announcements.twig

@@ -5,26 +5,19 @@
 {% endblock head %}
 
 {% block body %}
-
-<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder tfixed clear no_bottom_border">
-    <tr>
-        <td class="thead">
-            <strong>{{ lang.forum_announcement }}</strong>
-        </td>
-    </tr>
-    <tr>
-        <td id="posts_container">
-            <div id="posts">
+    <div class="page-content">
+        <header class="page-header">
+        	<h1 class="title title--page">{{ lang.forum_announcement }}</h1>
+        <header>
+        <div id="posts_container">
+            <section class="topic" id="posts">
                 {{ announcement|raw }}
-            </div>
-        </td>
-    </tr>
-</table>
-
-<script type="text/javascript">
-    $(".author_avatar img").error(function () {
-        $(this).unbind("error").closest('.author_avatar').remove();
-    });
-</script>
-
-{% endblock body %}
+            </section>
+        </div>
+    </div>
+    <script type="text/javascript">
+        $(".author_avatar img").error(function () {
+            $(this).unbind("error").closest('.author_avatar').remove();
+        });
+    </script>
+{% endblock body %}

inc/views/base/contact/contact.twig

@@ -5,30 +5,39 @@
 {% endblock head %}
 
 {% block body %}
-    <form action="contact.php" method="post">
-        <input type="hidden" name="my_post_key" value="{{ mybb.post_code }}" />
-        {{ errors|raw }}
-        <table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
-            <tr>
-                <td class="thead" colspan="2"><strong>{{ lang.contact }}</strong></td>
-            </tr>
-            <tr>
-                <td class="trow1" valign="top"><strong><label for="subject">{{ lang.contact_subject }}:</label></strong><br /><span class="smalltext">{{ lang.contact_subject_desc }}</span></td>
-                <td class="trow1"><input type="text" name="subject" id="subject" class="textbox" size="49" value="{{ mybb.input.subject }}" /></td>
-            </tr>
-            <tr>
-                <td class="trow2" valign="top"><strong><label for="message">{{ lang.contact_message }}:</label></strong><br /><span class="smalltext">{{ lang.contact_message_desc }}</span></td>
-                <td class="trow2"><textarea cols="50" rows="10" name="message" id="message" class="textarea" >{{ mybb.input.message }}</textarea></td>
-            </tr>
-            <tr>
-                <td class="trow1" valign="top"><strong><label for="email">{{ lang.contact_email }}:</label></strong><br /><span class="smalltext">{{ lang.contact_email_desc }}</span></td>
-                <td class="trow1"><input type="text" name="email" id="email" class="textbox" size="49" value="{{ mybb.input.email }}" /></td>
-            </tr>
-            {{ captcha|raw }}
-        </table>
-        <br />
-        <div align="center">
-            <input type="submit" class="button" name="submit" value="{{ lang.contact_send }}" />
-        </div>
-    </form>
+    <div class="page-content">
+        <header class="page-header">
+            <h1 class="title title--page">{{ lang.contact }}</h1>
+        </header>
+        <form action="contact.php" method="post">
+            <input type="hidden" name="my_post_key" value="{{ mybb.post_code }}" />
+            {{ errors|raw }}
+            <div class="block block--form form">
+                <section class="section section--form">
+                    <div class="row row--form field">
+                        <h3 class="field__name"><label for="subject">{{ lang.contact_subject }}</label></h3>
+                        <p class="field__description">{{ lang.contact_subject_desc }}</p>
+                        <input type="text" name="subject" id="subject" class="textbox" size="49" value="{{ mybb.input.subject }}" />
+                    </div>
+                    <div class="row row--form field">
+                        <h3 class="field__name"><label for="message">{{ lang.contact_message }}</label></h3>
+                        <p class="field__description">{{ lang.contact_message_desc }}</p>
+                        <textarea cols="50" rows="10" name="message" id="message" class="textarea" >{{ mybb.input.message }}</textarea>
+                    </div>
+                    <div class="row row--form field">
+                        <h3 class="field__name"><label for="email">{{ lang.contact_email }}</label></h3>
+                        <p class="field__description">{{ lang.contact_email_desc }}</p>
+                        <input type="text" name="email" id="email" class="textbox" size="49" value="{{ mybb.input.email }}" />
+                    </div>
+                </section>
+                {{ captcha|raw }}
+                <div class="form__submit">
+                    <button type="submit" class="button button--medium">
+    					<i class="button__icon fas fa-envelope"></i>
+    					<span class="button__text">{{ lang.contact_send }}</span>
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
 {% endblock body %}

inc/views/base/error/error.twig

@@ -5,22 +5,13 @@
 {% endblock head %}
 
 {% block body %}
-<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
-    <tr>
-        <td class="thead">
-            <span class="smalltext">
-                <strong>
-                    {% if title %}
-                        {{ title }}
-                    {% else %}
-                        {{ mybb.settings.bbname }}
-                    {% endif %}
-                </strong>
-            </span>
-        </td>
-    </tr>
-    <tr>
-        <td class="trow1">{% if error %}{{ error|raw }}{% else %}{{ lang.unknown_error }}{% endif %}</td>
-    </tr>
-</table>
-{% endblock body %}
+<div class="page-content">
+    <div class="alert alert--danger">
+    	<i class="alert__icon fas fa-exclamation-triangle"></i>
+    	<div class="alert__message">
+    		{% if title %}<h2 class="alert__title">{{ title }}</h2>{% endif %}
+            <p class="alert__description">{% if error %}{{ error|raw }}{% else %}{{ lang.unknown_error }}{% endif %}</p>
+        </div>
+    </div>
+</div>
+{% endblock body %}

inc/views/base/forumbit/depth_1/cat.twig

@@ -2,19 +2,18 @@
     {% set expcolhead = ' thead_collapsed' %}
     {% set expdisplay = 'display: none;' %}
 {% endif %}
-<section class="block">
-	<h2 class="title title--major">
-		<a href="{{ forum.url }}">{{ forum.name }}</a>
-        {{ forum.description }} {# TO DO : CATEGORY DESCRIPTION STYLE #}
-        {# TO DO : ADD BACK COLLAPSE/EXPAND
-        {% if collapsed['cat_' ~ forum.fid ~ '_c'] == 'display: show;' %}
-            <img src="{{ theme.imgdir }}/collapse_collapsed.png" id="cat_{{ forum.fid }}_img" class="expander" alt="[+]" title="[+]" />
-        {% else %}
-            <img src="{{ theme.imgdir }}/collapse.png" id="cat_{{ forum.fid }}_img" class="expander" alt="[-]" title="[-]" />
+<section class="block collapse {% if collapsed['cat_' ~ forum.fid ~ '_c'] == 'display: show;' %}collapse--collapsed{% else %}collapse--not-collapsed{% endif %}" id="cat__{{ forum.fid }}_img">
+	<div class="title title--major title--nested">
+		<h2 class="title__name"><a href="{{ forum.url }}">{{ forum.name }}</a></h2>
+        {% if forum.description %}
+            <p class="title__description">{{ forum.description }}</p>
         {% endif %}
-        #}
-    </h2>
-    <div class="forum-list forum-list--full-width">
+        <span class="collapse__toggle">
+            <i class="collapse__icon collapse__icon--collapse fas fa-minus-square"></i>
+            <i class="collapse__icon collapse__icon--expand fas fa-plus-square"></i>
+        </span>
+    </div>
+    <div class="forum-list forum-list--full-width collapse__content">
         {{ sub_forums|raw }}
     </div>
 </section>

inc/views/base/forumbit/depth_2/last_post_never.twig

@@ -1 +1,3 @@
-<div class="forum__latest">{{ lang.lastpost_never }}</div>
+<div class="forum__latest">
+    <p class="forum__date-author">{{ lang.lastpost_never }}</p>
+</div>

inc/views/base/layouts/master.twig

@@ -17,7 +17,8 @@
     {# TEMPORARY #}
     <link href="https://fonts.googleapis.com/css?family=Asap:400,600,600i|Open+Sans:300,400,700" rel="stylesheet">
     {# <link href="{{ asset_url('assets/css/main.css') }}" rel="stylesheet"> #}
-    <link href="https://mybb.github.io/1.9-ui-framework/assets/css/main.css" rel="stylesheet">
+    {# <link href="https://mybb.github.io/1.9-ui-framework/assets/css/main.css" rel="stylesheet"> #}
+    <link href="http://localhost:4000/assets/css/main.css" rel="stylesheet">
 
     <link rel="alternate" type="application/rss+xml" title="{{ lang.latest_threads }} (RSS 2.0)" href="{{ mybb.settings.bburl }}/syndication.php" />
     <link rel="alternate" type="application/atom+xml" title="{{ lang.latest_threads }} (Atom 1.0)" href="{{ mybb.settings.bburl }}/syndication.php?type=atom1.0" />

inc/views/base/member/activate.twig

@@ -5,24 +5,30 @@
 {% endblock head %}
 
 {% block body %}
-    <form action="member.php" method="post">
-        <table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
-            <tr>
-                <td class="thead" colspan="2"><strong>{{ lang.activate_account }}</strong></td>
-            </tr>
-            <tr>
-                <td class="trow1" width="30%"><strong><label for="username">{{ lang.username }}</label></strong></td>
-                <td class="trow1"><input type="text" class="textbox" name="username" id="username" value="{{ activate.username }}" /></td>
-            </tr>
-            <tr>
-                <td class="trow1" width="30%"><strong><label for="code">{{ lang.activation_code }}</label></strong></td>
-                <td class="trow1"><input type="text" class="textbox" name="code" id="code" value="{{ activate.code }}" /></td>
-            </tr>
-        </table>
-        <br />
-        <div align="center">
+    <div class="page-content page-content--centered">
+        <header class="page-header">
+           <h1 class="title title--page">{{ lang.activate_account }}</h1>
+       </header>
+        <form action="member.php" method="post">
+            <div class="block block--form form">
+                <section class="section section--form">
+                    <div class="row row--form field">
+                        <h3 class="field__name"><label for="username">{{ lang.username }}</label></h3>
+                        <input type="text" class="textbox" name="username" id="username" value="{{ activate.username }}" />
+                    </div>
+                    <div class="row row--form field">
+                        <h3 class="field__name"><label for="code">{{ lang.activation_code }}</label></h3>
+                        <input type="text" class="textbox" name="code" id="code" value="{{ activate.code }}" />
+                    </div>
+                </section>
+                <div class="form__submit">
+                    <button type="submit" name="regsubmit" class="button button--medium">
+                        <i class="button__icon fas fa-check"></i>
+                        <span class="button__text">{{ lang.activate_account }}</span>
+                    </button>
+                </div>
+            </div>
             <input type="hidden" name="action" value="activate" />
-            <input type="submit" class="button" name="regsubmit" value="{{ lang.activate_account }}" />
-        </div>
-    </form>
+        </form>
+    </div>
 {% endblock body %}