Skip to content

Commit

Permalink
Working on #2972 Template Conversion to Twig Format (misc.php) (#3151)
Browse files Browse the repository at this point in the history 
* Working on #2972 Template Conversion to Twig Format (misc.php)
Part 1 - Forum Rules, Help Docs, Buddy List and Who Posted

* Working on #2972 Template Conversion to Twig Format (misc.php)
Part 2 - Smilies, IM center and Syndication

* Working on #2972 Template Conversion to Twig Format (misc.php)
Part 3 - Smilie Pop-up

* Removed IM center
  • Loading branch information
@Starpaul20 @euantorano
Starpaul20 authored and euantorano committed Jun 2, 2019
1 parent 41f71f9 commit 2d85dd2
Show file tree
Hide file tree
Showing 11 changed files with 884 additions and 726 deletions.
79 changes: 79 additions & 0 deletions inc/views/base/misc/buddypopup.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
<div class="modal">
<div style="overflow-y: auto; max-height: 400px;">
<table cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead"{% if buddies.showlist %} colspan="2"{% endif %}>
<div><strong>{{ lang.buddy_list }}</strong></div>
</td>
</tr>
{% if buddies.showlist %}
<tr>
<td class="tcat" colspan="2"><strong>{{ lang.online }}</strong></td>
{% for buddy in buddys.online %}
{% set row = alt_trow() %}
<tr>
<td class="{{ row }}" width="1%">
<div class="buddy_avatar float_left"><img src="{{ buddy.avatar.image }}" alt="" {{ buddy.avatar.width_height|raw }} style="margin-top: 3px;" /></div>
</td>
<td class="{{ row }}">
{{ buddy.profile_link|raw }}
<div class="buddy_action">
<span class="smalltext">
{% if buddy.lastactive %}
{{ trans('last_active', buddy.last_active) }}
{% else %}
{{ trans('last_active', lang.never) }}
{% endif %}
<br />
{% if buddy.show_pm %}
<a href="private.php?action=send&amp;uid={{ buddy.uid }}" target="_blank" onclick="window.opener.location.href=this.href; return false;">{{ lang.pm_buddy }}</a>
{% endif %}
</span>
</div>
</td>
</tr>
{% else %}
<tr>
<td class="trow1" colspan="2"><em>{{ lang.online_none }}</em></td>
</tr>
{% endfor %}
</tr>
<tr>
<td class="tcat" colspan="2"><strong>{{ lang.offline }}</strong></td>
{% for buddy in buddys.offline %}
{% set row = alt_trow() %}
<tr>
<td class="{{ row }}" width="1%">
<div class="buddy_avatar float_left"><img src="{{ buddy.avatar.image }}" alt="" {{ buddy.avatar.width_height|raw }} style="margin-top: 3px;" /></div>
</td>
<td class="{{ row }}">
{{ buddy.profile_link|raw }}
<div class="buddy_action">
<span class="smalltext">
{% if buddy.lastactive %}
{{ trans('last_active', buddy.last_active) }}
{% else %}
{{ trans('last_active', lang.never) }}
{% endif %}
<br />
{% if buddy.show_pm %}
<a href="private.php?action=send&amp;uid={{ buddy.uid }}" target="_blank" onclick="window.opener.location.href=this.href; return false;">{{ lang.pm_buddy }}</a>
{% endif %}
</span>
</div>
</td>
</tr>
{% else %}
<tr>
<td class="trow1" colspan="2"><em>{{ lang.offline_none }}</em></td>
</tr>
{% endfor %}
</tr>
{% else %}
<tr>
<td class="trow1"><em>{{ lang.no_buddies }}</em></td>
</tr>
{% endif %}
</table>
</div>
</div>
64 changes: 64 additions & 0 deletions inc/views/base/misc/help.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,64 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ lang.help_docs }}</title>
{% endblock head %}

