some cleanup on profile, starting redesign of the rest of the page

main
psychobunny 9 years ago
parent f29f067e4b
commit fcbdef474a

@ -3,6 +3,12 @@
margin-bottom: 30px; margin-bottom: 30px;
} }
> .row {
max-width: @screen-sm-min;
margin-left: auto;
margin-right: auto;
}
.cover { .cover {
background-size: cover; background-size: cover;
background-repeat: no-repeat; background-repeat: no-repeat;
@ -153,6 +159,15 @@
} }
.posts-list .posts-list-item {
// temp global, port to groups/fav/account
border-bottom: 1px solid @gray-lighter;
margin-bottom: 25px !important;
padding-bottom: 40px;
}
// //
.account-picture-block{ .account-picture-block{
@ -207,4 +222,5 @@
font-size:16px; font-size:16px;
width:100px; width:100px;
} }
} }

@ -2,139 +2,133 @@
<!-- IMPORT partials/account/header.tpl --> <!-- IMPORT partials/account/header.tpl -->
<div class="row"> <div class="row">
<div class="col-md-5 account-block"> <div class="col-xs-12 account-block">
<div class="account-picture-block text-center">
<span>
<span class="account-username"> {username}</span>
</span>
<!-- IF !isSelf -->
<br/>
<!-- IF !config.disableChat -->
<a id="chat-btn" href="#" class="btn btn-primary btn-sm">[[user:chat]]</a>
<!-- ENDIF !config.disableChat -->
<a id="follow-btn" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a>
<a id="unfollow-btn" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
<!-- IF isAdmin -->
<br/><br/>
<a id="banAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF banned -->hide<!-- ENDIF banned -->">[[user:ban_account]]</a>
<a id="unbanAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF !banned -->hide<!-- ENDIF !banned -->">[[user:unban_account]]</a>
<a id="deleteAccountBtn" href="#" class="btn btn-danger btn-sm">[[user:delete_account]]</a><br/><br/>
<!-- ENDIF isAdmin -->
<!-- ENDIF !isSelf -->
<div class="account-picture-block panel panel-default"> </div>
<div class="panel-body">
<div> <div id="banLabel" class="text-center <!-- IF !banned -->hide<!-- ENDIF !banned -->">
<div class="text-center"> <span class="label label-danger">[[user:banned]]</span>
<span> </div>
<span class="account-username"> {username}</span>
</span> <!-- IF aboutme -->
<hr/>
<!-- IF !isSelf --> <div component="aboutme" class="text-center">
<br/> {aboutme}
<!-- IF !config.disableChat --> </div>
<a id="chat-btn" href="#" class="btn btn-primary btn-sm">[[user:chat]]</a> <!-- ENDIF aboutme -->
<!-- ENDIF !config.disableChat --> <hr/>
<a id="follow-btn" href="#" class="btn btn-success btn-sm <!-- IF isFollowing -->hide<!-- ENDIF isFollowing -->">[[user:follow]]</a> <div class="text-center account-stats">
<a id="unfollow-btn" href="#" class="btn btn-warning btn-sm <!-- IF !isFollowing -->hide<!-- ENDIF !isFollowing -->">[[user:unfollow]]</a>
<!-- IF reputation -->
<!-- IF isAdmin --> <div class="inline-block text-center">
<br/><br/> <span class="human-readable-number" title="{reputation}">{reputation}</span>
<span class="account-bio-label">[[global:reputation]]</span>
<a id="banAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF banned -->hide<!-- ENDIF banned -->">[[user:ban_account]]</a> </div>
<a id="unbanAccountBtn" href="#" class="btn btn-danger btn-sm <!-- IF !banned -->hide<!-- ENDIF !banned -->">[[user:unban_account]]</a> <!-- ENDIF reputation -->
<a id="deleteAccountBtn" href="#" class="btn btn-danger btn-sm">[[user:delete_account]]</a><br/><br/>
<!-- ENDIF isAdmin --> <div class="inline-block text-center">
<!-- ENDIF !isSelf --> <span class="human-readable-number" title="{postcount}">{postcount}</span>
<span class="account-bio-label">[[global:posts]]</span>
</div> </div>
<div id="banLabel" class="text-center <!-- IF !banned -->hide<!-- ENDIF !banned -->"> <div class="inline-block text-center">
<span class="label label-danger">[[user:banned]]</span> <span class="human-readable-number" title="{profileviews}">{profileviews}</span>
</div> <span class="account-bio-label">[[user:profile_views]]</span>
</div>
<!-- IF aboutme -->
<hr/> <div class="inline-block text-center">
<div component="aboutme" class="text-center"> <span class="human-readable-number" title="{followerCount}">{followerCount}</span>
{aboutme} <span class="account-bio-label">[[user:followers]]</span>
</div> </div>
<!-- ENDIF aboutme -->
<hr/> <div class="inline-block text-center">
<div class="text-center account-stats"> <span class="human-readable-number" title="{followingCount}">{followingCount}</span>
<span class="account-bio-label">[[user:following]]</span>
<!-- IF reputation -->
<div class="inline-block text-center">
<span class="human-readable-number" title="{reputation}">{reputation}</span>
<span class="account-bio-label">[[global:reputation]]</span>
</div>
<!-- ENDIF reputation -->
<div class="inline-block text-center">
<span class="human-readable-number" title="{postcount}">{postcount}</span>
<span class="account-bio-label">[[global:posts]]</span>
</div>
<div class="inline-block text-center">
<span class="human-readable-number" title="{profileviews}">{profileviews}</span>
<span class="account-bio-label">[[user:profile_views]]</span>
</div>
</div>
</div>
</div> </div>
</div> </div>
<div class="hidden">
<!-- IF email -->
<span class="account-bio-label">[[user:email]]</span>
<span class="account-bio-value"><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i> {email}</span>
<!-- ENDIF email -->
<div class="panel panel-default"> <!-- IF fullname -->
<div class="panel-body text-center"> <span class="account-bio-label">[[user:fullname]]</span>
<span class="account-bio-value">{fullname}</span>
<!-- ENDIF fullname -->
<!-- IF email --> <!-- IF websiteName -->
<span class="account-bio-label">[[user:email]]</span> <span class="account-bio-label">[[user:website]]</span>
<span class="account-bio-value"><i class="fa fa-eye-slash {emailClass}" title="[[user:email_hidden]]"></i> {email}</span> <span class="account-bio-value"><a href="{websiteLink}" rel="nofollow">{websiteName}</a></span>
<!-- ENDIF email --> <!-- ENDIF websiteName -->
<!-- IF fullname --> <!-- IF location -->
<span class="account-bio-label">[[user:fullname]]</span> <span class="account-bio-label">[[user:location]]</span>
<span class="account-bio-value">{fullname}</span> <span class="account-bio-value">{location}</span>
<!-- ENDIF fullname --> <!-- ENDIF location -->
<!-- IF websiteName --> <!-- IF age -->
<span class="account-bio-label">[[user:website]]</span> <span class="account-bio-label">[[user:age]]</span>
<span class="account-bio-value"><a href="{websiteLink}" rel="nofollow">{websiteName}</a></span> <span class="account-bio-value">{age}</span>
<!-- ENDIF websiteName --> <!-- ENDIF age -->
<!-- IF location -->
<span class="account-bio-label">[[user:location]]</span>
<span class="account-bio-value">{location}</span>
<!-- ENDIF location -->
<!-- IF age --> <span class="account-bio-label">[[user:followers]]</span>
<span class="account-bio-label">[[user:age]]</span> <span class="human-readable-number account-bio-value" title="{followerCount}">{followerCount}</span>
<span class="account-bio-value">{age}</span>
<!-- ENDIF age -->
<span class="account-bio-label">[[user:following]]</span>
<span class="human-readable-number account-bio-value" title="{followingCount}">{followingCount}</span>
<span class="account-bio-label">[[user:followers]]</span> <span class="account-bio-label">[[user:joined]]</span>
<span class="human-readable-number account-bio-value" title="{followerCount}">{followerCount}</span> <span class="timeago account-bio-value" title="{joindate}"></span>
<span class="account-bio-label">[[user:following]]</span> <span class="account-bio-label">[[user:lastonline]]</span>
<span class="human-readable-number account-bio-value" title="{followingCount}">{followingCount}</span> <span class="timeago account-bio-value" title="{lastonline}"></span>
<span class="account-bio-label">[[user:joined]]</span> <!-- IF !disableSignatures -->
<span class="timeago account-bio-value" title="{joindate}"></span> <!-- IF signature -->
<hr/>
<span class="account-bio-label">[[user:lastonline]]</span> <span class="account-bio-label">[[user:signature]]</span>
<span class="timeago account-bio-value" title="{lastonline}"></span> <div class="post-signature">
<span id='signature'>{signature}</span>
<!-- IF !disableSignatures -->
<!-- IF signature -->
<hr/>
<span class="account-bio-label">[[user:signature]]</span>
<div class="post-signature">
<span id='signature'>{signature}</span>
</div>
<!-- ENDIF signature -->
<!-- ENDIF !disableSignatures -->
</div> </div>
<!-- ENDIF signature -->
<!-- ENDIF !disableSignatures -->
</div> </div>
<!-- IF groups.length --> <!-- IF groups.length -->
<div class="panel panel-default"> <div class="hidden">
<div class="panel-heading">
<h3 class="panel-title">[[groups:groups]]</h3>
</div>
<div class="panel-body">
<!-- BEGIN groups --> <!-- BEGIN groups -->
<a href="{config.relative_path}/groups/{groups.slug}"><span class="label group-label inline-block" style="background-color: {groups.labelColor};"><!-- IF groups.icon --><i class="fa {groups.icon}"></i> <!-- ENDIF groups.icon -->{groups.userTitle}</span></a> <a href="{config.relative_path}/groups/{groups.slug}"><span class="label group-label inline-block" style="background-color: {groups.labelColor};"><!-- IF groups.icon --><i class="fa {groups.icon}"></i> <!-- ENDIF groups.icon -->{groups.userTitle}</span></a>
<!-- END groups --> <!-- END groups -->
</div>
</div> </div>
<!-- ENDIF groups.length --> <!-- ENDIF groups.length -->
<br /><br />
<!-- IF ips.length --> <!-- IF ips.length -->
<div class="panel panel-default"> <div class="hidden">
<div class="panel-heading"> <div class="panel-heading">
<h3 class="panel-title">[[global:recentips]]</h3> <h3 class="panel-title">[[global:recentips]]</h3>
</div> </div>
@ -148,7 +142,7 @@
</div> </div>
<div class="col-md-7"> <div class="col-xs-12">
<!-- IF !posts.length --> <!-- IF !posts.length -->
<div class="alert alert-warning">[[user:has_no_posts]]</div> <div class="alert alert-warning">[[user:has_no_posts]]</div>
<!-- ENDIF !posts.length --> <!-- ENDIF !posts.length -->

