Skip to content

Commit

Permalink
Homepage|Forums: Standardized twocolumn layouts in forum pages
Browse files Browse the repository at this point in the history 
Apply the same twocolumn formatting as used elsewhere on the site.
Also removed more redundant styling rules.
  • Loading branch information
@danij-deng
danij-deng committed Jul 14, 2013
1 parent 3d02cb9 commit 6f4774a
Show file tree
Hide file tree
Showing 8 changed files with 252 additions and 284 deletions.
6 changes: 3 additions & 3 deletions web/forums/skin/template/faq_body.html
View file
Expand Up @@ -5,12 +5,12 @@ <h1>{L_FAQ_TITLE}</h1>


<div id="faqlinks">
<div class="column1">
<div class="twocolumn">
<!-- BEGIN faq_block -->
<!-- IF faq_block.SWITCH_COLUMN or (SWITCH_COLUMN_MANUALLY and faq_block.S_ROW_COUNT == 4) -->
</div>

<div class="column2">
<div class="twocolumn">
<!-- ENDIF -->

<dl class="faq">
Expand All @@ -21,7 +21,6 @@ <h1>{L_FAQ_TITLE}</h1>
</dl>
<!-- END faq_block -->
</div>
<span class="columnend"></span>
</div>

<div class="clear"></div>
Expand All @@ -41,5 +40,6 @@ <h2>{faq_block.BLOCK_TITLE}</h2>
</div>
<div class="block">
<!-- INCLUDE jumpbox.html -->
&nbsp;
</div>
<!-- INCLUDE overall_footer.html -->
182 changes: 88 additions & 94 deletions web/forums/skin/template/mcp_notes_user.html
View file
Expand Up @@ -5,119 +5,113 @@
<h2>{L_TITLE}</h2>

<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>

<h3>{USERNAME_FULL}</h3>

<div>
<div class="column1">
<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
</div>

<div class="column2">
<dl class="details">
<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
</dl>
</div>
</div>

<span class="corners-bottom"><span></span></span></div>

<h3>{USERNAME_FULL}</h3>

<div>
<div class="twocolumn">
<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
</div>

<div class="twocolumn">
<dl class="details">
<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
</dl>
</div>
</div>

</div>

<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>

<h3>{L_ADD_FEEDBACK}</h3>
<p>{L_ADD_FEEDBACK_EXPLAIN}</p>
<h3>{L_ADD_FEEDBACK}</h3>
<p>{L_ADD_FEEDBACK_EXPLAIN}</p>

<fieldset>
<textarea name="usernote" id="usernote" class="inputbox" cols="40" rows="3"></textarea>
</fieldset>
<fieldset>
<textarea name="usernote" id="usernote" class="inputbox" cols="40" rows="3"></textarea>
</fieldset>

<span class="corners-bottom"><span></span></span></div>
</div>

<fieldset class="submit-buttons">
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
{S_HIDDEN_FIELDS}<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
<input type="submit" name="action[add_feedback]" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
</fieldset>

<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>

<ul class="linklist">
<li class="leftside">
{L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</li>
</ul>

<table cellspacing="1" class="table1">
<thead>
<tr>
<th>{L_REPORT_BY}</th>
<th style="text-align: center">{L_IP}</th>
<th style="text-align: center">{L_TIME}</th>
<th>{L_ACTION_NOTE}</th>
<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
</tr>
</thead>
<tbody>
<!-- BEGIN usernotes -->
<!-- IF usernotes.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
<td>{usernotes.REPORT_BY}</td>
<td style="text-align: center">{usernotes.IP}</td>
<td style="text-align: center">{usernotes.REPORT_AT}</td>
<td>{usernotes.ACTION}</td>

<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
</tr>
<!-- BEGINELSE -->
<tr>
<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
</tr>
<!-- END usernames -->
</tbody>
</table>

<hr />

<fieldset class="display-options">
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
<label>{L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS}</label>
<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
<input type="submit" name="sort" value="{L_GO}" class="button2" />
</fieldset>

<hr />

<ul class="linklist">
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</li>
</ul>

<span class="corners-bottom"><span></span></span></div>

<ul class="linklist">
<li class="leftside">
{L_SEARCH_KEYWORDS}: <input type="text" class="inputbox autowidth" name="keywords" value="{S_KEYWORDS}" />&nbsp;<input type="submit" class="button2" name="filter" value="{L_SEARCH}" />
</li>
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS} <!-- ENDIF -->
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</li>
</ul>

<table cellspacing="1" class="table1">
<thead>
<tr>
<th>{L_REPORT_BY}</th>
<th style="text-align: center">{L_IP}</th>
<th style="text-align: center">{L_TIME}</th>
<th>{L_ACTION_NOTE}</th>
<!-- IF S_CLEAR_ALLOWED --><th>{L_MARK}</th><!-- ENDIF -->
</tr>
</thead>
<tbody>
<!-- BEGIN usernotes -->
<!-- IF usernotes.S_ROW_COUNT is even --><tr class="bg1"><!-- ELSE --><tr class="bg2"><!-- ENDIF -->
<td>{usernotes.REPORT_BY}</td>
<td style="text-align: center">{usernotes.IP}</td>
<td style="text-align: center">{usernotes.REPORT_AT}</td>
<td>{usernotes.ACTION}</td>

<!-- IF S_CLEAR_ALLOWED --><td width="5%" align="center"><input type="checkbox" name="marknote[]" id="note-{usernotes.ID}" value="{usernotes.ID}" /></td><!-- ENDIF -->
</tr>
<!-- BEGINELSE -->
<tr>
<td class="bg1" colspan="<!-- IF S_CLEAR_ALLOWED -->5<!-- ELSE -->4<!-- ENDIF -->" align="center"><span class="gen">{L_NO_ENTRIES}</span></td>
</tr>
<!-- END usernames -->
</tbody>
</table>

