From ba19d68c7886a45050ef0bf1f8f58783081f878b Mon Sep 17 00:00:00 2001 From: Git Date: Tue, 12 Feb 2013 08:00:08 +0000 Subject: [PATCH] Empty commit --- classes/class_torrents.php | 2 +- sections/forums/forum.php | 5 +++ sections/tools/data/suggestions.php | 6 +++ sections/top10/tags.php | 16 +++---- sections/top10/torrents.php | 22 +++++----- sections/top10/users.php | 10 ++--- sections/top10/votes.php | 6 +-- sections/torrents/notify.php | 21 +++++---- sections/torrents/vote.php | 10 +++-- sections/userhistory/email_history2.php | 32 +++++++------- static/styles/dark_ambient/style.css | 5 ++- static/styles/kuro/style.css | 13 +++--- static/styles/minimal/style.css | 5 ++- static/styles/minimal/style2.css | 5 ++- static/styles/minimal_mod_alt.css | 11 +++-- static/styles/mono/style.css | 13 +++--- static/styles/postmod/style.css | 57 +++++++++++++++---------- static/styles/proton/style.css | 5 ++- static/styles/white.cd/style.css | 9 ++-- 19 files changed, 150 insertions(+), 103 deletions(-) diff --git a/classes/class_torrents.php b/classes/class_torrents.php index 83958217..e3fb6364 100644 --- a/classes/class_torrents.php +++ b/classes/class_torrents.php @@ -480,7 +480,7 @@ public static function filelist_delim() { */ public static function filelist_format_file($File) { list($Size, $Name) = $File; - $Name = Format::make_utf8($Name); + $Name = Format::make_utf8(strtr($Name, "\n\r\t", " ")); $ExtPos = strrpos($Name, '.'); $Ext = $ExtPos ? substr($Name, $ExtPos) : ''; return sprintf("%s s%ds %s %s", $Ext, $Size, $Name, self::filelist_delim()); diff --git a/sections/forums/forum.php b/sections/forums/forum.php index 63b4ce0c..be2ed7d9 100644 --- a/sections/forums/forum.php +++ b/sections/forums/forum.php @@ -111,6 +111,11 @@
+ + Scoreboard + + + +

Marked

@@ -46,6 +47,8 @@
+
+

Implemented

@@ -68,6 +71,8 @@
+
+

Rejected

@@ -90,6 +95,7 @@
+

Top - - + - Top 10 @@ -125,10 +125,10 @@ function generate_tag_table($Caption, $Tag, $Details, $Limit, $ShowVotes=true, $ Rank Tag - Uses + Uses - Pos. votes - Neg. votes + Pos. votes + Neg. votes "> - + - - + + - + get_value('top10tor_day_'.$Limit.$WhereSum); if ($TopTorrentsActiveLastDay === false) { @@ -348,9 +348,9 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { global $LoggedUser,$Categories,$ReleaseTypes; ?>

Top - - - + + - Top 10 @@ -368,7 +368,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { - Top 250 - +

@@ -426,12 +426,12 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { // generate torrent's title $DisplayName=''; - - + + if(!empty($Artists[$GroupID])) { $DisplayName = Artists::display_artists($Artists[$GroupID], true, true); } - + $DisplayName.= "$GroupName"; if($GroupCategoryID==1 && $GroupYear>0) { @@ -496,7 +496,7 @@ function generate_torrent_table($Caption, $Tag, $Details, $Limit) { Bookmark - + diff --git a/sections/top10/users.php b/sections/top10/users.php index 18402d26..951d09ad 100644 --- a/sections/top10/users.php +++ b/sections/top10/users.php @@ -40,8 +40,8 @@ JOIN users_info AS ui ON ui.UserID = u.ID LEFT JOIN torrents AS t ON t.UserID=u.ID WHERE u.Enabled='1' - AND Uploaded>'". 5*1024*1024*1024 ."' - AND Downloaded>'". 5*1024*1024*1024 ."' + AND Uploaded>'". 5*1024*1024*1024 ."' + AND Downloaded>'". 5*1024*1024*1024 ."' AND (Paranoia IS NULL OR (Paranoia NOT LIKE '%\"uploaded\"%' AND Paranoia NOT LIKE '%\"downloaded\"%')) GROUP BY u.ID"; @@ -62,7 +62,7 @@ } generate_user_table('Downloaders', 'dl', $TopUserDownloads, $Limit); } - + if($Details=='all' || $Details=='numul') { if (!$TopUserNumUploads = $Cache->get_value('topuser_numul_'.$Limit)) { $DB->query("$BaseQuery ORDER BY NumUploads DESC LIMIT $Limit;"); @@ -101,8 +101,8 @@ function generate_user_table($Caption, $Tag, $Details, $Limit) { global $Time; ?>

Top - - + - Top 10 diff --git a/sections/top10/votes.php b/sections/top10/votes.php index 369711a1..a87f8a28 100644 --- a/sections/top10/votes.php +++ b/sections/top10/votes.php @@ -62,7 +62,7 @@ $Results = $DB->collect('GroupID'); $Data = $DB->to_array('GroupID'); - + $Groups = Torrents::get_groups($Results); if (count($Results) > 0) { $DB->query('SELECT ID, CategoryID FROM torrents_group @@ -136,7 +136,7 @@

Top - + @@ -227,7 +227,7 @@ -

+ $TagName) { - $TagName = str_replace('_', '.', $TagName); - $TagLinks[] = ''.$TagName.''; + $TorrentTags = array(); + $TagList = explode(' ', $GroupInfo['TagList']); + $MainTag = $TagList[0]; + foreach ($TagList as $Tag) { + $Tag = str_replace('_', '.', $Tag); + $TorrentTags[] = ''.$Tag.''; } - $TagLinks = implode(', ', $TagLinks); - $TorrentTags = '
'.$TagLinks.'
'; + $TorrentTags = implode(', ', $TorrentTags); } else { $TorrentTags = ''; $MainTag = $Categories[$GroupCategoryID-1]; @@ -275,11 +275,14 @@ function header_link($SortKey, $DefaultWay = "desc") { | CL ] - + +
+ New!'; } ?> - +
+
diff --git a/sections/torrents/vote.php b/sections/torrents/vote.php index 75c83332..065e7c31 100644 --- a/sections/torrents/vote.php +++ b/sections/torrents/vote.php @@ -10,11 +10,15 @@
Album votes
- This has out of total>, including your upvote>, including your downvote. + This has out of total.

- id="vote_message">Upvote - Downvote +
diff --git a/sections/userhistory/email_history2.php b/sections/userhistory/email_history2.php index 0dc18342..f8f1bac4 100644 --- a/sections/userhistory/email_history2.php +++ b/sections/userhistory/email_history2.php @@ -28,7 +28,7 @@ // Get current email (and matches) $DB->query(" - SELECT + SELECT m.Email, '".sqltime()."' AS Time, m.IP, @@ -49,8 +49,8 @@ // Get historic emails (and matches) $DB->query(" - SELECT - h2.Email, + SELECT + h2.Email, h2.Time, h2.IP, h3.UserID AS UserIDs, @@ -158,8 +158,8 @@

Email history for

-
- Old email history +
+ Old email history

@@ -187,7 +187,7 @@
@@ -198,8 +198,8 @@ () S WI
- - + () S WI
- - + () S WI
- - + 0) { - if (isset($Matches)) { + if (isset($Matches)) { echo $Matches; unset($Matches); unset($MatchCount); @@ -293,7 +293,7 @@ () S WI
- + +?>
upvotes out of total (Score: ). upvotes out of total (Score: ).
diff --git a/static/styles/dark_ambient/style.css b/static/styles/dark_ambient/style.css index 6930568e..1dc9861a 100644 --- a/static/styles/dark_ambient/style.css +++ b/static/styles/dark_ambient/style.css @@ -1978,6 +1978,9 @@ ul#userinfo_random li a:hover { tr.torrent .bookmark > a:before { content:""; } tr.torrent .bookmark > a:after { content:""; } -.linkbox .brackets:before, .linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #878787; } diff --git a/static/styles/kuro/style.css b/static/styles/kuro/style.css index 23fed112..e835f81d 100644 --- a/static/styles/kuro/style.css +++ b/static/styles/kuro/style.css @@ -262,7 +262,7 @@ ul.thin li { } #userinfo img { - + } #userinfo ul { @@ -878,7 +878,7 @@ form tr { text-align: center; } -.spellcheck { +.spellcheck { margin: 25px 0; font-size: 1.25em; font-weight: bold; @@ -887,10 +887,9 @@ form tr { tr.torrent .bookmark > a:before { color:#999; } tr.torrent .bookmark > a:after { color:#999; } -.linkbox .brackets:before { - color: #999; -} - -.linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #999; } diff --git a/static/styles/minimal/style.css b/static/styles/minimal/style.css index 24fb442e..4e06b730 100644 --- a/static/styles/minimal/style.css +++ b/static/styles/minimal/style.css @@ -543,6 +543,9 @@ tr.torrent .bookmark > a:after { content: ""; } margin-left: 20px; } -.linkbox .brackets:before, .linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #757575; } diff --git a/static/styles/minimal/style2.css b/static/styles/minimal/style2.css index 104aca26..3c15d3e5 100644 --- a/static/styles/minimal/style2.css +++ b/static/styles/minimal/style2.css @@ -466,6 +466,9 @@ h3{margin:10px 0} .cats_comedy{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/comedy.png) top left no-repeat} .cats_comics{width:30px; height:30px; background:url(https://what.cd/static/styles/minimal/images/icons/comics.png) top left no-repeat} -.linkbox .brackets:before, .linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #757575; } diff --git a/static/styles/minimal_mod_alt.css b/static/styles/minimal_mod_alt.css index 925efe2d..d14e0a88 100644 --- a/static/styles/minimal_mod_alt.css +++ b/static/styles/minimal_mod_alt.css @@ -35,7 +35,7 @@ input,select,textarea { font-family: Arial,sans-serif; font-size: 11px; padding: 3px; - + } input:focus,textarea:focus { @@ -978,7 +978,7 @@ forum_post box vertical_margin { } .torrent_table tr.group_torrent td span,#torrent_table tr.group_torrent td span { - + } .torrent_table tr.group_torrent a,#torrent_table tr.group_torrent a { @@ -1492,10 +1492,15 @@ ul.collage_images { .linkbox .brackets:before { content: "[ "; - color: #F1F1F1; } .linkbox .brackets:after { content: " ]"; +} + +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #F1F1F1; } diff --git a/static/styles/mono/style.css b/static/styles/mono/style.css index 37d66546..44b7b415 100644 --- a/static/styles/mono/style.css +++ b/static/styles/mono/style.css @@ -1090,7 +1090,7 @@ table.border[width="100%"] { ul.nobullet { list-style-type: none; - + } li.graph { @@ -1312,10 +1312,13 @@ form.manage_form[name=friends] .left input[type=submit] { margin-right: 10px; } -.linkbox .brackets:before, .linkbox .brackets:after { - color: #444; -} - #userinfo .brackets:before, #userinfo .brackets:after { content: ""; } + +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { + color: #444; +} diff --git a/static/styles/postmod/style.css b/static/styles/postmod/style.css index d132d3d0..d65e683e 100644 --- a/static/styles/postmod/style.css +++ b/static/styles/postmod/style.css @@ -181,7 +181,7 @@ ul.thin li { margin:0px 0px; padding:0px; } content: url('images/gazelle.png'); } -#disclaimer_container { +#disclaimer_container { font-size: 7pt; color: #CCC; } @@ -224,7 +224,7 @@ ul.thin li { margin:0px 0px; padding:0px; } #menu ul { margin: 0; padding: 0; - list-style: none; + list-style: none; } #menu ul li { float: left; @@ -244,15 +244,15 @@ ul.thin li { margin:0px 0px; padding:0px; } text-decoration: none; } -#menu ul li a:active, #menu ul li a:focus { +#menu ul li a:active, #menu ul li a:focus { border-bottom: 3px solid #EFA82C; } -#index #nav_index a, #torrents #nav_torrents a, #collage #nav_collages a, #requests #nav_requests a, #forums #nav_forums a, #chat #nav_irc a, #top10 #nav_top10 a, #rules #nav_rules a, #wiki #nav_wiki a, #staff #nav_staff a { +#index #nav_index a, #torrents #nav_torrents a, #collage #nav_collages a, #requests #nav_requests a, #forums #nav_forums a, #chat #nav_irc a, #top10 #nav_top10 a, #rules #nav_rules a, #wiki #nav_wiki a, #staff #nav_staff a { border-bottom: 4px solid #111; } -/* +/* #nav_index a { background-position: 0 0; width: 75px; } #nav_index a:hover { background-position: 0 -34px; } #index #nav_index a { background-position: 0 -69px; } @@ -362,7 +362,7 @@ ul.thin li { margin:0px 0px; padding:0px; } height: 22px; background: url('images/content_light.png') transparent; color: #FFF; - -moz-border-radius: 2px; + -moz-border-radius: 2px; -webkit-border-radius: 2px; -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); @@ -385,7 +385,7 @@ ul.thin li { margin:0px 0px; padding:0px; } padding: 0; list-style: none; display: block; - + } #searchbars ul li { @@ -552,7 +552,7 @@ p.min_padding { margin-bottom: 10px; } -.main_column .box .body { +.main_column .box .body { font-size: 8pt; } @@ -926,7 +926,7 @@ ul .invitetree { overflow: auto; } -.lightbox img { +.lightbox img { max-width: 100%; max-height: 100%; background-color: transparent; @@ -934,13 +934,13 @@ ul .invitetree { } input[type=button], input[type=submit] { - background: #111 url(images/alert-overlay.png) repeat-x; - display: inline-block; - padding: 3px 6px 4px; + background: #111 url(images/alert-overlay.png) repeat-x; + display: inline-block; + padding: 3px 6px 4px; margin: 3px; - color: #fff; + color: #fff; text-decoration: none; - -moz-border-radius: 2px; + -moz-border-radius: 2px; -webkit-border-radius: 2px; -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); @@ -956,12 +956,12 @@ input[type=button]:active , input[type=submit]:active { top: 1px; } input[type="button"]:active, input[type="button"]:focus, input[type="submit"]:active, input[type="submit"]:focus { /* background: #262626 url(images/load.gif) no-repeat center center; */ - display: inline-block; - padding: 3px 6px 4px; + display: inline-block; + padding: 3px 6px 4px; margin: 3px; - color: #fff; + color: #fff; text-decoration: none; - -moz-border-radius: 2px; + -moz-border-radius: 2px; -webkit-border-radius: 2px; -moz-box-shadow: 0 1px 3px rgba(0,0,0,0.5); -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.5); @@ -1018,7 +1018,7 @@ option, option:active, option:focus { border: 0; font-family: Helvetica, Arial, sans-serif; } - + select:hover, option:hover { background: #3F3F3F; } @@ -1027,7 +1027,7 @@ select:hover, option:hover { color: #444; } -.spellcheck { +.spellcheck { margin: 10px 0; font-size: 1.25em; font-weight: bold; @@ -1038,16 +1038,27 @@ ul, ol{ } tr.torrent .bookmark > a:before { - color:#646054; + color: #646054; } tr.torrent .bookmark > a:after { - color:#646054; + color: #646054; } #requests .forum_post textarea { /* overriding the inline 80-character monospace */ max-width: 409px; } -.linkbox .brackets:before, .linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #FCFCFC; } + +#userinfo_username .brackets:before { + content: "["; +} + +#userinfo_username .brackets:after { + content: "]"; +} diff --git a/static/styles/proton/style.css b/static/styles/proton/style.css index 23e24485..2a36494c 100644 --- a/static/styles/proton/style.css +++ b/static/styles/proton/style.css @@ -1738,6 +1738,9 @@ table.noavatar, table.noavatar tr, table.noavatar td.body, table.noavatar td.bod tr.torrent .bookmark > a:before { content:""; } tr.torrent .bookmark > a:after { content:""; } -.linkbox .brackets:before, .linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #575757; } diff --git a/static/styles/white.cd/style.css b/static/styles/white.cd/style.css index 32cadd85..fe9c05fa 100644 --- a/static/styles/white.cd/style.css +++ b/static/styles/white.cd/style.css @@ -759,10 +759,9 @@ tr.torrent .bookmark > a:after { content:""; } margin-left: 20px; } -.linkbox .brackets:before { - color: #666; -} - -.linkbox .brackets:after { +.linkbox .brackets:before, +.linkbox .brackets:after, +.top10_quantity_links .brackets:before, +.top10_quantity_links .brackets:after { color: #666; }