@ -2,33 +2,27 @@
<!-- BEGIN posts --> <!-- BEGIN posts -->
<li component="post" class="posts-list-item" data-pid="{posts.pid}" data-uid="{posts.uid}"> <li component="post" class="posts-list-item" data-pid="{posts.pid}" data-uid="{posts.uid}">
<a href="{config.relative_path}/user/{posts.user.userslug}">
<!-- IF posts.user.picture -->
<img title="{posts.user.username}" class="img-rounded user-img" src="{posts.user.picture}">
<!-- ELSE -->
<div class="user-icon user-img" style="background-color: {posts.user.icon:bgColor};" title="{posts.user.username}">{posts.user.icon:text}</div>
<!-- ENDIF posts.user.picture -->
</a>
<div class="panel panel-default"> <a href="{config.relative_path}/user/{posts.user.userslug}">
<div class="panel-body"> <strong><span>{posts.user.username}</span></strong>
<a href="{config.relative_path}/user/{posts.user.userslug}"> </a>
<!-- IF posts.user.picture --> <div component="post/content" class="content">
<img title="{posts.user.username}" class="img-rounded user-img" src="{posts.user.picture}"> <p>{posts.content}</p>
<!-- ELSE --> <p class="fade-out"></p>
<div class="user-icon user-img" style="background-color: {posts.user.icon:bgColor};" title="{posts.user.username}">{posts.user.icon:text}</div>
<!-- ENDIF posts.user.picture -->
</a>
<a href="{config.relative_path}/user/{posts.user.userslug}">
<strong><span>{posts.user.username}</span></strong>
</a>
<div component="post/content" class="content">
<p>{posts.content}</p>
<p class="fade-out"></p>
</div>
<small>
<span class="pull-right">
[[global:posted_in_ago, <a href="{config.relative_path}/category/{posts.category.slug}"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.relativeTime}"></span>]] &bull;
<a href="{config.relative_path}/topic/{posts.topic.slug}/{posts.index}">[[global:read_more]]</a>
</span>
</small>
</div>
</div> </div>
<small>
<span class="pull-right">
[[global:posted_in_ago, <a href="{config.relative_path}/category/{posts.category.slug}"><i class="fa {posts.category.icon}"></i> {posts.category.name}</a>, <span class="timeago" title="{posts.relativeTime}"></span>]] &bull;
<a href="{config.relative_path}/topic/{posts.topic.slug}/{posts.index}">[[global:read_more]]</a>
</span>
</small>
</li> </li>
<!-- END posts --> <!-- END posts -->
</ul> </ul>

Loading…
Cancel
Save