{% block body %}
{% for section in sections %}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder clear">
<thead>
<tr>
<td class="thead{{ section.expthead }}">
<div class="expcolimage">
<img src="{{ theme.imgdir }}/{{ section.expcolimage }}" id="sid_{{ section.sid }}_img" class="expander" alt="[-]" title="[-]" /></div>
<div><strong>{{ section.name }}</strong>
</div>
</td>
</tr>
</thead>
<tbody style="{{ section.expdisplay }}" id="sid_{{ section.sid }}_e">
<tr>
<td class="tcat"><span class="smalltext"><strong>{{ section.description }}</strong></span></td>
</tr>
{% for helpdoc in section.helpdocs %}
{% set row = alt_trow() %}
<tr>
<td width="100%" class="{{ row }}">
<strong><a href="misc.php?action=help&amp;hid={{ helpdoc.hid }}">{{ helpdoc.name }}</a></strong><br />
<span class="smalltext">{{ helpdoc.description }}</span>
</td>
</tr>
{% endfor %}
</tbody>
</table>
<br />
{% endfor %}
{% if mybb.settings.helpsearch %}
<br />
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead" colspan="3"><strong>{{ lang.search }}</strong></td>
</tr>
<tr>
<td class="trow1">
<form action="misc.php" method="post">
<div class="float_left" style="padding-top: 5px;">
<input type="text" name="keywords" value="{{ lang.enter_keywords }}" onfocus="if(this.value == '{{ lang.enter_keywords }}') { this.value = ''; }" onblur="if(this.value=='') { this.value='{{ lang.enter_keywords }}'; }" class="textbox" size="25" />
</div>
<div class="float_left" style="padding-left: 20px;">
<span class="smalltext">
<label><input name="name" checked="checked" value="1" type="checkbox"> {{ lang.search_by_name }}</label><br />
<label><input name="document" checked="checked" value="1" type="checkbox"> {{ lang.search_by_document }}</label>
</span>
</div>
<div class="float_left" style="padding-left: 20px; padding-top: 5px;">
<input type="hidden" name="action" value="do_helpsearch" />
<input type="submit" class="button" name="submit" value="{{ lang.search_help_documents }}" />
</div>
</form>
</td>
</tr>
</table>
{% endif %}
{% endblock body %}
16 changes: 16 additions & 0 deletions inc/views/base/misc/help_helpdoc.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ lang.help_docs }}</title>
{% endblock head %}

{% block body %}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder tfixed">
<tr>
<td class="thead"><strong>{{ helpdoc.name }}</strong></td>
</tr>
<tr>
<td class="trow1 scaleimages">{{ helpdoc.document|raw }}</td>
</tr>
</table>
{% endblock body %}
33 changes: 33 additions & 0 deletions inc/views/base/misc/helpresults.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ lang.help_doc_results }}</title>
{% endblock head %}

{% block body %}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead"><strong>{{ lang.help_doc_results }}</strong></td>
</tr>
<tr>
<td class="tcat" align="left"><span class="smalltext"><strong>{{ lang.document }}</strong></span></td>
</tr>
{% for helpdoc in helpdoclist %}
{% set row = alt_trow() %}
<tr><td class="{{ row }}">
<span class="smalltext">
<a href="misc.php?action=help&amp;hid={{ helpdoc.hid }}{{ highlight|raw }}">
{{ helpdoc.name|slice(0, 50) }}{% if helpdoc.name|length > 50 %}...{% endif %}
</a><br />
</span>
<table width="100%"><tr><td><span class="smalltext"><em>
{{ helpdoc.helpdoc|slice(0, 350) }}{% if helpdoc.helpdoc|length > 350 %}...{% endif %}
</em></span></td></tr></table>
</td></tr>
{% else %}
<tr>
<td class="trow1">{{ lang.no_help_results }}</td>
</tr>
{% endfor %}
</table>
{% endblock body %}
16 changes: 16 additions & 0 deletions inc/views/base/misc/rules.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ forum.rulestitle }}</title>
{% endblock head %}

