archive-gh-me/nodeclub
1
0
Fork 0
mirror of https://github.com/cnodejs/nodeclub.git synced 2025-12-08 19:55:55 +00:00
Code Issues Projects Releases Wiki Activity

去除用标签来制造空格的行为

Browse Source
This commit is contained in:
Jackson Tian 2013-06-17 18:39:52 +08:00
parent c49c42804a
commit 25bd3d2cfa
24 changed files with 103 additions and 235 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.jshintrc
View File

@ -39,5 +39,5 @@
"expr": true,
"multistr": true,
"onevar": false,
"unused": true
"unused": "vars"
}

3
app.js
View File

@ -6,11 +6,10 @@
* Module dependencies.
*/
var fs = require('fs');
var path = require('path');
var express = require('express');
var ndir = require('ndir');
var pkg = JSON.parse(fs.readFileSync(path.join(__dirname, 'package.json')));
var pkg = require('./package.json');
var config = require('./config').config;
config.version = pkg.version;

32
public/stylesheets/common.css
View File

@ -1,18 +1,24 @@
div, textarea {
box-sizing: border-box;
-mox-box-sizing: border-box;
}
body, p {
font-size: 14px;
font-family: "Helvetica Neue", Helvetica, "Microsoft Yahei", "Wenquanyi Micro Hei", Arial, sans-serif;
word-break: break-all;
-webkit-font-smoothing: antialiased;
}
textarea, input[type="text"], input[type="password"], input[type="datetime"],
input[type="datetime-local"], input[type="date"], input[type="month"],
input[type="time"], input[type="week"], input[type="number"],
input[type="email"], input[type="url"], input[type="search"],
input[type="tel"], input[type="color"], .uneditable-input {
textarea, input[type="text"],
input[type="password"],
input[type="datetime"],
input[type="datetime-local"],
input[type="date"],
input[type="month"],
input[type="time"],
input[type="week"],
input[type="number"],
input[type="email"],
input[type="url"],
input[type="search"],
input[type="tel"],
input[type="color"],
.uneditable-input {
background: hsla(0,0%,0%,0)
}
@ -22,14 +28,14 @@ pre {
line-height: 22px;
}
code {
padding: 0px;
padding: 0;
border: none;
line-height: 16px;
}
p code {
background: none;
color: hsl(0,0%,50%);
margin: 0px 1px;
margin: 0 1px;
padding: 1px 4px;
}
div pre.prettyprint {
@ -40,10 +46,10 @@ div pre.prettyprint {
padding: 15px;
}
form {
margin-bottom: 0px;
margin-bottom: 0;
}
textarea {
margin-bottom: 0px;
margin-bottom: 0;
}
input, textarea {
background: hsla(0,0%,0%,0);

73
public/stylesheets/style.css
View File

@ -19,12 +19,12 @@
position: relative;
}
#topic_list {
margin: 0px;
margin: 0;
}
#content {
margin: 0px 290px 0px 0px;
padding: 0px;
padding: 0;
width: 758px;
float: left;
}
#sidebar {
width: 290px;
@ -62,39 +62,6 @@
}
/* common */
.fl {
float: left;
}
.fr {
float: right;
}
.cl {
clear: left;
}
.cr {
clear: right;
}
.cen {
text-align: center;
}
.sep5{
height: 5px;
}
.sep10 {
height: 5px;
}
.space {
display: inline-block;
margin: 0px 4px;
}
.sp5 {
width: 5px;
display: inline-block;
}
.sp10 {
width: 10px;
display: inline-block;
}
.col_fade {
color: hsl(0,0%,67%);
}
@ -133,11 +100,11 @@ a.light:hover {
.panel {
margin-bottom: 8px;
box-shadow: 0px 0px 1px hsl(0, 0%, 40%);
box-shadow: 0 0 1px hsl(0, 0%, 40%);
}
.panel .header {
padding: 7px 10px;
background: hsl(0,0%,93%);
background-color: hsl(0,0%,93%);
}
.panel .moon {
padding: 10px;
@ -435,6 +402,7 @@ img.unread {
/* single */
#create_topic_btn {
float: right;
}
.board {
margin-top: 10px;
@ -522,15 +490,7 @@ img.unread {
border: 1px solid #ccc;
padding: 4px 8px;
overflow: auto;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
-o-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.15);
-moz-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.15);
-o-box-shadow: 0 2px 2px rgba(0, 0, 0, 0.15);
box-shadow: 0 2px 2px rgba(0, 0, 0, 0.15);
}
textarea[id^=wmd-input] {
@ -649,15 +609,24 @@ textarea[id^=wmd-input] {
.pagination a {
line-height: 30px;
}
.topic_content h1,
.topic_content h2,
.topic_content h3,
.topic_content h3 {
line-height: 160%;
}
.topic_content h1 {
margin: 23px 0;
}
.topic_content h2 {
margin: 16px 0;
}
.topic_content h3 {
margin: 14px 0;
}
.topic_content h4,
.topic_content h5,
.topic_content h6 {
margin: 0;
padding: 0;
margin: 12px 0;
}
.topic_content ul,
.topic_content ol {
@ -725,3 +694,7 @@ textarea.editor {
#submit_btn {
margin-top: 10px;
}
#content .header {
line-height: 200%;
}

50
views/index.html
View File

@ -1,28 +1,28 @@
<%- partial('sidebar') %>
<div id='content'>
<div class='panel'>
<div class='inner'>
<div class='header'>
当前话题
<% if (locals.current_user) { %>
<a href='/topic/create' class='fr'>
<button class='btn btn-success fr' id='create_topic_btn'>发布话题</button>
</a>
<% } %>
</div>
<% if (locals.topics && topics.length > 0) { %>
<%- partial('topic/list', {
topics: topics,
pages: pages,
current_pages: current_page,
base: keyword ? ('/?q=' + keyword) : '/'
}) %>
<% } else { %>
<div class='inner'>
<p>无话题</p>
</div>
<% } %>
</div>
</div>
<div id="content">
<div class="panel">
<div class="inner">
<div class="header clearfix">
当前话题
<% if (locals.current_user) { %>
<a href='/topic/create' id='create_topic_btn'>
<button class='btn btn-success'>发布话题</button>
</a>
<% } %>
</div>
<% if (locals.topics && topics.length > 0) { %>
<%- partial('topic/list', {
topics: topics,
pages: pages,
current_pages: current_page,
base: keyword ? ('/?q=' + keyword) : '/'
}) %>
<% } else { %>
<div class='inner'>
<p>无话题</p>
</div>
<% } %>
</div>
</div>
</div>

4
views/layout.html
View File

@ -77,15 +77,12 @@
<div id='main'>
<%- body %>
</div>
<div class='cl cr'></div>
</div>
<div id='backtotop'>回到顶部</div>
<!-- <a href="https://github.com/muyuan/nodeclub"><img style="position: absolute; top: 0; right: 0; border: 0;" src="https://a248.e.akamai.net/assets.github.com/img/71eeaab9d563c2b3c590319b398dd35683265e85/687474703a2f2f73332e616d617a6f6e6177732e636f6d2f6769746875622f726962626f6e732f666f726b6d655f72696768745f677261795f3664366436642e706e67" alt="Fork me on GitHub"></a> -->
<!-- footer -->
<div id='footer'>
<div id='footer_main'>
<div class='fr'>
</div>
<div>
<a class='dark' href='/about'><strong>关于</strong></a>
&nbsp;&nbsp;|&nbsp;&nbsp;
@ -95,7 +92,6 @@
&nbsp;&nbsp;|&nbsp;&nbsp;
<a class='dark' href='/rss' target="_blank"><strong>RSS</strong></a>
</div>
<div class='sep10'></div>
<div class='col_fade'>
&copy; 2012 <br>本社区为开源系统，版本: <%= config.version %> ，欢迎贡献代码<br>
由<a href='http://cnodejs.net' target='_blank'> NAE </a>为 <%= config.name %> 提供动力

5
views/message/index.html
View File

@ -11,9 +11,7 @@
<% if (locals.hasnot_read_messages && hasnot_read_messages.length > 0) { %>
<%- partial('message/message', { collection: hasnot_read_messages, as: 'message' }) %>
<div class='cell'>
<button id='mark_all_messages_btn' class='btn fr'>标记所有消息为已读</button>
<div class='sep10'></div>
<div class='sep10'></div>
<button id='mark_all_messages_btn' class='btn'>标记所有消息为已读</button>
</div>
<% } else { %>
<div class='inner'>
@ -21,7 +19,6 @@
</div>
<% } %>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>过往信息</span>

4
views/message/message.html
View File

@ -35,9 +35,9 @@
<% if (message.has_read) { %>
<span class='fr'><img src='<%- config.site_static_host %>/images/checkmark_icon&16.png' title='消息已读'/></span>
<span><img src='<%- config.site_static_host %>/images/checkmark_icon&16.png' title='消息已读'/></span>
<% } else { %>
<span class='fr marked_icon mark_read_btn'>
<span class='marked_icon mark_read_btn'>
<img class='unread'
src='<%- config.site_static_host %>/images/checkmark_icon&16.png'
title='消息已读'

6
views/reply/reply.html
View File

@ -13,9 +13,9 @@
<a href="#<%- reply._id %>"><%= reply.friendly_create_at %></a>
</span>
</div>
<div class='user_action fr'>
<div class='user_action'>
<span class='col_fade'>#<%= indexInCollection + 1 %></span>
<% if(locals.current_user && current_user._id.toString() == reply.author._id.toString()) { %>
<% if (locals.current_user && current_user._id.toString() == reply.author._id.toString()) { %>
<a href='javascript:void(0);' class='delete_reply_btn'>
<img class='user_icon' src="<%- config.site_static_host %>/images/trash_icon&16.png" title='删除' />
</a>
@ -34,7 +34,7 @@
<div class='reply_content'>
<%- markdown(reply.content) %>
</div>
<div class='cl'>
<div class='clearfix'>
<!-- <div class='sep5'></div> -->
<div class='reply2_area'>
<% if (reply.replies.length >0) { %>

2
views/reply/reply2.html
View File

@ -12,7 +12,7 @@
<a href="#<%- reply2._id %>"><%= reply2.friendly_create_at %></a>
</span>
</div>
<div class='user_action fr'>
<div class='user_action'>
<% if (locals.current_user && current_user._id.toString() == reply2.author._id.toString()) { %>
<a href='javascript:void(0)' class='delete_reply2_btn'>
<img class='user_icon' src="<%- config.site_static_host %>/images/trash_icon&16.png" title='删除' />

14
views/sidebar.html
View File

@ -10,17 +10,14 @@
<% } else { %>
<div class='inner'>
<p><%= config.description %></p>
<div class='sep10'></div>
<div class='cen'>
<div>
<a href='/signup'><button class='btn'>现在注册</button></a>
<div class='sep10'></div>
<span>已注册用户请<a class='light' href='/signin'> 登录</a></span>
</div>
</div>
<% } %>
</div>
<div class='sep10'></div>
<div class=panel>
<div class='header'>
<!-- <img src='<%- config.site_static_host %>/images/tag_icon&16.png' title='标签'/> -->
@ -35,7 +32,6 @@
</div>
<% if (locals.hot_tags) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>热门标签</span>
@ -51,7 +47,6 @@
<% } %>
<% if (locals.hot_topics) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>热门话题</span>
@ -69,7 +64,6 @@
<% } %>
<% if (locals.no_reply_topics) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>无人回复的话题</span>
@ -87,7 +81,6 @@
<% } %>
<% if (config.site_links && config.site_links.length > 0) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>相关站点</span>
@ -103,7 +96,6 @@
<% } %>
<% if (locals.tops) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>积分榜</span>
@ -123,7 +115,6 @@
<% } %>
<% if (locals.stars) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>社区达人</span> &nbsp;
@ -141,8 +132,6 @@
</div>
<% } %>
<div class='sep10'></div>
<% if (config.side_ads && config.side_ads.length > 0) { %>
<div class='panel'>
<div class='header'>
@ -158,7 +147,6 @@
</div>
<% } %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>RSS订阅</span>

2
views/sign/reset.html
View File

@ -9,8 +9,6 @@
</ul>
</div>
<div class='inner'>
<div class='sep10'></div>
<div class='sep10'></div>
<% if(locals.error){ %>
<div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">&times;</a>

2
views/sign/search_pass.html
View File

@ -9,8 +9,6 @@
</ul>
</div>
<div class='inner'>
<div class='sep10'></div>
<div class='sep10'></div>
<% if (locals.error) { %>
<div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">&times;</a>

2
views/sign/signin.html
View File

@ -9,8 +9,6 @@
</ul>
</div>
<div class='inner'>
<div class='sep10'></div>
<div class='sep10'></div>
<% if(locals.error){ %>
<div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">&times;</a>

2
views/sign/signup.html
View File

@ -9,8 +9,6 @@
</ul>
</div>
<div class='inner'>
<div class='sep10'></div>
<div class='sep10'></div>
<% if (locals.error) { %>
<div class="alert alert-error">
<a class="close" data-dismiss="alert" href="#">&times;</a>

1
views/tag/edit_all.html
View File

@ -24,7 +24,6 @@
<% } %>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>添加标签</span>

15
views/tag/list_topic.html
View File

@ -7,16 +7,14 @@
<% } else { %>
<div class='inner'>
<p><%= config.description %></p>
<div class='sep10'></div>
<div class='cen'>
<div>
<a href='/signup'><button class='btn'>现在注册</button></a>
<div class='sep10'></div>
<span>已注册用户请<a class='light' href='/signin'> 登录</a></span>
</div>
</div>
<% } %>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>热门话题</span>
@ -31,7 +29,7 @@
<% } %>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>无人回复的话题</span>
@ -61,18 +59,15 @@
<% } %>
</ul>
<% if (locals.tag) { %>
<div class='sep5'></div>
<span class='col_fade'><%= tag.description %></span>
<% } %>
<% if (locals.current_user) { %>
<% if (!locals.error) { %>
<div class='sep10'></div>
<div class='sep10'></div>
<a href='/topic/create'><button class='btn' id='create_topic_btn'>发布话题</button></a>
<% if (!locals.in_collection) { %>
<button class='btn btn-success fr' id='collect_btn' action='collect'>加入收藏</button>
<button class='btn btn-success' id='collect_btn' action='collect'>加入收藏</button>
<% } else { %>
<button class='btn fr' id='collect_btn' action='de_collect'>取消收藏</button>
<button class='btn' id='collect_btn' action='de_collect'>取消收藏</button>
<% } %>
<% } %>
<% } %>

78
views/topic/index.html
View File

@ -7,7 +7,7 @@
<%- partial('user/card', { object: topic.author, as: 'user' }) %>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>作者其它话题</span>
@ -22,7 +22,7 @@
<% } %>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>无人回复的话题</span>
@ -55,7 +55,6 @@
<div class='topic_content'>
<%- markdown(topic.content) %>
</div>
<div class='sep10'></div>
<hr>
<% if (topic.tags.length > 0) { %>
<span class='col_fade'>标签：</span>
@ -79,14 +78,13 @@
>分享到 weibo</a>
<% if (locals.current_user) { %>
<% if (!topic.in_collection) { %>
<button class='btn btn-success fr' id='collect_btn' action='collect'>加入收藏</button>
<button class='btn btn-success' id='collect_btn' action='collect'>加入收藏</button>
<% } else { %>
<button class='btn fr' id='collect_btn' action='de_collect'>取消收藏</button>
<button class='btn' id='collect_btn' action='de_collect'>取消收藏</button>
<% } %>
<% } %>
<% if (locals.current_user) { %>
<% if (current_user.is_admin) { %>
<span class='sp10'></span>
<% if (topic.top) { %>
<a href='/topic/<%= topic._id %>/top/0'><img class='user_icon' src='<%- config.site_static_host %>/images/star_fav_empty_icon&16.png' title='取消置顶' /></a>
<% } else { %>
@ -96,7 +94,6 @@
<a href='javascript:;' data-id="<%= topic._id %>" class='delete_topic_btn'><img class='user_icon' src='<%- config.site_static_host %>/images/trash_icon&16.png' title='删除' /></a>
<% } else { %>
<% if (current_user._id == topic.author_id) { %>
<span class='sp10'></span>
<a href='/topic/<%= topic._id %>/edit'><img class='user_icon' src='<%- config.site_static_host %>/images/doc_edit_icon&16.png' title='编辑' /></a>
<% } %>
<% } %>
@ -104,7 +101,6 @@
</div>
</div>
<% if (topic.replies && topic.replies.length > 0) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'><%= topic.replies.length %> 回复</span>
@ -113,7 +109,6 @@
</div>
<% } %>
<% if (locals.current_user && locals.topic) { %>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>添加回复</span>
@ -136,9 +131,8 @@
</div>
<input type='hidden' name='_csrf' id="_csrf" value='<%= csrf %>' />
</div>
<div class='sep10'></div>
<button id='submit_btn' class='btn'>回复</button>
<span class='sp10'></span>
<span class='col_fade'>Ctrl+Enter 快捷回复</span>
</form>
</div>
@ -158,30 +152,6 @@
<script>
$(document).ready(function () {
// var editors = {};
// function run_md_editor() {
// var converter = new Showdown.converter();
// editors[""] = new Markdown.Editor(converter);
// editors[""].run();
// /*
// editor.hooks.chain('onPreviewRefresh', function () {
// prettyPrint();
// });
// */
// $('.reply2_editor').each(function() {
// var editor_id = $(this).attr('id');
// var suffix = editor_id.slice(editor_id.indexOf('-'));
// editors[suffix] = new Markdown.Editor(converter, suffix);
// editors[suffix].run();
// /*
// editor.hooks.chain('onPreviewRefresh', function () {
// prettyPrint();
// });
// */
// });
// }
// run_md_editor();
$('#wmd-input').mouseover(function(){
$('#wmd-input').focus()
});
@ -217,44 +187,6 @@
});
});
// $('.reply2_submit_btn').click(function () {
// var $btn = $(this);
// var reply_id = $btn.attr('data-id');
// var content = $btn.parents('.reply2_editor').find('textarea.editor').val();
// var data = {
// reply_id: reply_id,
// r2_content: content,
// _csrf: '<%- csrf %>'
// };
// $.post('/<%= topic._id %>/reply2', data, function (data) {
// if(data != '') {
// $btn.parent().before(data);
// $btn.parent().find('textarea').val('');
// $btn.parent().find('.wmd-preview').html('');
// prettyPrint();
// $btn.parent().toggle();
// }
// });
// });
// $('.preview-btn').click(function() {
// var href = $(this).attr('href');
// var index = href.lastIndexOf('-');
// var suffix = index < 0 ? '' : href.slice(index);
// editors[suffix].makePreviewHtml();
// prettyPrint();
// });
/*
$('.reply2_item').live('mouseover',function(){
$(this).find('.reply2_at_btn').show();
});
$('.reply2_item').live('mouseout',function(){
$(this).find('.reply2_at_btn').hide();
});
$(this).find('.reply2_btn').show();
$(this).find('.reply2_at_btn').show();
*/
$('#collect_btn').click(function(){
var $me = $(this);
var action = $me.attr('action');

9
views/user/card.html
View File

@ -3,18 +3,17 @@
<a class='user_avatar' href="/user/<%= user.name %>">
<img src="<%= user.avatar_url %>" title="<%= user.name %>" />
</a>
<span class='sp10'></span>
<span class='user_name'><a class='dark' href="/user/<%= user.name %>"><%= user.name %></a></span>
<% if (locals.current_user && current_user._id != user._id) { %>
<% if (!locals.relation) { %>
<button class='btn btn-success fr follow_btn' action='follow'>加入关注</button>
<button class='btn btn-success follow_btn' action='follow'>加入关注</button>
<% } else { %>
<button class='btn fr follow_btn' action='un_follow'>取消关注</button>
<button class='btn follow_btn' action='un_follow'>取消关注</button>
<% } %>
<% } %>
<div class='board cl'>
<div class='board clearfix'>
<div class='floor'>
<a href='/user/<%= user.name %>/tags/'><span class='big'><%= user.collect_tag_count %></span> 标签收藏</a>
<div class='space'></div>
@ -63,4 +62,4 @@
});
});
</script>
<% } %>
<% } %>

