aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorDominik Dröscher <dhn2@users.sourceforge.net>2007-04-06 23:09:00 +0000
committerDominik Dröscher <dhn2@users.sourceforge.net>2007-04-06 23:09:00 +0000
commit39f8ef287af043e0724631094351c77b93191bba (patch)
treeb6caaf20a03cc90acc61a2de33c99b883afe2f28 /phpBB
parente3007bb6cf79f19e70cc9cf486f49eba574d20bc (diff)
downloadforums-39f8ef287af043e0724631094351c77b93191bba.tar
forums-39f8ef287af043e0724631094351c77b93191bba.tar.gz
forums-39f8ef287af043e0724631094351c77b93191bba.tar.bz2
forums-39f8ef287af043e0724631094351c77b93191bba.tar.xz
forums-39f8ef287af043e0724631094351c77b93191bba.zip
#8669
#8745 #8762 #5417 #9525 #9568 #9574 #9577 #9640 #9641 #9644 git-svn-id: file:///svn/phpbb/trunk@7291 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/adm/style/admin.css2
-rw-r--r--phpBB/adm/style/overall_header.html2
-rw-r--r--phpBB/styles/prosilver/imageset/icon_back_top.gif (renamed from phpBB/styles/prosilver/theme/images/top.gif)bin204 -> 204 bytes
-rw-r--r--phpBB/styles/prosilver/imageset/imageset.cfg2
-rw-r--r--phpBB/styles/prosilver/template/memberlist_body.html2
-rw-r--r--phpBB/styles/prosilver/template/posting_editor.html17
-rw-r--r--phpBB/styles/prosilver/template/search_results.html5
-rw-r--r--phpBB/styles/prosilver/template/viewforum_body.html4
-rw-r--r--phpBB/styles/prosilver/template/viewtopic_body.html2
-rw-r--r--phpBB/styles/prosilver/theme/colours.css9
-rw-r--r--phpBB/styles/prosilver/theme/common.css4
-rw-r--r--phpBB/styles/prosilver/theme/forms.css4
-rw-r--r--phpBB/styles/prosilver/theme/tweaks.css8
-rw-r--r--phpBB/styles/subsilver2/imageset/imageset.cfg2
14 files changed, 48 insertions, 15 deletions
diff --git a/phpBB/adm/style/admin.css b/phpBB/adm/style/admin.css
index 3eb8c68d99..0a5710f38c 100644
--- a/phpBB/adm/style/admin.css
+++ b/phpBB/adm/style/admin.css
@@ -1206,11 +1206,13 @@ input.disabled {
width: 200px;
color: #000;
text-align: center;
+ border: 1px solid #AAA;
}
.tooltip span.top {
background: #EFEFEF;
font-weight: bold;
+ padding: 2px;
}
.tooltip span.bottom {
diff --git a/phpBB/adm/style/overall_header.html b/phpBB/adm/style/overall_header.html
index acbf00dff5..9024c08577 100644
--- a/phpBB/adm/style/overall_header.html
+++ b/phpBB/adm/style/overall_header.html
@@ -175,8 +175,10 @@ function switch_menu()
<div class="panel">
<span class="corners-top"><span></span></span>
<div id="content">
+ <!-- IF not S_USER_NOTICE -->
<div id="toggle">
<a id="toggle-handle" accesskey="m" title="{L_MENU_TOGGLE}" onclick="switch_menu(); return false;" href="#"></a></div>
+ <!-- ENDIF -->
<div id="menu">
<p>{L_LOGGED_IN_AS}<br /><strong>{USERNAME}</strong> [&nbsp;<a href="{U_LOGOUT}">{L_LOGOUT}</a>&nbsp;]</p>
<ul>
diff --git a/phpBB/styles/prosilver/theme/images/top.gif b/phpBB/styles/prosilver/imageset/icon_back_top.gif
index 4d2b8f3822..4d2b8f3822 100644
--- a/phpBB/styles/prosilver/theme/images/top.gif
+++ b/phpBB/styles/prosilver/imageset/icon_back_top.gif
Binary files differ
diff --git a/phpBB/styles/prosilver/imageset/imageset.cfg b/phpBB/styles/prosilver/imageset/imageset.cfg
index a9ab8aaa6a..0e0a85f5ce 100644
--- a/phpBB/styles/prosilver/imageset/imageset.cfg
+++ b/phpBB/styles/prosilver/imageset/imageset.cfg
@@ -84,6 +84,8 @@ img_global_unread_locked_mine = announce_unread_locked_mine.gif*27*27
img_pm_read = topic_read.gif*27*27
img_pm_unread = topic_unread.gif*27*27
+img_icon_back_top = icon_back_top.gif
+
img_icon_contact_aim = icon_contact_aim.gif*20*72
img_icon_contact_email = icon_contact_email.gif*20*72
img_icon_contact_icq = icon_contact_icq.gif*20*72
diff --git a/phpBB/styles/prosilver/template/memberlist_body.html b/phpBB/styles/prosilver/template/memberlist_body.html
index ec4cbeb3fc..52ca3be3c9 100644
--- a/phpBB/styles/prosilver/template/memberlist_body.html
+++ b/phpBB/styles/prosilver/template/memberlist_body.html
@@ -151,7 +151,7 @@
<hr />
<ul class="linklist">
- <li class="rightside pagination">{TOTAL_USERS} &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> <!-- IF PAGINATION --> &bull; <span>{PAGINATION}</span><!-- ENDIF --></li>
+ <li class="rightside pagination">{TOTAL_USERS} &bull; <!-- IF PAGINATION --><a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a> &bull; <span>{PAGINATION}</span> &bull; <span>{PAGINATION}</span><!-- ELSE -->{PAGE_NUMBER}<!-- ENDIF --></li>
</ul>
<!-- IF S_SEARCH_USER and S_FORM_NAME -->
diff --git a/phpBB/styles/prosilver/template/posting_editor.html b/phpBB/styles/prosilver/template/posting_editor.html
index 90acbc0094..bfb38afad0 100644
--- a/phpBB/styles/prosilver/template/posting_editor.html
+++ b/phpBB/styles/prosilver/template/posting_editor.html
@@ -14,7 +14,14 @@
<!-- END to_recipient -->
</dd>
<!-- ENDIF -->
- <dd><input class="inputbox" type="text" name="username" id="username_list" size="20" maxlength="40" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" /><!-- IF S_ALLOW_MASS_PM --> <input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" /><!-- ENDIF --></dd>
+ <dd>
+
+ <!-- IF S_ALLOW_MASS_PM -->
+ <textarea id="username_list" name="username_list"></textarea> <input type="submit" name="add_to" value="{L_ADD}" class="button2" />
+ <input type="submit" name="add_bcc" value="{L_ADD_BCC}" class="button2" />
+ <!-- ELSE -->
+ <input class="inputbox" type="text" name="username" id="username" size="20" maxlength="40" value="" /> <input type="submit" name="add_to" value="{L_ADD}" class="button2" />
+ <!-- ENDIF --></dd>
</dl>
<!-- IF S_ALLOW_MASS_PM and .bcc_recipient -->
@@ -104,9 +111,11 @@
{URL_STATUS}<br />
{SMILIES_STATUS}
<!-- ENDIF -->
- <hr />
- <!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF -->
- <!-- IF S_DISPLAY_REVIEW --><strong><a href="#review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF -->
+ <!-- IF S_EDIT_DRAFT || S_DISPLAY_REVIEW -->
+ <hr />
+ <!-- IF S_EDIT_DRAFT --><strong><a href="{S_UCP_ACTION}">{L_BACK_TO_DRAFTS}</a></strong><!-- ENDIF -->
+ <!-- IF S_DISPLAY_REVIEW --><strong><a href="#review">{L_TOPIC_REVIEW}</a></strong><!-- ENDIF -->
+ <!-- ENDIF -->
</div>
<div id="message-box">
diff --git a/phpBB/styles/prosilver/template/search_results.html b/phpBB/styles/prosilver/template/search_results.html
index 701983e404..98a3ff8c44 100644
--- a/phpBB/styles/prosilver/template/search_results.html
+++ b/phpBB/styles/prosilver/template/search_results.html
@@ -59,13 +59,14 @@
<!-- IF searchresults.S_TOPIC_UNAPPROVED or searchresults.S_POSTS_UNAPPROVED --><a href="{searchresults.U_MCP_QUEUE}">{searchresults.UNAPPROVED_IMG}</a> <!-- ENDIF -->
<!-- IF searchresults.S_TOPIC_REPORTED --><a href="{searchresults.U_MCP_REPORT}">{REPORTED_IMG}</a><!-- ENDIF --><br />
<!-- IF searchresults.PAGINATION --><strong class="pagination"><span>{searchresults.PAGINATION}</span></strong><!-- ENDIF -->
- {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} {searchresults.NEWEST_POST_IMG}
+ {L_POST_BY_AUTHOR} {searchresults.TOPIC_AUTHOR_FULL} {L_POSTED_ON_DATE} {searchresults.FIRST_POST_TIME} {searchresults.NEWEST_POST_IMG}
+ <!-- IF not searchresults.S_TOPIC_GLOBAL -->{L_IN} <a href="{searchresults.U_VIEW_FORUM}">{searchresults.FORUM_TITLE}</a><!-- ELSE --> ({L_GLOBAL})<!-- ENDIF -->
</dt>
<dd class="posts">{searchresults.TOPIC_REPLIES}</dd>
<dd class="views">{searchresults.TOPIC_VIEWS}</dd>
<dd class="lastpost"><span>
{L_POST_BY_AUTHOR} {searchresults.LAST_POST_AUTHOR_FULL}
- <a href="{searchresults.U_LAST_POST}">{searchresults.LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME}</span>
+ <a href="{searchresults.U_LAST_POST}">{searchresults.LAST_POST_IMG}</a> <br />{L_POSTED_ON_DATE} {searchresults.LAST_POST_TIME}<br /> </span>
</dd>
</dl>
</li>
diff --git a/phpBB/styles/prosilver/template/viewforum_body.html b/phpBB/styles/prosilver/template/viewforum_body.html
index 1e55c9aecd..c9fb73f6d6 100644
--- a/phpBB/styles/prosilver/template/viewforum_body.html
+++ b/phpBB/styles/prosilver/template/viewforum_body.html
@@ -194,8 +194,8 @@
<!-- IF S_USER_LOGGED_IN and not U_POST_REPLY_TOPIC and TOTAL_TOPICS and not S_IS_BOT --><a href="{U_MARK_TOPICS}">{L_MARK_TOPICS_READ}</a> &bull; <!-- ENDIF -->
<!-- IF TOTAL_POSTS and not NEWEST_USER --> {TOTAL_POSTS}<!-- ELSEIF TOTAL_TOPICS and not NEWEST_USER --> {TOTAL_TOPICS}<!-- ENDIF -->
<!-- IF TOTAL_USERS -->{TOTAL_USERS}<!-- ENDIF -->
- <!-- IF PAGE_NUMBER --> &bull; <a href="#" onclick="jumpto(); return false;" title="{L_JUMP_TO_PAGE}">{PAGE_NUMBER}</a><!-- ENDIF -->
- <!-- IF PAGINATION --> &bull; <span>{PAGINATION}</span><!-- ENDIF -->
+ <!-- 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 -->
</div>
<!-- ENDIF -->
</div>
diff --git a/phpBB/styles/prosilver/template/viewtopic_body.html b/phpBB/styles/prosilver/template/viewtopic_body.html
index 1ccc10619f..e298c7e42b 100644
--- a/phpBB/styles/prosilver/template/viewtopic_body.html
+++ b/phpBB/styles/prosilver/template/viewtopic_body.html
@@ -208,7 +208,7 @@
</dl>
<!-- ENDIF -->
- <div class="back2top"><a href="#wrap" title="{L_BACK_TO_TOP}"><img src="{T_THEME_PATH}/images/top.gif" width="11" height="11" alt="{L_BACK_TO_TOP}" /></a></div>
+ <div class="back2top"><a href="#wrap" title="{L_BACK_TO_TOP}"><img src="{T_IMAGESET_PATH}/icon_back_top.gif" alt="{L_BACK_TO_TOP}" /></a></div>
<span class="corners-bottom"><span></span></span></div>
</div>
diff --git a/phpBB/styles/prosilver/theme/colours.css b/phpBB/styles/prosilver/theme/colours.css
index bd93eb9493..37ca60320a 100644
--- a/phpBB/styles/prosilver/theme/colours.css
+++ b/phpBB/styles/prosilver/theme/colours.css
@@ -851,7 +851,7 @@ pmlist li.pm_foe_colour, .pm_foe_colour {
/* Avatar gallery */
#gallery label {
- background: #FFFFFF;
+ background-color: #FFFFFF;
border-color: #CCC;
}
@@ -946,6 +946,13 @@ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.but
color: #000000;
}
+/* Hover states */
+a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
+ border: 1px solid #BC2A4D;
+ background-position: 0 100%;
+ color: #BC2A4D;
+}
+
input.search {
background-image: url("{T_THEME_PATH}/images/icon_textbox_search.gif");
} \ No newline at end of file
diff --git a/phpBB/styles/prosilver/theme/common.css b/phpBB/styles/prosilver/theme/common.css
index 35a956b81b..935b81b9dd 100644
--- a/phpBB/styles/prosilver/theme/common.css
+++ b/phpBB/styles/prosilver/theme/common.css
@@ -429,14 +429,14 @@ dl.details {
dl.details dt {
float: left;
- width: 11em;
+ width: 16em;
text-align: right;
color: #000000;
display: block;
}
dl.details dd {
- margin-left: 11em;
+ margin-left: 16em;
padding-left: 5px;
margin-bottom: 5px;
color: #828282;
diff --git a/phpBB/styles/prosilver/theme/forms.css b/phpBB/styles/prosilver/theme/forms.css
index 2d2eb56fed..006ed3b026 100644
--- a/phpBB/styles/prosilver/theme/forms.css
+++ b/phpBB/styles/prosilver/theme/forms.css
@@ -347,9 +347,9 @@ a.button1, a.button1:link, a.button1:visited, a.button1:active, a.button2, a.but
/* Hover states */
a.button1:hover, input.button1:hover, a.button2:hover, input.button2:hover, input.button3:hover {
- border: 1px solid #BC2A4D;
+ border: 1px solid #BCBCBC;
background-position: 0 100%;
- color: #BC2A4D;
+ color: #BCBCBC;
}
/* Topic and forum Search */
diff --git a/phpBB/styles/prosilver/theme/tweaks.css b/phpBB/styles/prosilver/theme/tweaks.css
index 387f2cf44b..4dd490ea33 100644
--- a/phpBB/styles/prosilver/theme/tweaks.css
+++ b/phpBB/styles/prosilver/theme/tweaks.css
@@ -45,3 +45,11 @@ html>body dd label input { vertical-align: text-bottom; } /* Align checkboxes/ra
#tabs, #minitabs, .post, .navbar, fieldset dl, ul.topiclist dl, ul.linklist, dl.polls {
height: 1%;
}
+
+/* Simple fix so forum and topic lists always have a min-height set, even in IE6
+ From http://www.dustindiaz.com/min-height-fast-hack */
+dl.icon {
+ min-height: 35px;
+ height: auto !important;
+ height: 35px;
+} \ No newline at end of file
diff --git a/phpBB/styles/subsilver2/imageset/imageset.cfg b/phpBB/styles/subsilver2/imageset/imageset.cfg
index c9d9442a0c..80c9c349c6 100644
--- a/phpBB/styles/subsilver2/imageset/imageset.cfg
+++ b/phpBB/styles/subsilver2/imageset/imageset.cfg
@@ -84,6 +84,8 @@ img_global_unread_locked_mine = announce_unread_locked_mine.gif*18*19
img_pm_read = topic_read.gif*18*19
img_pm_unread = topic_unread.gif*18*19
+img_icon_back_top =
+
img_icon_contact_aim = {LANG}/icon_contact_aim.gif
img_icon_contact_email = {LANG}/icon_contact_email.gif
img_icon_contact_icq = {LANG}/icon_contact_icq.gif
generated by cgit v1.2.1 (git 2.21.0) at 2026-02-06 17:33:25 +0000