{% block body %}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder tfixed">
<tr>
<td class="thead"><strong>{{ forum.rulestitle }}</strong></td>
</tr>
<tr>
<td class="trow1 scaleimages">{{ forum.rules }}</td>
</tr>
</table>
{% endblock body %}
31 changes: 31 additions & 0 deletions inc/views/base/misc/smilies.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ lang.smilies_listing }}</title>
{% endblock head %}

{% block body %}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead" colspan="3"><strong>{{ lang.smilies_listing }}</strong></td>
</tr>
<tr>
<td class="tcat" colspan="2" align="center"><span class="smalltext"><strong>{{ lang.name }}</strong></span></td>
<td class="tcat"><span class="smalltext"><strong>{{ lang.abbreviation }}</strong></span></td>
</tr>
{% for smilie in smilies %}
{% set row = alt_trow() %}
<tr>
<td class="{{ row }}" style="width: 1px; text-align: center;">
<img src="{{ smilie.image }}" alt="{{ smilie.name }}" title="{{ smilie.name }}" class="smilie smilie_{{ smilie.sid }}" />
</td>
<td class="{{ row }}">{{ smilie.name }}</td>
<td class="{{ row }}">{{ smilie.find|nl2br }}</td>
</tr>
{% else %}
<tr>
<td class="trow1">{{ lang.no_smilies }}</td>
</tr>
{% endfor %}
</table>
{% endblock body %}
27 changes: 27 additions & 0 deletions inc/views/base/misc/smilies_modal.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,27 @@
<div class="modal">
<div style="overflow-y: auto; max-height: 400px;" class="modal">
<table width="100%" border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead" colspan="4"><strong>{{ lang.smilies_listing }}</strong></td>
</tr>
<tr>
<td class="tcat" colspan="4"><span class="smalltext">{{ lang.click_to_add }}</span></td>
</tr>
{% for smilie_row in smilies %}
<tr>
{% for smilie in smilie_row %}
{% set row = alt_trow() %}
<td class="{{ row }}" align="center">
<img src="{{ smilie.image }}" alt="{{ smilie.name }}" title="{{ smilie.name }}" class="smilie smilie_{{ smilie.sid }} smilie_pointer" onclick="MyBBEditor.insertText(' {{ smilie.smilie_insert }} ');" />
</td>
<td class="{{ row }}">{{ smilie.find }}</td>
{% endfor %}
</tr>
{% else %}
<tr>
<td colspan="2" class="trow1">{{ lang.no_smilies }}</td>
</tr>
{% endfor %}
</table>
</div>
</div>
57 changes: 57 additions & 0 deletions inc/views/base/misc/syndication.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ lang.syndication }}</title>
{% endblock head %}