11
views/user/index.html
View File

@ -14,9 +14,9 @@
</div>
<% if (locals.current_user && current_user._id != user._id) { %>
<% if (!locals.relation) { %>
<button class='btn btn-success fr follow_btn' action='follow'>加入关注</button>
<button class='btn btn-success follow_btn' action='follow'>加入关注</button>
<% } else { %>
<button class='btn fr follow_btn' action='un_follow'>取消关注</button>
<button class='btn follow_btn' action='un_follow'>取消关注</button>
<% } %>
<% } %>
<a class='dark'><%= user.name %></a>
@ -24,12 +24,9 @@
<span>
<img src="<%- config.site_static_host %>/images/cert_icon&16.png" />
<%= user.following_count %> 关注
<div class='space'></div>
<%= user.follower_count %> 粉丝
<div class='space'></div>
<%= user.score %> 积分</span>
<% if (user.signature) { %>
<span class='sp10'></span>
<span><%= user.signature %></span>
<% } %>
</div>
@ -73,7 +70,7 @@
<% } %>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>最近发布话题</span>
@ -89,7 +86,7 @@
</div>
<% } %>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>最近参与话题</span>

10
views/user/replies.html
View File

@ -14,16 +14,15 @@
</div>
<% if (locals.current_user && current_user._id != user._id) { %>
<% if (!locals.relation) { %>
<button class='btn btn-success fr follow_btn' action='follow'>加入关注</button>
<button class='btn btn-success follow_btn' action='follow'>加入关注</button>
<% } else { %>
<button class='btn fr follow_btn' action='un_follow'>取消关注</button>
<button class='btn follow_btn' action='un_follow'>取消关注</button>
<% } %>
<% } %>
<h2><%= user.name %></h2>
<div class='col_fade'>
<span><img src="<%- config.site_static_host %>/images/cert_icon&16.png" /> <%= user.follower_count %> 粉丝</span>
<% if(user.signature){ %>
<span class='sp10'></span>
<span><%= user.signature %></span>
<% } %>
</div>
@ -56,13 +55,12 @@
<% if(locals.current_user && current_user.is_admin){ %>
<% if(!user.is_star){ %>
<button class='btn' id='set_star_btn' action='set_star'>设为达人</button>
<% }else{ %>
<% } else { %>
<button class='btn' id='set_star_btn' action='cancel_star'>取消达人</button>
<% } %>
<% } %>
</div>
</div>
<div class='sep10'></div>
</div>
<div class='panel'>
<div class='header'>
<span class='col_fade'><%= user.name %> 参与的话题</span>