<hr />

<fieldset class="display-options">
<!-- IF NEXT_PAGE --><a href="{NEXT_PAGE}" class="right-box {S_CONTENT_FLOW_END}">{L_NEXT}</a><!-- ENDIF -->
<!-- IF PREVIOUS_PAGE --><a href="{PREVIOUS_PAGE}" class="left-box {S_CONTENT_FLOW_BEGIN}">{L_PREVIOUS}</a><!-- ENDIF -->
<label>{L_DISPLAY_LOG}: {S_SELECT_SORT_DAYS}</label>
<label>{L_SORT_BY} {S_SELECT_SORT_KEY}</label><label>{S_SELECT_SORT_DIR}</label>
<input type="submit" name="sort" value="{L_GO}" class="button2" />
</fieldset>

<hr />

<ul class="linklist">
<li class="rightside pagination">
<!-- IF TOTAL_REPORTS -->{TOTAL_REPORTS}<!-- ENDIF -->
<!-- IF PAGE_NUMBER --><!-- IF PAGINATION --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span><!-- ELSE --> &bull; {PAGE_NUMBER}<!-- ENDIF --><!-- ENDIF -->
</li>
</ul>

</div>

<!-- IF S_CLEAR_ALLOWED -->
<fieldset class="display-actions">
<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
&nbsp;<input class="button1" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
<input class="button2" type="submit" name="action[del_all]" value="{L_DELETE_ALL}" />
&nbsp;<input class="button1" type="submit" name="action[del_marked]" value="{L_DELETE_MARKED}" />
</fieldset>

<fieldset class="display-actions">
<div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>
<div><a href="#" onclick="marklist('mcp', 'marknote', true); return false;">{L_MARK_ALL}</a> &bull; <a href="#" onclick="marklist('mcp', 'marknote', false); return false;">{L_UNMARK_ALL}</a></div>
</fieldset>
<!-- ENDIF -->
</form>
Expand Down
92 changes: 43 additions & 49 deletions web/forums/skin/template/mcp_warn_post.html
View file
Expand Up @@ -5,69 +5,63 @@
<h2>{L_MCP_WARN_POST}</h2>

<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>

<h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!-- ELSE -->{USERNAME}<!-- ENDIF --></h3>

<div>
<div class="column1">
<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
</div>

<div class="column2">
<dl class="details">
<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
</dl>
</div>
</div>

<span class="corners-bottom"><span></span></span></div>

<h3><!-- IF USER_COLOR --><span style="color: #{USER_COLOR}">{USERNAME}</span><!-- ELSE -->{USERNAME}<!-- ENDIF --></h3>

<div>
<div class="twocolumn">
<!-- IF AVATAR_IMG --><div>{AVATAR_IMG}</div><!-- ENDIF -->
</div>

<div class="twocolumn">
<dl class="details">
<!-- IF RANK_TITLE --><dt>{L_RANK}:</dt><dd>{RANK_TITLE}</dd><!-- ENDIF -->
<!-- IF RANK_IMG --><dt><!-- IF RANK_TITLE -->&nbsp;<!-- ELSE -->{L_RANK}:<!-- ENDIF --></dt><dd>{RANK_IMG}</dd><!-- ENDIF -->
<dt>{L_JOINED}:</dt><dd>{JOINED}</dd>
<dt>{L_TOTAL_POSTS}:</dt><dd>{POSTS}</dd>
<dt>{L_WARNINGS}: </dt><dd>{WARNINGS}</dd>
</dl>
</div>
</div>

</div>

<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>

<h3>{L_POST_DETAILS}</h3>
<h3>{L_POST_DETAILS}</h3>

<div class="postbody">
<div class="postbody">

<div class="content">
{POST}
</div>
<div class="content">
{POST}
</div>

</div>
</div>

<span class="corners-bottom"><span></span></span></div>
</div>

<div class="panel">
<div class="inner"><span class="corners-top"><span></span></span>

<h3>{L_ADD_WARNING}</h3>
<p>{L_ADD_WARNING_EXPLAIN}</p>

<fieldset>
<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3">{L_WARNING_POST_DEFAULT}</textarea>
<!-- IF S_CAN_NOTIFY -->
<br /><br />
<dl class="panel">
<dt>&nbsp;</dt>
<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
</dl>
<!-- ENDIF -->
</fieldset>

<span class="corners-bottom"><span></span></span></div>

<h3>{L_ADD_WARNING}</h3>
<p>{L_ADD_WARNING_EXPLAIN}</p>

<fieldset>
<textarea name="warning" id="warning" class="inputbox" cols="40" rows="3">{L_WARNING_POST_DEFAULT}</textarea>
<!-- IF S_CAN_NOTIFY -->
<br /><br />
<dl class="panel">
<dt>&nbsp;</dt>
<dd><label><input type="checkbox" name="notify_user" checked="checked" /> {L_NOTIFY_USER_WARN}</label></dd>
</dl>
<!-- ENDIF -->
</fieldset>

</div>

<fieldset class="submit-buttons">
<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
<input type="reset" value="{L_RESET}" name="reset" class="button2" />&nbsp;
<input type="submit" name="action[add_warning]" value="{L_SUBMIT}" class="button1" />
{S_FORM_TOKEN}
</fieldset>
</form>

Expand Down

0 comments on commit 6f4774a

Please sign in to comment.