{% block body %}
{% if syndication.feedurl %}
<table border="0" cellspacing="0" cellpadding="{{ theme.tablespace }}" width="100%">
<tr><td>
<strong>{{ lang.syndication_generated_url }}</strong>
<blockquote>
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder"><tr><td class="trow1">
{{ syndication.url }}
</td></tr></table>
</blockquote>
</td></tr>
</table>
<br />
{% endif %}
<table border="0" cellspacing="0" cellpadding="{{ theme.tablespace }}" width="100%">
<tr><td>{{ lang.syndication_note|raw }}</td></tr>
</table>
<br />
<form method="post" action="misc.php?action=syndication">
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td class="thead" colspan="2"><strong>{{ lang.syndication }}</strong></td>
</tr>
<tr>
<td class="trow1" width="40%" valign="top"><strong>{{ lang.syndication_forum }}</strong><br /><span class="smalltext">{{ lang.syndication_forum_desc }}</span></td>
<td class="trow1" width="60%">
<select name="forums[]" size="10" multiple="multiple">
<option value="all"{% if syndication.allselected %} selected="selected"{% endif %}>{{ lang.syndicate_all_forums }}</option>
<option value="all">----------------------</option>
{% for forum in forums %}
<option value="{{ forum.fid }}"{% if forum.selected %} selected="selected"{% endif %}>{{ forum.depth|raw }} {{ forum.name }}</option>
{% endfor %}
</select>
</td>
</tr>
<tr>
<td class="trow2" width="40%" valign="top"><strong>{{ lang.syndication_version }}</strong><br /><span class="smalltext">{{ lang.syndication_version_desc }}</span></td>
<td class="trow2" width="60%">
<input type="radio" class="radio" name="version" value="rss2.0"{% if syndication.rss2check %} checked="checked"{% endif %} />&nbsp;{{ lang.syndication_version_rss2 }}<br />
<input type="radio" class="radio" name="version" value="atom1.0"{% if syndication.atom1check %} checked="checked"{% endif %} />&nbsp;{{ lang.syndication_version_atom1 }}
</td>
</tr>
<tr>
<td class="trow1" width="40%" valign="top"><strong>{{ lang.syndication_limit }}</strong><br /><span class="smalltext">{{ lang.syndication_limit_desc }}</span></td>
<td class="trow1" width="60%"><input type="text" class="textbox" name="limit" value="{{ syndication.limit }}" size="3" /> {{ lang.syndication_threads_time }}</td>
</tr>
</table>
<br />
<div align="center"><input type="submit" class="button" name="make" value="{{ lang.syndication_generate }}" /></div>
</form>
{% endblock body %}
24 changes: 24 additions & 0 deletions inc/views/base/misc/whoposted.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
{% extends 'layouts/master.twig' %}

{% block head %}
<title>{{ mybb.settings.bbname }} - {{ lang.who_posted }}</title>
{% endblock head %}

{% block body %}
<table border="0" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" class="tborder">
<tr>
<td colspan="2" class="thead"><strong>{{ lang.total_posts }} {{ thread.numposts }}</strong></td>
</tr>
<tr>
<td class="tcat"><span class="smalltext"><strong><a href="{{ mybb.settings.bburl }}/misc.php?action=whoposted&amp;tid={{ thread.tid }}&amp;sort=username">{{ lang.user }}</a></strong></span></td>
<td class="tcat"><span class="smalltext"><strong><a href="{{ mybb.settings.bburl }}/misc.php?action=whoposted&amp;tid={{ thread.tid }}">{{ lang.num_posts }}</a></strong></span></td>
</tr>
{% for poster in whoposted %}
{% set row = alt_trow() %}
<tr>
<td class="{{ row }}">{{ poster.profile_link|raw }}</td>
<td class="{{ row }}">{{ poster.posts }}</td>
</tr>
{% endfor %}
</table>
{% endblock body %}
20 changes: 20 additions & 0 deletions inc/views/base/misc/whoposted_modal.twig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<div class="modal">
<div style="overflow-y: auto; max-height: 400px;">
<table width="100%" cellspacing="{{ theme.borderwidth }}" cellpadding="{{ theme.tablespace }}" border="0" align="center" class="tborder">
<tr>
<td colspan="2" class="thead"><strong>{{ lang.total_posts }} {{ thread.numposts }}</strong></td>
</tr>
<tr>
<td class="tcat"><span class="smalltext"><strong><a href="javascript:void(0)" onclick="MyBB.whoPosted({{ thread.tid }}, 'username'); return false;">{{ lang.user }}</a></strong></span></td>
<td class="tcat"><span class="smalltext"><strong><a href="javascript:void(0)" onclick="MyBB.whoPosted({{ thread.tid }}); return false;">{{ lang.num_posts }}</a></strong></span></td>
</tr>
{% for poster in whoposted %}
{% set row = alt_trow() %}
<tr>
<td class="{{ row }}">{{ poster.profile_link|raw }}</td>
<td class="{{ row }}">{{ poster.posts }}</td>
</tr>
{% endfor %}
</table>
</div>
</div>

0 comments on commit 2d85dd2

Please sign in to comment.