5
views/user/setting.html
View File

@ -118,7 +118,7 @@
</form>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>头像</span>
@ -133,13 +133,12 @@
gravatar: <img class="user_avatar" src="<%= current_user.avatar %>" />
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'>更改密码</span>
</div>
<div class='inner'>
<div class='sep10'></div>
<form id='change_pass_form' class='form-horizontal' action='/setting' method='post'>
<div class='control-group'>
<label class='control-label' for='old_pass'>当前密码</label>

5
views/user/topics.html
View File

@ -14,9 +14,9 @@
</div>
<% if(locals.current_user && current_user._id != user._id){ %>
<% if(!locals.relation){ %>
<button class='btn btn-success fr' id='follow_btn' action='follow'>加入关注</button>
<button class='btn btn-success' id='follow_btn' action='follow'>加入关注</button>
<% }else{ %>
<button class='btn fr' id='follow_btn' action='un_follow'>取消关注</button>
<button class='btn' id='follow_btn' action='un_follow'>取消关注</button>
<% } %>
<% } %>
<h2><%= user.name %></h2>
@ -62,7 +62,6 @@
<% } %>
</div>
</div>
<div class='sep10'></div>
<div class='panel'>
<div class='header'>
<span class='col_fade'><%= user.name %> 发布的话题</span>

1
views/user/user.html
View File

@ -9,7 +9,6 @@
<span class='space'></span>
<span class='col_fade'><%= user.following_count %> 关注 </span>
</div>
<div class='sep10'></div>
<div>
<span>
<a href='mailto:<%= user.email %>'>