Added:
trunk/upload/forumdata/parasy_install.lock
trunk/upload/templates/babel/rate.htm
trunk/upload/templates/babel/rate_view.htm
Modified:
trunk/docs/How to Install.txt
trunk/upload/include/discuzcode.func.php
trunk/upload/installer.php
trunk/upload/memcp.php
trunk/upload/parasy/ParasyCore.php
trunk/upload/parasy_json_tab.php
trunk/upload/templates/babel/discuz.htm
trunk/upload/templates/babel/memcp_profile.htm
trunk/upload/templates/babel/post_newthread.htm
trunk/upload/templates/babel/viewpro_classic.htm
trunk/upload/templates/babel/viewthread.htm
trunk/upload/templates/css/css_extra.css
trunk/upload/viewpro.php
Log:
UI Update(bbcode,attachment display)
Setup Dir Fixed(navmenu)
and so on...
Modified: trunk/docs/How to Install.txt
==============================================================================
--- trunk/docs/How to Install.txt (original)
+++ trunk/docs/How to Install.txt Wed Feb 13 05:24:31 2008
@@ -1,28 +1,36 @@
══════════════════════════════════════
-■ 感谢您使用 Project Parasynthesis
+■ 感谢你使用 Project Parasynthesis
══════════════════════════════════════
制作: Sai
网站: http://saicn.com | http://n2design.cn
技术支持板块:http://saicn.com/bbs/go/Parasy
电子邮件: s...@live.com
══════════════════════════════════════
-■ 在您安装使用前请仔细阅读此说明
+■ 在你安装使用前请仔细阅读此说明
══════════════════════════════════════
-■此说明仅适用于第一版安装,SVN中最新版本的安装
需要有一定基础,请访问技术支持板块获取帮助
+■SVN 中仅有 Project Parasy 的最新源码,使用这个版本需
要你自行下载Discuz 5.5.0。
-请确认您的服务器支持.htaccess文件的使用,否则将将
无法使用本风格。
-同时我们建议您在测试环境下尝试安装,在熟悉安装
使用后再应用到运行中的论坛中。
+请确认你的服务器支持.htaccess文件的使用,否则将将
无法使用本风格。
+同时我们建议你在测试环境下尝试安装,在熟悉安装
使用后再应用到运行中的论坛中。
-现在,您只要运行 installer.php,按照提示安装,就可以
开始使用Project Parasy
+══════════════════════════════════════
+■ 以下说明适用于升级安装(未安装过Prject Parasy且已
有数据的论坛)
+══════════════════════════════════════
+
+1.修改 .htaccess 文件中的 RewriteBase 为论坛安装目录
+
+2.将压缩包中 upload 目录下全部文件和目录上传到服务器
+
+3.删除 forumdata/parasy_install.lock ,运行 installer.php
(!),进入Project Parasy的安装页面,按照提示进行安装后
就可以使用Parasy了
安装完成后的一些问题:
- ·在编辑子论坛的设置中,您需要为子论坛指定一
个"论坛代号(英文)",通过这个代号,您可以让会员
通过地址栏更加容易的使用 go/xxx 的形式访问板块
+ ·在编辑子论坛的设置中,你需要为子论坛指定一
个"论坛代号(英文)",通过这个代号,你可以让会员
通过地址栏更加容易的使用 go/xxx 的形式访问板块
- ·同样的,通过"推荐板块",您可以将需要突出的板块
在分类名旁重点显示,推荐板块同时会在顶部导航条上
显示
+ ·同样的,通过"推荐板块",你可以将需要突出的板块
在分类名旁重点显示,推荐板块同时会在顶部导航条上
显示
- ·如您所见,在控制面板里面已经看不到选择论坛自
带头像的地方了,您需要在用户组设置中为每个组的用
户开启上传自定义头像的权限,系统会自动为会员上传
的头像生成适合的三种大小的头像(以前上传的头像暂
时无法生成,请等待我们为您提供的头像转换程序)
+ ·如你所见,在控制面板里面已经看不到选择论坛自
带头像的地方了,你需要在用户组设置中为每个组的用
户开启上传自定义头像的权限,系统会自动为会员上传
的头像生成适合的三种大小的头像(以前上传的头像暂
时无法生成,请等待我们为你提供的头像转换程序)
·首页公告下的小字可以通过templates/babel/discuz.htm的相
应内容进行修改
Added: trunk/upload/forumdata/parasy_install.lock
==============================================================================
Modified: trunk/upload/include/discuzcode.func.php
==============================================================================
--- trunk/upload/include/discuzcode.func.php (original)
+++ trunk/upload/include/discuzcode.func.php Wed Feb 13 05:24:31 2008
@@ -118,7 +118,7 @@
global $discuzcodes;
$discuzcodes['pcodecount']++;
$code = htmlspecialchars(str_replace('\\"', '"',
preg_replace("/^[\n\r]*(.+?)[\n\r]*$/is", "\\1", $code)));
- $discuzcodes['codehtml'][$discuzcodes['pcodecount']] = "<br><br><div
class=\"msgbody\"><div class=\"msgheader\"><div class=\"right\"><a
href=\"###\" class=\"smalltxt\"
onclick=\"copycode($('code$discuzcodes[codecount]'));\">[Copy to
clipboard]</a> <a class=\"smalltxt\" href=\"###\"
onclick=\"toggle_collapse('code$discuzcodes[codecount]');\">[ <span
id=\"code$discuzcodes[codecount]_symbol\">-</span>
]</a></div>CODE:</div><div class=\"msgborder\" id=\"code$discuzcodes[codecount]\">$code</div></div><br>";
+ $discuzcodes['codehtml'][$discuzcodes['pcodecount']] = "<br /><div
class=\"msgbody\"><div class=\"msgborder\"
id=\"code$discuzcodes[codecount]\"><div class=\"msgheader\"><div
class=\"right\"><a href=\"###\" class=\"smalltxt\"
onclick=\"copycode($('code$discuzcodes[codecount]'));\">[Copy to
clipboard]</a></div>CODE:</div><div
class=\"msgmain\">$code</div></div></div><br />";
$discuzcodes['codecount']++;
return "[\tDISCUZ_CODE_$discuzcodes[pcodecount]\t]";
}
@@ -212,8 +212,8 @@
if($parsetype != 1) {
$discuzcodes['searcharray']['bbcode_regexp'][] = "/\s*\[quote\][\n\r]*(.+?)[\n\r]*\[\/quote\]\s*/is";
$discuzcodes['searcharray']['bbcode_regexp'][] = "/\s*\[free\][\n\r]*(.+?)[\n\r]*\[\/free\]\s*/is";
- $discuzcodes['replacearray']['bbcode_regexp'][] = "<br><br><div
class=\"msgbody\"><div class=\"msgheader\">QUOTE:</div><div class=\"msgborder\">\\1</div></div><br>";
- $discuzcodes['replacearray']['bbcode_regexp'][] = "<br><br><div
class=\"msgbody\"><div class=\"msgheader\">FREE:</div><div class=\"msgborder\">\\1</div></div><br>";
+ $discuzcodes['replacearray']['bbcode_regexp'][] = "<br /><div
class=\"msgbody\"><div class=\"msgborder\"><div
class=\"msgheader\">QUOTE:</div><div
class=\"msgmain\">\\1</div></div></div><br />";
+ $discuzcodes['replacearray']['bbcode_regexp'][] = "<br /><div
class=\"msgbody\"><div class=\"msgborder\"><div
class=\"msgheader\">FREE:</div><div
class=\"msgmain\">\\1</div></div></div><br />";
}
$discuzcodes['searcharray']['bbcode_regexp'] =
array_merge($discuzcodes['searcharray']['bbcode_regexp'], $discuzcodes['searcharray']['bbcode_regexp']);
Modified: trunk/upload/installer.php
==============================================================================
--- trunk/upload/installer.php (original)
+++ trunk/upload/installer.php Wed Feb 13 05:24:31 2008
@@ -36,8 +36,7 @@
$inslang = defined('INSTALL_LANG') ? INSTALL_LANG : '';
$version = '5.5.0 '.$lang[$inslang];
if(!defined('INSTALL_LANG') || !function_exists('instmsg') ||
!is_readable($sqlfile)) {
-//if(!defined('INSTALL_LANG') || !function_exists('instmsg')) {
- exit("Please upload all files to install Discuz!
Board<br>安装 Discuz! 论坛您必须上传所有文件,否则无法继续");
+ exit("Please upload all files to install Project
Parasy<br>安装 Discuz! 论坛您必须上传所有文件,否则无法继续");
} elseif(!isset($dbhost) || !isset($cookiepre)) {
instmsg('config_nonexistence');
} elseif(!ini_get('short_open_tag')) {
@@ -334,7 +333,7 @@
<td class="altbg2"><input type="text" name="bbsdir"
value="<?=$bbsdir?>" <?=$inputreadonly?> size="30"></td>
<td class="altbg1"> ʹ�� /bbs ��ʽ��·�������װ�ڸ�Ŀ¼�����</td>
</tr><tr>
-<td class="altbg1"> <?=$lang['dbuser']?></td>
+<td class="altbg1"> JavaScript ·��</td>
<td class="altbg2"><input type="text" name="jsdir" value="<?=$jsdir?>"
<?=$inputreadonly?> size="30"></td>
<td class="altbg1"> �뱣���밲װĿ¼��·��һ��</td>
</tr>
Modified: trunk/upload/memcp.php
==============================================================================
--- trunk/upload/memcp.php (original)
+++ trunk/upload/memcp.php Wed Feb 13 05:24:31 2008
@@ -154,6 +154,14 @@
$member['bio'] = html2bbcode($member['bio']);
$member['signature'] = html2bbcode($member['sightml']);
+ $Geo = new Geo($geo_user, $Geo->map);
+ $geos_all_children = $Geo->nmGetRecursiveChildrenArray('', true);
+ $geos_all_children_sql = implode(',', $geos_all_children);
+ $sql = "SELECT COUNT(*) FROM cdb_members WHERE usr_geo IN ({$geos_all_children_sql})";
+ $rs = mysql_query($sql);
+ $geo_count = intval(mysql_result($rs, 0, 0));
+ mysql_free_result($rs);
+
include template('memcp_profile');
} else {
Modified: trunk/upload/parasy/ParasyCore.php
==============================================================================
--- trunk/upload/parasy/ParasyCore.php (original)
+++ trunk/upload/parasy/ParasyCore.php Wed Feb 13 05:24:31 2008
@@ -331,8 +331,9 @@
}
function nwICONS($source = 0){
+ global $bbsdir;
$icons = array(0 => '', 1 => 'straitjacket', 2 => 'book', 3
=> 'song', 4 => 'tv', 5 => 'computing', 6 => 'eat', 7 => 'home', 8
=> 'hurry', 9 => 'morning', 10 => 'sleep', 11 => 'football', 12
=> 'happy', 13 => 'love', 14 => 'pils', 15 => 'shop', 16 => 'game', 17
=> 'makeup', 18 => 'icecream',19 => 'coffee',20 => 'beer',21
=> 'toiletpaper',22 => 'bus',23 => 'car',24 => 'bomb',25 => 'taxi',26
=> 'train',27 => 'strom',28 => 'toilet', 29 => 'ballon', 30 => 'bike',
31 => 'wallclock',99 => 'computing');
- return '/bbs/images/now/icons/web-'.$icons[$source].'.gif';
+ return $bbsdir.'/images/now/icons/web-'.$icons[$source].'.gif';
}
function nwtextICONS($source = 0){
@@ -347,7 +348,7 @@
function navforum($groupselectable = FALSE, $tableformat = 0) {
- global $_DCACHE, $discuz_uid, $groupid, $fid, $gid, $indexname;
+ global $_DCACHE, $discuz_uid, $groupid, $fid, $gid, $indexname,$bbsdir;
if(!isset($_DCACHE['forums'])) {
require_once DISCUZ_ROOT.'./forumdata/cache/cache_forums.php';
@@ -356,11 +357,11 @@
$forumlist = $tableformat ? '' : '<li class="top"><ul>';
foreach($_DCACHE['forums'] as $forum) {
if($forum['type'] == 'group' && $forum['fid']!=30 &&
$forum['fid']!=75) {
- $forumlist .= '</ul></li><li class="top"><a
href="/bbs/cat-'.$forum['fid'].'.html" class="top">��'.$forum['name'].' </a><ul>';
+ $forumlist .= '</ul></li><li class="top"><a
href="'.$bbsdir.'/cat-'.$forum['fid'].'.html" class="top">��'.$forum['name'].' </a><ul>';
$visible[$forum['fid']] = true;
} elseif($forum['type'] == 'forum' && $forum['idx_push']==1 &&
isset($visible[$forum['fup']]) && (!$forum['viewperm'] ||
($forum['viewperm'] && forumperm($forum['viewperm'])) ||
strstr($forum['users'], "\t$discuz_uid\t"))) {
- $forumlist .= '<li><a href="/bbs/go/'.$forum['board_name'].'" class="nav">����'.$forum['name'].'</a></li>';
+ $forumlist .= '<li><a
href="'.$bbsdir.'/go/'.$forum['board_name'].'" class="nav">����'.$forum['name'].'</a></li>';
$visible[$forum['fid']] = true;
}
Modified: trunk/upload/parasy_json_tab.php
==============================================================================
--- trunk/upload/parasy_json_tab.php (original)
+++ trunk/upload/parasy_json_tab.php Wed Feb 13 05:24:31 2008
@@ -29,19 +29,20 @@
$top = array();
$i = 0;
foreach($_DCACHE['newthread'] as $topic) {
- $i++;
- $top[$i]['tid'] = $topic['tid'];
- $top[$i]['uid'] = $topic['uid'];
- $top[$i]['subject'] = iconv('gbk', 'utf-8', $topic['subject']);
- $top[$i]['author'] = iconv('gbk', 'utf-8', $topic['author']);
- $top[$i]['author_en'] = rawurlencode($topic['author']);
- $top[$i]['avatar'] = avRESIZE($topic['avatar'],'s');
- $top[$i]['name'] = iconv('gbk', 'utf-8', $topic['name']);
- $top[$i]['board_name'] = $topic['board_name'];
- $top[$i]['lastpost'] = iconv('gbk', 'utf-8', make_descriptive_time($topic['lastpost']));
- $top[$i]['replies'] = $topic['replies'];
- $top[$i]['color'] = rand_color();
-
+ if ((!in_array($topic['fid'], $disabled_forums))) {
+ $i++;
+ $top[$i]['tid'] = $topic['tid'];
+ $top[$i]['uid'] = $topic['uid'];
+ $top[$i]['subject'] = iconv('gbk', 'utf-8', $topic['subject']);
+ $top[$i]['author'] = iconv('gbk', 'utf-8', $topic['author']);
+ $top[$i]['author_en'] = rawurlencode($topic['author']);
+ $top[$i]['avatar'] = avRESIZE($topic['avatar'],'s');
+ $top[$i]['name'] = iconv('gbk', 'utf-8', $topic['name']);
+ $top[$i]['board_name'] = $topic['board_name'];
+ $top[$i]['lastpost'] = iconv('gbk', 'utf-8', make_descriptive_time($topic['lastpost']));
+ $top[$i]['replies'] = $topic['replies'];
+ $top[$i]['color'] = rand_color();
+ }
}
session_start();
$_SESSION['home_tab'] = 'latest';
Modified: trunk/upload/templates/babel/discuz.htm
==============================================================================
--- trunk/upload/templates/babel/discuz.htm (original)
+++ trunk/upload/templates/babel/discuz.htm Wed Feb 13 05:24:31 2008
@@ -21,6 +21,7 @@
<!--{/loop}-->
</div>
<!--{/if}-->
+
<!--{if empty($gid)}-->
<!--{if !empty($newpmexists) || $announcepm}-->
<div class="maintable" align="left">
Modified: trunk/upload/templates/babel/memcp_profile.htm
==============================================================================
--- trunk/upload/templates/babel/memcp_profile.htm (original)
+++ trunk/upload/templates/babel/memcp_profile.htm Wed Feb 13 05:24:31 2008
@@ -30,6 +30,10 @@
}
return true;
}
+var moveGeo = function () {
+ location.href = '$bbsdir/user/move.nnm' ;
+ return true;
+}
</script>
<form name="reg" method="post" action="$bbsdir/modify.nnm" $enctype
onSubmit="return validate(this)">
<input type="hidden" name="formhash" value="{FORMHASH}">
@@ -48,9 +52,29 @@
<input type="hidden" name="avatarheightnew" size="1" value="*">
</tr>
</table>
-<hr size="1" color="#DDD" style="color: #DDD; background-color: #DDD;
height: 1px; border: 0;" />
+<hr size="1" class="board" />
<img src="{IMGDIR}/information.gif" align="absmiddle"
/> �Ƽ���ѡ��һ�ųߴ���� 100 x 100 ���ص�ͼƬ��ϵͳ���Զ���ȡ�м�IJ��ֲ������С</div>
-
+<div class="maintable" align="left">
+<span class="text_large"><img src="{IMGDIR}/applications-internet.png"
class="home" align="absmiddle" border="0">���ڵ�</span>
+<hr size="1" class="board" />
+<table class="form" border="0" cellpadding="5" cellspacing="0">
+<tbody>
+<tr>
+<td align="right" width="200">��ǰ���ڵ�</td>
+<td align="left" width="200"><a href="$bbsdir/geo/$geo_user" class="o">$portal</a></td>
+<td rowspan="2" align="right" valign="middle" width="150">
+<input value="�����ҵ����ڵ�" tabindex="7" title="�����ҵ����ڵ�"
class="button" onclick="moveGeo();" type="button">
+<div class="btn_2_o" align="left"><div class="btn_2_i"
align="center"><a href="$bbsdir/user/move.nnm"></a></div></div>
+</td>
+</tr>
+<tr>
+<td align="right" width="200"><small>��ͬһ���������</small></td><td
align="left" width="200"><a href="#/who/settle/earth"
class="t">$geo_count</a></td></tr><tr><td colspan="2" height="10"></td>
+</tr>
+</tbody>
+</table>
+<hr size="1" class="board" />
+<img src="{IMGDIR}/information.png" align="absmiddle"> �����֮ǰû�н��й��κ����ã���ôĬ�����ڵؾ��ǵ���
+</div>
<div class="maintable" align="left">
<span class="text_large"><a name="settings">
<img src="{IMGDIR}/ico_conf.gif" align="absmiddle" class="home"
border="0" /></a>��¼��Ϣ��</span>
@@ -96,7 +120,7 @@
</tr>
<tr><td height="10" colspan="2"></td></tr>
</table>
-<hr size="1" color="#DDD" style="color: #DDD; background-color: #DDD;
height: 1px; border: 0;" /><img src="{IMGDIR}/information.png"
align="absmiddle" /> ����㲻����������� Email ��ȫ���ʵĻ����Ͳ�Ҫ������������κ���Ϣ</div>
+<hr size="1" class="board" /><img src="{IMGDIR}/information.png"
align="absmiddle" /> ����㲻����������� Email ��ȫ���ʵĻ����Ͳ�Ҫ������������κ���Ϣ</div>
<div class="maintable" align="left">
<span class="text_large"><a name="settings">
@@ -236,7 +260,7 @@
</tr>
<tr><td height="10" colspan="2"></td></tr>
</table>
-<hr size="1" color="#DDD" style="color: #DDD; background-color: #DDD;
height: 1px; border: 0;" /><img src="{IMGDIR}/information.png"
align="absmiddle" /> {lang memcp_profile_security_comment}</div>
+<hr size="1" class="board" /><img src="{IMGDIR}/information.png"
align="absmiddle" /> {lang memcp_profile_security_comment}</div>
<div class="maintable" align="left">
<span class="text_large"><a name="settings">
Modified: trunk/upload/templates/babel/post_newthread.htm
==============================================================================
--- trunk/upload/templates/babel/post_newthread.htm (original)
+++ trunk/upload/templates/babel/post_newthread.htm Wed Feb 13 05:24:31 2008
@@ -1,5 +1,4 @@
{template header}
-
<div class="subtable nav" style="width: {TABLEWIDTH}">
<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" /><a href="$bbsdir/$indexname">$bbname</a> $navigation
» {lang post_newthread}
</div>
Added: trunk/upload/templates/babel/rate.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/rate.htm Wed Feb 13 05:24:31 2008
@@ -0,0 +1,104 @@
+{template header}
+<div class="subtable nav" style="width: {TABLEWIDTH}">
+<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" />
+<!--{if $action == 'rate'}-->
+ <a href="$indexname">$bbname</a> $navigation » {lang rate}
+ </div></div>
+<div class="maintable">
+ <form method="post" action="misc.php?action=rate" id="postform">
+ <input type="hidden" name="formhash" value="{FORMHASH}">
+ <input type="hidden" name="referer" value="$referer">
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}"
width="100%" align="center">
+
+ <tr class="header">
+ <td colspan="2">{lang thread_rate}</td>
+ </tr>
+
+ <tr>
+ <td class="altbg1" width="21%"><span class="bold">{lang username}</span></td>
+ <td class="altbg2">$discuz_userss <span class="smalltxt">[<a
href="$link_logout">{lang member_logout}</a>]</span></td>
+ </tr>
+ <tr>
+ <td class="altbg1" width="21%"><span class="bold">{lang author}</span></td>
+ <td class="altbg2"><!--{if $post['author']
&& !$post['anonymous']}--><a
href="space.php?uid=$post[authorid]">$post[author]</a><!--{else}-->{lang anonymous}<!--{/if}--></td>
+ </tr>
+
+ <tr>
+ <td class="altbg1" width="21%"><span class="bold">{lang subject}</span></td>
+ <td class="altbg2 subject"><a href="viewthread.php?tid=$tid">$thread[subject]</a></td>
+ </tr>
+
+ <tr>
+ <td class="altbg1" valign="top" width="21%"><span class="bold">{lang rate}</span></td>
+ <td class="altbg2">
+ <!--{loop $ratelist $id $options}-->
+ <select onchange="this.form.score$id.value=this.value" style="width: 8em">
+ <option value="0">{$extcredits[$id][title]}</option>
+ <option value="0">----</option>
+ $options
+ </select> <input type="text" name="score$id" value="0" size="3">
{$extcredits[$id][unit]} ({lang rate_quota_today})<br>
+ <!--{/loop}-->
+ </td></tr>
+
+ {template topicadmin_reason}
+
+ </table>
+
+ <input type="hidden" name="tid" value="$tid">
+ <input type="hidden" name="pid" value="$pid">
+ <input type="hidden" name="page" value="$page">
+ <center><input class="button" type="submit" name="ratesubmit"
value="{lang submit}" id="postsubmit"> {lang post_submit_hotkey}</center>
+ </form><br>
+<!--{elseif $action == 'removerate'}-->
+ <a href="$indexname">$bbname</a> $navigation » {lang thread_removerate}
+ </div></div>
+<div class="maintable">
+ <form method="post" action="misc.php?action=removerate" id="postform">
+ <input type="hidden" name="formhash" value="{FORMHASH}">
+ <input type="hidden" name="referer" value="$referer">
+
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}"
width="100%" align="center">
+ <tr class="header">
+ <td colspan="2">{lang thread_removerate}</td>
+
+ <tr>
+ <td class="altbg1" width="21%"><span class="bold">{lang username}</span></td>
+ <td class="altbg2">$discuz_userss <span class="smalltxt">[<a
href="$link_logout">{lang member_logout}</a>]</span></td>
+ </tr>
+ <tr>
+ <td class="altbg1" width="21%"><span class="bold">{lang author}</span></td>
+ <td class="altbg2"><!--{if $post['author']
&& !$post['anonymous']}--><a
href="space.php?uid=$post[authorid]">$post[author]</a><!--{else}-->{lang anonymous}<!--{/if}--></td>
+ </tr>
+
+ <tr>
+ <td class="altbg1" width="21%"><span class="bold">{lang subject}</span></td>
+ <td class="altbg2 subject"><a href="viewthread.php?tid=$tid">$thread[subject]</a></td>
+ </tr>
+
+ </tr>
+ {template topicadmin_reason}
+ </table>
+<hr class="board">
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}"
width="100%" align="center">
+ <tr align="center" class="header">
+ <td class="header" valign="top" align="center"><input
class="checkbox" type="checkbox" name="chkall" class="header"
onclick="checkall(this.form, 'logid')">{lang delete_check}</td>
+ <td width="15%">{lang username}</td><td width="30%">{lang
time}</td><td width="15%">{lang credits}</td><td width="35%">{lang reason}</td></tr>
+ </tr>
+ <!--{loop $ratelogs $ratelog}-->
+ <tr align="center" class="row"
onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td align="center"><input class="checkbox" type="checkbox"
name="logidarray[]" value="$ratelog[uid] $ratelog[extcredits] $ratelog[dbdateline]"></td>
+ <td><a href="space.php?uid=$ratelog[uid]">$ratelog[username]</a></td>
+ <td>$ratelog[dateline]</td>
+ <td>{$extcredits[$ratelog[extcredits]][title]} <span
class="bold">$ratelog[scoreview]</span> {$extcredits[$ratelog[extcredits]][unit]}</td>
+ <td>$ratelog[reason]</td>
+ </tr>
+ <!--{/loop}-->
+ </table>
+ <hr class="board">
+ <input type="hidden" name="tid" value="$tid">
+ <input type="hidden" name="pid" value="$pid">
+ <input type="hidden" name="page" value="$page">
+ <center><input class="button" type="submit" name="ratesubmit"
value="{lang submit}" id="postsubmit"> {lang post_submit_hotkey}</center>
+<!--{/if}-->
+
+{template footer}
\ No newline at end of file
Added: trunk/upload/templates/babel/rate_view.htm
==============================================================================
--- (empty file)
+++ trunk/upload/templates/babel/rate_view.htm Wed Feb 13 05:24:31 2008
@@ -0,0 +1,33 @@
+{template header}
+<div class="subtable nav" style="width: {TABLEWIDTH}">
+<img src="{IMGDIR}/map.png" align="absmiddle" alt="You are here"
class="map" /><a href="$indexname">$bbname</a> $navigation »
{lang rate_view}
+</div></div>
+
+<div class="maintable">
+<!--{if $thread['price'] <= 0 && $post['message'] != ''}-->
+ <table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}"
width="100%" align="center">
+ <tr class="header"><td colspan="2">{lang rate_view_post}</td></tr>
+ <tr class="altbg1">
+ <td rowspan="2" valign="top" width="20%"><span class="bold">
+ <!--{if $post['author'] && !$post['anonymous']}--><a
href="space.php?uid=$post[authorid]">$post[author]</a><!--{else}-->{lang anonymous}<!--{/if}-->
+ </span><br><br></td>
+ <td class="smalltxt">$post[dateline]</td></tr>
+ <tr class="altbg1"><td>
+ <table height="100%" width="100%" border="0" cellspacing="0"
cellpadding="0" style="table-layout: fixed; word-wrap: break-word">
+ <tr><td><span class="bold"><span class="smalltxt">$post[subject]</span></span><br><br>$post[message]</td></tr></table></td></tr>
+ </table><!--{/if}-->
+
+<table cellspacing="{INNERBORDERWIDTH}" cellpadding="{TABLESPACE}"
width="100%" align="center">
+<tr align="center" class="header">
+<td width="15%">{lang username}</td><td width="30%">{lang
time}</td><td width="15%">{lang credits}</td><td width="40%">{lang reason}</td></tr>
+</tr>
+<!--{loop $loglist $log}-->
+ <tr align="center" class="row"
onMouseOver="this.style.backgroundColor='{ALTBG1}'" onMouseOut="this.style.backgroundColor='{ALTBG2}'">
+ <td><a href="space.php?uid=$log[uid]">$log[username]</a></td>
+ <td>$log[dateline]</td>
+ <td>{$extcredits[$log[extcredits]][title]} <span
class="bold">$log[score]</span> {$extcredits[$log[extcredits]][unit]}</td>
+ <td>$log[reason]</td>
+ </tr>
+<!--{/loop}-->
+</table>
+{template footer}
\ No newline at end of file
Modified: trunk/upload/templates/babel/viewpro_classic.htm
==============================================================================
--- trunk/upload/templates/babel/viewpro_classic.htm (original)
+++ trunk/upload/templates/babel/viewpro_classic.htm Wed Feb 13
05:24:31 2008
@@ -13,7 +13,7 @@
<!--{/if}-->
</td>
<td align="left" valign="top" class="section_even">
- <span class="text_large">$member[username]</span><span
class="excerpt"><br /><br />
+ <span class="text_large">$member[username]</span> -
$member['rp']<span class="excerpt"><br /><br />
<!--{if $member['gender'] == 1}-->{lang male}<!--{elseif
$member['gender'] == 2}-->{lang
female}<!--{else}-->�Ա�δ֪<!--{/if}-->��$member[regdate]���������־��������
$member[posts] ƪ���ӣ�$member[digestposts]
ƪ�����������$member[pageviews]ҳ��־<br /><!--{if
$member['username']==$discuz_user}--><span class="tip_i">�����ڲ쿴�����Լ���ҳ�棬�������ĵ�ַ����������ѣ������ǹ�������������־��õĿ��֣�</span><!--{/if}--></span>
</td>
</tr>
Modified: trunk/upload/templates/babel/viewthread.htm
==============================================================================
--- trunk/upload/templates/babel/viewthread.htm (original)
+++ trunk/upload/templates/babel/viewthread.htm Wed Feb 13 05:24:31 2008
@@ -135,12 +135,28 @@
<br><br><img src="images/attachicons/common.gif" alt=""
/> {lang attachment}: <i>{lang attachment_reply_show}</i>
<!--{elseif $post['attachlist']}-->
<br><br>
- <div class="msgbody"><div class="msgheader">
+ <div class="msgbody">
+ <div class="msgborder" style="padding: 2px;background-color:
#FCFCFC;border: 1px solid #EEE;margin: 10px 0px 10px
0px;-moz-border-radius: 5px;-webkit-border-radius: 5px;">
+ <div class="msgheader" style="background-color: #eee;">
<!--{if CURSCRIPT != 'blog'}--><div class="right"><a
href="$bbsdir/member.php?action=credits&view=getattach"
target="_blank"><img src="{IMGDIR}/credits_attachlist.gif" border="0"
alt="{lang credits_policy_view}" /></a></div><!--{/if}-->
- {lang attachment}</div><div class="msgborder" style="padding: 0px;
border-bottom: 0px;">
+ {lang attachment}</div>
$post[attachlist]
</div></div>
- <!--{/if}--><!--{/if}--><!--{/if}--></span></td>
+ <!--{/if}-->
+ <!--{/if}-->
+ <!--{if !empty($post['ratelog'])}-->
+ <div class="rate">
+ <fieldset>
+ <legend><a
href="misc.php?action=viewratings&tid=$tid&pid=$post[pid]"
title="{lang rate_view}">{lang thread_rate_log_lately}</a></legend>
+ <ul>
+ <!--{loop $post['ratelog'] $ratelog}--><li><cite><a
href="$bbsdir/space.php?uid=$ratelog[uid]" target="_blank">$ratelog[username]</a></cite>{$extcredits[$ratelog[extcredits]][title]}<strong>$ratelog[score]</strong>
+ <em>$ratelog[reason]</em>$ratelog[dateline]</li><!--{/loop}-->
+ </ul>
+ </fieldset>
+ </div>
+ <!--{/if}-->
+
+ <!--{/if}--></span></td>
<td width="40" class="rm"></td>
</tr>
<tr>
@@ -182,7 +198,38 @@
<!--{if $post['subject']}--> ˵��$post[subject]<!--{/if}-->
$post[newpostanchor] $post[lastpostanchor]
<a name="pid$post[pid]"
href="misc.php?action=viewratings&tid=$tid&pid=$post[pid]" alt="{lang rate_view}">$post[ratings]</a>
-<div style="padding-left: 50px;padding-top: 8px;"><span
style="font-size: {MSGFONTSIZE};" id="pid_$post['pid']">$post[message]</span></div></div>
+<div style="padding-left: 50px;padding-top: 8px;">
+ <!--{if $adminid !=1 && $bannedmessages && (($post['authorid']
&& !$post['username']) || ($post['groupid'] == 4 || $post['groupid'] == 5))}-->
+ {lang message_banned}
+ <!--{else}-->
+ <span style="font-size: {MSGFONTSIZE};" id="pid_$post['pid']">$post[message]</span>
+ <!--{if $post['attachment']}-->
+ <br><br><img src="images/attachicons/common.gif" alt=""
/> {lang attachment}: <i>{lang attach_nopermission}</i>
+ <!--{elseif $hideattach && $post['attachments']}-->
+ <br><br><img src="images/attachicons/common.gif" alt=""
/> {lang attachment}: <i>{lang attachment_reply_show}</i>
+ <!--{elseif $post['attachlist']}-->
+ <br><br>
+ <div class="msgbody">
+ <div class="msgborder">
+ <div class="msgheader" style="background-color: #eee;">
+ <!--{if CURSCRIPT != 'blog'}--><div class="right"><a
href="$bbsdir/member.php?action=credits&view=getattach"
target="_blank"><img src="{IMGDIR}/credits_attachlist.gif" border="0"
alt="{lang credits_policy_view}" /></a></div><!--{/if}-->
+ {lang attachment}</div>
+ $post[attachlist]
+ </div></div>
+ <!--{/if}-->
+ <!--{/if}-->
+ <!--{if !empty($post['ratelog'])}-->
+ <div class="rate">
+ <fieldset>
+ <legend><a
href="misc.php?action=viewratings&tid=$tid&pid=$post[pid]"
title="{lang rate_view}">{lang thread_rate_log_lately}</a></legend>
+ <ul>
+ <!--{loop $post['ratelog'] $ratelog}--><li><cite><a
href="$bbsdir/space.php?uid=$ratelog[uid]" target="_blank">$ratelog[username]</a></cite>{$extcredits[$ratelog[extcredits]][title]}<strong>$ratelog[score]</strong>
+ <em>$ratelog[reason]</em>$ratelog[dateline]</li><!--{/loop}-->
+ </ul>
+ </fieldset>
+ </div>
+ <!--{/if}-->
+</div></div>
<!--{/if}-->
<!--{/loop}-->
$multipage<br />
Modified: trunk/upload/templates/css/css_extra.css
==============================================================================
--- trunk/upload/templates/css/css_extra.css (original)
+++ trunk/upload/templates/css/css_extra.css Wed Feb 13 05:24:31 2008
@@ -1,6 +1,6 @@
/* Global */
table, input, select, textarea, .maintable, .button, .altbg1, .altbg2 {
-font: 12px Verdana, "Lucida Grande", "Lucida
Sans", sans, Hei;
+font: 12px Verdana, "Lucida Grande", "Lucida Sans", sans, Hei;
}
.smalltxt, .category, .percenttxt {
font: 12px ���ź� !important;
@@ -69,24 +69,33 @@
width: 100%;
}
.msgheader {
-margin: 0 1em;
+margin: 0;
border: 1px solid #FFFFFF;
font-weight: bold;
-background: #F3F8D7;
+background-color: #eee;
padding: 5px;
color: #000000;
+width: auto !important;
+width: 100%;
}
+
.msgborder {
-margin: 0 auto 0 auto;
-padding: 10px;
-border: 1px solid #FFFFFF;
-border-top: 0px;
+padding: 2px;
+background-color: #FCFCFC;
+border: 1px solid #EEE;
+margin: 5px 0 10px 0;
+-moz-border-radius: 5px;
+-webkit-border-radius: 5px;
word-wrap: break-word;
-background: #FDFFF2;
+background: #FCFCFC;
overflow: hidden;
width: auto !important;
}
+.msgmain {
+margin: 5px;
+}
+
.tableborder {
background: white;
outline: 1px solid #E0E0E0;
@@ -938,9 +947,35 @@
a.msg_link:hover {
text-decoration: none;
color: #577DE7;
-border-bottom: 1px solid #577DE7;
}
div.bottomHigher {
padding-bottom: 15px;
+}
+
+.rate fieldset {
+margin: 0;
+padding: 0;
+border: none;
+font-size: 12px;
+width: 450px;
+padding: 5px 10px 5px 10px;
+border: 1px solid #CAD9EA;
+margin-top: 2em;
+}
+.rate fieldset ul {
+margin: 0;
+padding: 0;
+}
+.rate fieldset li {
+color: #999;
+line-height: 1.6em;
+list-style: none;
+}
+.rate fieldset li cite, .rate fieldset li em {
+margin: auto 10px;
+}
+em, cite {
+font-style: normal;
+font-weight: normal;
}
Modified: trunk/upload/viewpro.php
==============================================================================
--- trunk/upload/viewpro.php (original)
+++ trunk/upload/viewpro.php Wed Feb 13 05:24:31 2008
@@ -120,6 +120,8 @@
$member['lastvisit'] = gmdate("$dateformat $timeformat",
$member['lastvisit'] + ($timeoffset * 3600));
$member['lastpost'] = $member['lastpost'] ? gmdate("$dateformat
$timeformat", $member['lastpost'] + ($timeoffset * 3600)) : 'x';
+
+
$member['taobaoas'] = addslashes($member['taobao']);
$member['olupgrade'] = $member['totalol'] ? 20 - $member['totalol'] %
20 : 20;
@@ -134,12 +136,14 @@
$query = $db->query("SELECT m.*, t.subject, t.fid, t.displayorder,
t.closed, t.lastposter, t.lastpost FROM {$tablepre}mythreads m,
{$tablepre}threads t
WHERE m.uid = '{$member[uid]}' $threadadd AND m.tid=t.tid ORDER BY
m.dateline DESC LIMIT 10");
while($thread = $db->fetch_array($query)) {
- $thread['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';
- require_once DISCUZ_ROOT.'./forumdata/cache/cache_forums.php';
- $thread['lastpost'] = make_descriptive_time($thread['lastpost']);
- $thread['forumname'] = $_DCACHE['forums'][$thread['fid']]['name'];
- $thread['lastposterenc'] = rawurlencode($thread['lastposter']);
- $threadlist[] = $thread;
+ if ((!in_array($topic['fid'], $disabled_forums))) {
+ $thread['bg'] = $v2bg = isset($v2bg) && $v2bg == 'even' ? 'odd' : 'even';
+ require_once DISCUZ_ROOT.'./forumdata/cache/cache_forums.php';
+ $thread['lastpost'] = make_descriptive_time($thread['lastpost']);
+ $thread['forumname'] = $_DCACHE['forums'][$thread['fid']]['name'];
+ $thread['lastposterenc'] = rawurlencode($thread['lastposter']);
+ $threadlist[] = $thread;
+ }
}
//E:new thread
//S:Nowhere