Working on new theme (mybb#2973)

- editpost
- memberlist
- polls
- most of postbit
- sendthread
- showteam
- most of showthread

inc/languages/english/global.lang.php

@@ -251,7 +251,7 @@
 $l['postbit_status_away'] = "Away";
 $l['postbit_edited'] = "This post was last modified: {1} by";
 $l['postbit_editreason'] = "Edit Reason";
-$l['postbit_ipaddress'] = "IP Address:";
+$l['postbit_ipaddress'] = "IP Address";
 $l['postbit_ipaddress_logged'] = "Logged";
 $l['postbit_post'] = "Post:";
 $l['postbit_reputation'] = "Reputation:";

inc/languages/english/polls.lang.php

@@ -14,28 +14,29 @@
 $l['delete_q'] = "Delete?";
 $l['delete_note'] = "To delete this poll, check the box to the left and click the button to the right.";
 $l['delete_note2'] = "<b>Note:</b> Once this poll has been deleted there is no way of restoring it.";
+$l['poll_details'] = "Poll Details";
 $l['question'] = "Question:";
 $l['num_options'] = "Number of Options:";
 $l['max_options'] = "Maximum:";
-$l['poll_options'] = "Poll Options:";
+$l['poll_options'] = "Poll Options";
 $l['update_options'] = "Update Options";
 $l['poll_options_note'] = "Poll options should be short and to the point.";
-$l['options'] = "Options:";
+$l['poll_settings'] = "Poll Settings";
 $l['option_multiple'] = "<b>Allow multiple choice:</b> Users have the ability to vote on more than one option.";
 $l['option_multiple_maxoptions'] = "Maximum number of options per user (0 for no limit):";
 $l['option_public'] = "<b>Public Poll:</b> Give users the ability to see which user voted on which option(s).";
 $l['option_closed'] = "<b>Poll is Closed:</b> If checked the poll will be closed from voting.";
 $l['poll_timeout'] = "Poll Timeout:";
-$l['timeout_note'] = "The number of day(s) which people can vote on this poll.<br />(Set to 0 to if this poll should not timeout.)";
+$l['timeout_note'] = "The number of day(s) which people can vote on this poll. (Set to 0 to if this poll should not timeout.)";
 $l['days_after'] = "days after:";
 $l['update_poll'] = "Update Poll";
 $l['option'] = "Option";
-$l['votes'] = "Votes:";
+$l['votes'] = "votes";
 $l['post_new_poll'] = "Post New Poll";
 $l['days'] = "days";
 $l['poll_results'] = "Poll Results";
-$l['poll_total'] = "Total:";
-$l['poll_votes'] = "vote(s)";
+$l['poll_total'] = "Total votes:";
+$l['you_voted'] = "You voted for this item.";
 
 $l['redirect_pollposted'] = "Your poll has been posted.<br />You will now be returned to the thread.";
 $l['redirect_pollpostedmoderated'] = "Your poll has been posted, but your thread is still pending moderation.<br />You will be returned to the forum.";

inc/languages/english/showthread.lang.php

@@ -11,16 +11,16 @@
 
 $l['author'] = "Author";
 $l['message'] = "Message";
-$l['threaded'] = "Threaded Mode";
-$l['linear'] = "Linear Mode";
+$l['threaded'] = "Show Threaded Mode";
+$l['linear'] = "Show Linear Mode";
 $l['thread_modes'] = "Thread Modes";
 $l['next_oldest'] = "Next Oldest";
 $l['next_newest'] = "Next Newest";
-$l['view_printable'] = "View a Printable Version";
-$l['send_thread'] = "Send this Thread to a Friend";
-$l['subscribe_thread'] = "Subscribe to this thread";
-$l['unsubscribe_thread'] = "Unsubscribe from this thread";
-$l['add_poll_to_thread'] = "Add Poll to this thread";
+$l['view_printable'] = "Print Thread";
+$l['send_thread'] = "Share Thread";
+$l['subscribe_thread'] = "Subscribe";
+$l['unsubscribe_thread'] = "Unsubscribe";
+$l['add_poll_to_thread'] = "Add Poll";
 $l['moderation_options'] = "Moderation Options:";
 $l['delayed_moderation'] = "Delayed Moderation";
 $l['thread_notes'] = "Edit / View Thread Notes";
@@ -37,20 +37,20 @@
 $l['merge_threads'] = "Merge Threads";
 $l['remove_redirects'] = "Remove Redirects";
 $l['remove_subscriptions'] = "Remove All Subscriptions";
-$l['poll'] = "Poll:";
+$l['poll'] = "Poll";
 $l['show_results'] = "Show Results";
 $l['edit_poll'] = "Edit poll";
 $l['public_note'] = "<b>Note:</b> This is a public poll, other users will be able to see what you voted for.";
-$l['total'] = "Total";
 $l['vote'] = "Vote!";
-$l['total_votes'] = "{1} vote(s)";
-$l['you_voted'] = "* You voted for this item.";
+$l['total_votes'] = "Total votes:";
+$l['you_voted'] = "You voted for this item.";
 $l['poll_closed'] = "This poll is closed.";
 $l['poll_closes'] = "This poll will close on: {1}";
 $l['already_voted'] = "You have already voted in this poll.";
 $l['no_voting_permission'] = "You do not have permission to vote in this poll.";
 $l['undo_vote'] = "Undo vote";
 $l['quick_reply'] = "Quick Reply";
+$l['quick_reply_message'] = "Compose your message...";
 $l['message_note'] = "Type your reply to this message here.";
 $l['signature'] = "Signature";
 $l['email_notify'] = "Email Notification";
@@ -107,4 +107,3 @@
 $l['quick_delete_thread_success'] = 'The thread was deleted successfully.';
 $l['quick_restore_error'] = 'There was an error restoring your reply:';
 $l['quick_restore_success'] = 'The post was restored successfully.';
-

inc/views/base/editpost/editpost.twig

@@ -72,7 +72,7 @@
                                 {% endfor %}
                             </select>
                         {% endif %}
-                        <input type="text" class="textbox textbox--subject" name="subject" size="40" maxlength="85" id="subject" value="{{ newthread.subject }}" tabindex="1" />
+                        <input type="text" class="textbox textbox--subject" name="subject" size="40" maxlength="85" id="subject" value="{{ editpost.subject }}" tabindex="1" />
                     </div>
 
                     {% if editpost.showposticons %}

inc/views/base/layouts/master.twig

@@ -15,9 +15,9 @@
     {% endfor %}
 
     {# TEMPORARY #}
-    <link href="{{ asset_url('assets/css/vendor/google-fonts/fonts.css') }}" rel="stylesheet">
+    <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="http://localhost:4000/assets/css/main.css" rel="stylesheet">
+    <link href="https://mybb.github.io/1.9-ui-framework/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" />
@@ -63,7 +63,7 @@
     // -->
     </script>
 
-    <script defer src="{{ asset_url('assets/js/fontawesome-all.js') }}"></script>
+    <script defer src="https://use.fontawesome.com/releases/v5.1.0/js/all.js" integrity="sha384-3LK/3kTpDE/Pkp8gTNp2gR/2gOiwQ6QaO7Td0zV76UFJVhqLl4Vl3KL1We6q6wR9" crossorigin="anonymous"></script>
 </head>
 <body>
 {% block header %}{% include 'partials/header.twig' %}{% endblock %}