Skip to content

Commit c35790e

Browse files
dkldkl
committed
forum: Update basic & elegance phpbb styles to 3.1.7-pl1
1 parent 8865f73 commit c35790e

File tree

226 files changed

+7799
-1729
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

226 files changed

+7799
-1729
lines changed

‎styles/basic/style.cfg‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@
2121
# General Information about this style
2222
name = Basic
2323
copyright = Created by Arty (Vjacheslav Trushkin), http://www.artodia.com/
24-
style_version = 3.1.6
25-
phpbb_version = 3.1.6
24+
style_version = 3.1.7
25+
phpbb_version = 3.1.7
2626

2727
# Defining a different template bitfield
2828
# template_bitfield = lNg=

‎styles/basic/template/ajax.js‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,14 @@ phpbb.addAjaxCallback('vote_poll', function(res) {
242242
var mostVoted = (res.vote_counts[optionId] === mostVotes);
243243
var percent = (!res.total_votes) ? 0 : Math.round((res.vote_counts[optionId] / res.total_votes) * 100);
244244
var percentRel = (mostVotes === 0) ? 0 : Math.round((res.vote_counts[optionId] / mostVotes) * 100);
245-
245+
var altText;
246+
247+
altText = $this.attr('data-alt-text');
248+
if (voted) {
249+
$this.attr('title', $.trim(altText));
250+
} else {
251+
$this.attr('title', '');
252+
};
246253
$this.toggleClass('voted', voted);
247254
$this.toggleClass('most-votes', mostVoted);
248255

‎styles/basic/template/forum_fn.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -166,7 +166,10 @@ function selectCode(a) {
166166
try {
167167
s.setBaseAndExtent(e, 0, e, l);
168168
} catch (error) {
169-
s.setBaseAndExtent(e, 0, e, 1);
169+
r = document.createRange();
170+
r.selectNodeContents(e);
171+
s.removeAllRanges();
172+
s.addRange(r);
170173
}
171174
}
172175
// Firefox and Opera

‎styles/basic/template/mcp_post.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -91,9 +91,9 @@ <h3><a href="{U_VIEW_POST}">{POST_SUBJECT}</a></h3>
9191
<form method="post" id="mcp_approve" action="{U_APPROVE_ACTION}">
9292

9393
<p class="post-notice deleted">
94-
<input class="button2" type="submit" value="{L_DELETE}" name="action[disapprove]" /> &nbsp;
94+
<!-- IF S_CAN_DELETE_POST --><input class="button2" type="submit" value="{L_DELETE}" name="action[delete]" /> &nbsp;<!-- ENDIF -->
9595
<input class="button1" type="submit" value="{L_RESTORE}" name="action[restore]" />
96-
<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="unapproved_posts" /><!-- ENDIF -->
96+
<!-- IF not S_FIRST_POST --><input type="hidden" name="mode" value="deleted_posts" /><!-- ENDIF -->
9797
<input type="hidden" name="post_id_list[]" value="{POST_ID}" />
9898
{S_FORM_TOKEN}
9999
</p>

‎styles/basic/template/memberlist_body.html‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,11 @@
2020

2121
<!-- IF S_SHOW_GROUP -->
2222
<h2 class="group-title"<!-- IF GROUP_COLOR --> style="color:#{GROUP_COLOR};"<!-- ENDIF -->>{GROUP_NAME}</h2>
23+
<!-- IF U_MANAGE -->
24+
<p class="right responsive-center manage rightside"><a href="{U_MANAGE}">{L_MANAGE_GROUP}</a></p>
25+
<!-- ENDIF -->
2326
<p>{GROUP_DESC} {GROUP_TYPE}</p>
27+
2428
<p>
2529
<!-- IF AVATAR_IMG -->{AVATAR_IMG}<!-- ENDIF -->
2630
<!-- IF RANK_IMG -->{RANK_IMG}<!-- ENDIF -->
@@ -107,8 +111,8 @@ <h2 class="solo">{PAGE_TITLE}<!-- IF SEARCH_WORDS -->{L_COLON} <a href="{U_SEARC
107111
<!-- ENDIF -->
108112
<!-- ENDIF -->
109113

110-
<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF -->">
111-
<td><span class="rank-img"><!-- EVENT memberlist_body_rank_prepend --><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --><!-- EVENT memberlist_body_rank_append --></span><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[&nbsp;<a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
114+
<tr class="<!-- IF memberrow.S_ROW_COUNT is even -->bg1<!-- ELSE -->bg2<!-- ENDIF --><!-- IF memberrow.S_INACTIVE --> inactive<!-- ENDIF -->">
115+
<td><span class="rank-img"><!-- EVENT memberlist_body_rank_prepend --><!-- IF memberrow.RANK_IMG -->{memberrow.RANK_IMG}<!-- ELSE -->{memberrow.RANK_TITLE}<!-- ENDIF --><!-- EVENT memberlist_body_rank_append --></span><!-- IF S_IN_SEARCH_POPUP and not S_SELECT_SINGLE --><input type="checkbox" name="user" value="{memberrow.USERNAME}" /> <!-- ENDIF --><!-- EVENT memberlist_body_username_prepend -->{memberrow.USERNAME_FULL}<!-- IF memberrow.S_INACTIVE --> ({L_INACTIVE})<!-- ENDIF --><!-- EVENT memberlist_body_username_append --><!-- IF S_IN_SEARCH_POPUP --><br />[&nbsp;<a href="#" onclick="insert_single_user('#results', '{memberrow.A_USERNAME}'); return false;">{L_SELECT}</a>&nbsp;]<!-- ENDIF --></td>
112116
<td class="posts"><!-- IF memberrow.POSTS and S_DISPLAY_SEARCH --><a href="{memberrow.U_SEARCH_USER}" title="{L_SEARCH_USER_POSTS}">{memberrow.POSTS}</a><!-- ELSE -->{memberrow.POSTS}<!-- ENDIF --></td>
113117
<td class="info"><!-- BEGIN custom_fields --><div>{memberrow.custom_fields.PROFILE_FIELD_VALUE}</div><!-- BEGINELSE -->&nbsp;<!-- END custom_fields --></td>
114118
<td>{memberrow.JOINED}</td>

‎styles/basic/template/overall_header.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,11 @@
3939
s.parentNode.insertBefore(wf, s);
4040
})(document);
4141
</script>
42-
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
42+
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
4343
<!-- ELSE -->
44-
<link href="{T_THEME_PATH}/fonts/font-awesome-4.4.0/css/font-awesome.min.css" rel="stylesheet">
44+
<link href="{T_THEME_PATH}/fonts/font-awesome-4.5.0/css/font-awesome.min.css" rel="stylesheet">
4545
<!-- ENDIF -->
46-
<link href="{T_THEME_PATH}/fonts/glyphicons-pro-1.9/css/glyphicons.css" rel="stylesheet">
46+
<link href="{T_THEME_PATH}/fonts/glyphicons-pro-1.9.2/css/glyphicons.css" rel="stylesheet">
4747

4848
<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
4949

‎styles/basic/template/search_body.html‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,9 @@ <h2 class="solo">{L_SEARCH}</h2>
99
<div class="inner">
1010
<h3>{L_SEARCH_QUERY}</h3>
1111

12+
<!-- EVENT search_body_search_query_before -->
1213
<fieldset>
14+
<!-- EVENT search_body_search_query_prepend -->
1315
<dl>
1416
<dt><label for="keywords">{L_SEARCH_KEYWORDS}{L_COLON}</label><br /><span>{L_SEARCH_KEYWORDS_EXPLAIN}</span></dt>
1517
<dd><input type="search" class="inputbox" name="keywords" id="keywords" size="40" title="{L_SEARCH_KEYWORDS}" /></dd>
@@ -20,7 +22,9 @@ <h3>{L_SEARCH_QUERY}</h3>
2022
<dt><label for="author">{L_SEARCH_AUTHOR}{L_COLON}</label><br /><span>{L_SEARCH_AUTHOR_EXPLAIN}</span></dt>
2123
<dd><input type="search" class="inputbox" name="author" id="author" size="40" title="{L_SEARCH_AUTHOR}" /></dd>
2224
</dl>
25+
<!-- EVENT search_body_search_query_append -->
2326
</fieldset>
27+
<!-- EVENT search_body_search_query_after -->
2428

2529
</div>
2630
</div>
@@ -30,7 +34,9 @@ <h3>{L_SEARCH_QUERY}</h3>
3034

3135
<h3>{L_SEARCH_OPTIONS}</h3>
3236

37+
<!-- EVENT search_body_search_options_before -->
3338
<fieldset>
39+
<!-- EVENT search_body_search_options_prepend -->
3440
<dl>
3541
<dt><label for="search_forum">{L_SEARCH_FORUMS}{L_COLON}</label><br /><span>{L_SEARCH_FORUMS_EXPLAIN}</span></dt>
3642
<dd><select name="fid[]" id="search_forum" multiple="multiple" size="8" title="{L_SEARCH_FORUMS}">{S_FORUM_OPTIONS}</select></dd>
@@ -49,9 +55,11 @@ <h3>{L_SEARCH_OPTIONS}</h3>
4955
<dd><label for="sf3"><input type="radio" name="sf" id="sf3" value="titleonly" /> {L_SEARCH_TITLE_ONLY}</label></dd>
5056
<dd><label for="sf4"><input type="radio" name="sf" id="sf4" value="firstpost" /> {L_SEARCH_FIRST_POST}</label></dd>
5157
</dl>
58+
<!-- EVENT search_body_search_options_append -->
5259

5360
<hr class="dashed" />
5461

62+
<!-- EVENT search_body_search_display_options_prepend -->
5563
<dl>
5664
<dt><label for="show_results1">{L_DISPLAY_RESULTS}{L_COLON}</label></dt>
5765
<dd>
@@ -74,7 +82,9 @@ <h3>{L_SEARCH_OPTIONS}</h3>
7482
<dt><label>{L_RETURN_FIRST}{L_COLON}</label></dt>
7583
<dd><select name="ch" title="{L_RETURN_FIRST}">{S_CHARACTER_OPTIONS}</select> {L_POST_CHARACTERS}</dd>
7684
</dl>
85+
<!-- EVENT search_body_search_display_options_append -->
7786
</fieldset>
87+
<!-- EVENT search_body_search_options_after -->
7888

7989
</div>
8090
</div>
@@ -91,7 +101,9 @@ <h3>{L_SEARCH_OPTIONS}</h3>
91101
</div>
92102

93103
</form>
104+
<!-- EVENT search_body_form_after -->
94105

106+
<!-- EVENT search_body_recent_search_before -->
95107
<!-- IF .recentsearch -->
96108
<div class="forumbg forumbg-table">
97109
<div class="inner">
@@ -119,5 +131,6 @@ <h3>{L_SEARCH_OPTIONS}</h3>
119131
</div>
120132
</div>
121133
<!-- ENDIF -->
134+
<!-- EVENT search_body_recent_search_after -->
122135

123136
<!-- INCLUDE overall_footer.html -->

‎styles/basic/template/search_results.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ <h2 class="searchresults-title"><!-- IF SEARCH_TITLE -->{SEARCH_TITLE}<!-- ELSE
3333
<!-- EVENT search_results_searchbox_after -->
3434

3535
<div class="pagination">
36+
<!-- IF U_MARK_ALL_READ --><a href="{U_MARK_ALL_READ}" class="mark-read" accesskey="m">{L_MARK_ALL_READ}</a> &bull;<!-- ENDIF -->
3637
{SEARCH_MATCHES}
3738
<!-- IF .pagination -->
3839
<!-- INCLUDE pagination.html -->

‎styles/basic/template/simple_header.html‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
s.parentNode.insertBefore(wf, s);
2323
})(document);
2424
</script>
25-
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.4.0/css/font-awesome.min.css" rel="stylesheet">
25+
<link href="//maxcdn.bootstrapcdn.com/font-awesome/4.5.0/css/font-awesome.min.css" rel="stylesheet">
2626
<!-- ELSE -->
27-
<link href="{T_THEME_PATH}/fonts/font-awesome-4.4.0/css/font-awesome.min.css" rel="stylesheet">
27+
<link href="{T_THEME_PATH}/fonts/font-awesome-4.5.0/css/font-awesome.min.css" rel="stylesheet">
2828
<!-- ENDIF -->
29-
<link href="{T_THEME_PATH}/fonts/glyphicons-pro-1.9/css/glyphicons.css" rel="stylesheet">
29+
<link href="{T_THEME_PATH}/fonts/glyphicons-pro-1.9.2/css/glyphicons.css" rel="stylesheet">
3030

3131
<link href="{T_STYLESHEET_LINK}" rel="stylesheet">
3232

‎styles/basic/template/ucp_register.html‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
// ]]>
1515
</script>
1616

17-
<form method="post" action="{S_UCP_ACTION}" id="register">
17+
<form id="register" method="post" action="{S_UCP_ACTION}"{S_FORM_ENCTYPE}>
1818

1919
<div class="panel">
2020
<div class="inner">

0 commit comments

Comments
 (0)