Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add top pagination with some more symmetry in the UI #532

Merged
merged 1 commit into from
Jan 14, 2015
Merged

Add top pagination with some more symmetry in the UI #532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions public/css/bootstrap-custom.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4120,7 +4120,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
}
.breadcrumb {
padding: 8px 15px;
margin-bottom: 20px;
margin-bottom: 10px;
list-style: none;
background-color: #f5f5f5;
border-radius: 4px;
Expand All @@ -4139,7 +4139,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
.pagination {
display: inline-block;
padding-left: 0;
margin: 20px 0;
margin: 10px 0;
border-radius: 4px;
}
.pagination > li {
Expand Down
8 changes: 4 additions & 4 deletions views/includes/header.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,17 @@
</div>
<div class="navbar-collapse navbar-collapse-top collapse">
<ul class="nav navbar-nav navbar-right">
<li><a href="/"><span class="visible-xs"><i class="fa fa-file-code-o"></i> </span>Scripts</a></li>
<li><a href="/?library=true" title="Script Libraries"><span class="visible-xs"><i class="fa fa-file-excel-o"></i> </span>Libs</a></li>
<li><a href="/" title="Scripts"><span class="visible-xs"><i class="fa fa-file-code-o"></i> </span>Scripts</a></li>
<li><a href="/?library=true" title="Script Libraries"><span class="visible-xs"><i class="fa fa-file-excel-o"></i> </span>Libraries</a></li>
<li><a href="/groups" title="Script Groups"><span class="visible-xs"><i class="fa fa-folder"></i> </span>Groups</a></li>
<li><a href="/forum" title="Discuss"><span class="visible-xs"><i class="fa fa-comment"></i> </span>Discuss</a></li>
<li><a href="/forum"><span class="visible-xs"><i class="fa fa-comment"></i> </span>Discussions</a></li>
<li><a href="/users"><span class="visible-xs"><i class="fa fa-user"></i> </span>Users</a></li>
{{#authedUser}}
{{#authedUser.isMod}}
<li><a href="/mod" title="Moderation"><i class="fa fa-eye"></i><span class="visible-xs"> Moderation</span></a></li>
{{/authedUser.isMod}}
{{#authedUser.isAdmin}}
<li><a href="/admin" title="Admin"><i class="fa fa-coffee"></i><span class="visible-xs"> Admin</span></a></li>
<li><a href="/admin" title="Administration"><i class="fa fa-coffee"></i><span class="visible-xs"> Admin</span></a></li>
{{/authedUser.isAdmin}}
<!-- <li><a href="#" class="disabled"><i class="fa fa-envelope-o"></i> 0<span class="visible-xs"> Unread Messages</span></a></li> -->
<li><a href="{{authedUser.userPageUrl}}" title="My profile">{{authedUser.name}}</a></li>
Expand Down
2 changes: 1 addition & 1 deletion views/includes/scripts/commentReplyScript.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// Show spacer div
$('#reply-control').on('shown.bs.collapse', function () {
$('#show-reply-form-when-visible').css({
height: '200px'
height: '210px'
});
});

Expand Down
6 changes: 5 additions & 1 deletion views/pages/categoryListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,16 +10,20 @@
<div class="row">
<div class="col-sm-12">
<h2 class="page-heading">
Discuss
Discussions
</h2>
<div class="list-group col-sm-12 col-md-2 col-lg-3">
<h3>Categories</h3>
{{#categoryList}}
<a href="{{{categoryPageUrl}}}" class="list-group-item">
<h4 class="list-group-item-heading">{{name}}</h4>
<p class="list-group-item-text">{{description}}</p>
</a>
{{/categoryList}}
</div>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default col-sm-12 col-md-10 col-lg-9">
{{> includes/discussionList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/discussionListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
<i class="fa fa-plus"></i> Create Topic
</a>
</div>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/discussionList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/discussionPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,9 @@
<div class="container-fluid comments">
<div class="row">
<section class="topic-area list-group">
<div class="text-center">
{{{paginationRendered}}}
</div>
{{#commentList}}
{{> includes/comment.html }}
{{/commentList}}
Expand Down
3 changes: 3 additions & 0 deletions views/pages/groupListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<h2 class="page-heading">
Groups
</h2>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/groupList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/groupScriptListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<h2 class="page-heading">
<a href="{{{group.groupPageUrl}}}" class="script-name">{{group.name}}</a>
</h2>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/scriptList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/removedItemListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<h2 class="page-heading">
Removed Items
</h2>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/removedItemList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/scriptIssueListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,9 @@
The script author requests that you use their preferred primary support method when filing an issue. Please consider using that for regular issues.
</div>
{{/script.hasSupport}}
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/discussionList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/scriptIssuePage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,9 @@
<div class="container-fluid comments">
<div class="row">
<section class="topic-area list-group">
<div class="text-center">
{{{paginationRendered}}}
</div>
{{#commentList}}
{{> includes/comment.html }}
{{/commentList}}
Expand Down
3 changes: 3 additions & 0 deletions views/pages/scriptListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<h2 class="page-heading">
{{pageHeading}}
</h2>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/scriptList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/userCommentListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,9 @@
<div class="container-fluid comments">
<div class="row">
<section class="topic-area list-group">
<div class="text-center">
{{{paginationRendered}}}
</div>
{{#commentList}}
<div class="topic-title row container-fluid">
<ol class="breadcrumb pull-left">
Expand Down
3 changes: 3 additions & 0 deletions views/pages/userGitHubRepoListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<div class="row">
<div class="col-md-8">
<h2><a href="{{{userGitHubRepoListPageUrl}}}" class="script-author">{{githubUser.login}}</a></h2>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="list-group">
{{#githubRepoList}}
<a href="{{{userGitHubRepoPageUrl}}}" class="list-group-item">
Expand Down
3 changes: 3 additions & 0 deletions views/pages/userListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<h2 class="page-heading">
{{pageHeading}}
</h2>
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/userList.html }}
</div>
Expand Down
3 changes: 3 additions & 0 deletions views/pages/userScriptListPage.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,9 @@
<div class="row">
<div class="col-xs-12">
{{> includes/userPageHeader.html }}
<div class="text-center">
{{{paginationRendered}}}
</div>
<div class="panel panel-default">
{{> includes/scriptList.html }}
</div>
Expand Down