Skip to content

Commit

Permalink
Sync upstream
Browse files Browse the repository at this point in the history
  • Loading branch information
@sayakb
sayakb committed Aug 5, 2013
1 parent 42a01ff commit f0521ce
Show file tree
Hide file tree
Showing 8 changed files with 145 additions and 191 deletions.
4 changes: 2 additions & 2 deletions VERSION
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
0.4.07242013.1
489
0.4.08042013.1
490
19 changes: 4 additions & 15 deletions classes/class_skin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -302,7 +302,7 @@ function pagination($total_pastes, $current_page)
$idx != ($current_page) && $idx != ($current_page + 1) &&
$idx < ($pages - 2))
{
$pagination .= ' ...';
$pagination .= '<li class="disabled"><a href="#">...</a></li>';

if ($idx < ($current_page - 1))
{
Expand All @@ -315,19 +315,8 @@ function pagination($total_pastes, $current_page)
}
else
{
if ($idx != $current_page)
{
$pagination .= '<a href="' . $nav->get('nav_archives', $project, $idx) . '">';
}

$pagination .= '<span class="page_no';
$pagination .= ($idx == $current_page ? ' page_current' : '');
$pagination .= '">' . $idx . '</span>';

if ($idx != $current_page)
{
$pagination .= "</a>";
}
$pagination .= $idx == $current_page ? '<li class="active">' : '<li>';
$pagination .= '<a href="' . $nav->get('nav_archives', $project, $idx) . '">' . $idx . '</a></li>';
}
}

Expand Down Expand Up @@ -465,4 +454,4 @@ function active($condition, $invert = false)
}
}

?>
?>
85 changes: 58 additions & 27 deletions skins/bootstrap/css/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2813,40 +2813,71 @@ button.btn.small, input[type="submit"].btn.small {
.breadcrumb .active a {
color: #333333;
}
.pagination {
text-align: right;
.pagination ul {
display: inline;
*display: inline;
margin-bottom: 0;
margin-left: 0;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
*zoom: 1;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}
.pagination:first-child {
margin-top: 5px;
.pagination ul > li {
display: inline;
}
.pagination .page_no {
background: #fff;
padding: 4px;
margin-left: 4px;
padding-left: 8px;
padding-right: 8px;
text-align: center;
.pagination ul > li > a,
.pagination ul > li > span {
float: left;
padding: 4px 12px;
line-height: 20px;
border: 1px solid #ddd;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff;
text-decoration: none;
background-color: #ffffff;
border: 1px solid #dddddd;
border-left-width: 0;
}
.pagination ul > li > a:hover,
.pagination ul > li > a:focus,
.pagination ul > .active > a,
.pagination ul > .active > span {
background-color: #f5f5f5;
}
.pagination .page_no:hover {
background: #f9f9f9;
.pagination ul > .active > a,
.pagination ul > .active > span {
color: #999999;
cursor: default;
}
.pagination .page_current {
color: #999;
.pagination ul > .disabled > span,
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > a:focus {
color: #999999;
cursor: default;
background: #f9f9f9;
background-color: transparent;
}
.pagination a:hover {
text-decoration: none !important;
.pagination ul > li:first-child > a,
.pagination ul > li:first-child > span {
border-left-width: 1px;
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
-moz-border-radius-topleft: 4px;
}
.pagination ul > li:last-child > a,
.pagination ul > li:last-child > span {
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-topright: 4px;
-moz-border-radius-bottomright: 4px;
}
.pagination_bottom {
.pagination-bottom {
margin-bottom: 0px;
}
.pager {
Expand Down Expand Up @@ -3611,4 +3642,4 @@ a.thumbnail:hover {
left: -1000px;
opacity: 0;
filter: alpha(opacity=0);
}
}
6 changes: 3 additions & 3 deletions skins/bootstrap/html/tpl_list.html
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<div class="[[data_visibility]] pagination pull-right">
[[list_pagination]]
<ul>[[list_pagination]]</ul>
</div>

<h1>
Expand Down Expand Up @@ -28,6 +28,6 @@ <h1>
<h1>[[error_text]]</h1>
</div>

<div class="[[data_visibility]] pagination pagination_bottom">
[[list_pagination]]
<div class="[[data_visibility]] pagination pagination-bottom pull-right">
<ul>[[list_pagination]]</ul>
</div>
91 changes: 65 additions & 26 deletions skins/neverland/css/bootstrap.css
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6931,46 +6931,85 @@ ul.unstyled, ol.unstyled {
color: #b94a48;
}

.pages {
text-align: right;
.pagination ul {
display: inline;
*display: inline;
margin-bottom: 0;
margin-left: 0;
-webkit-border-radius: 4px;
-moz-border-radius: 4px;
border-radius: 4px;
*zoom: 1;
-webkit-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
-moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
box-shadow: 0 1px 2px rgba(0, 0, 0, 0.05);
}

.pages .page_no {
background: #fff;
padding: 4px;
margin-left: 4px;
padding-left: 8px;
padding-right: 8px;
text-align: center;
border: 1px solid #ddd;
-webkit-border-radius: 3px;
-moz-border-radius: 3px;
border-radius: 3px;
-webkit-box-shadow: inset 0 1px 0 #ffffff;
-moz-box-shadow: inset 0 1px 0 #ffffff;
box-shadow: inset 0 1px 0 #ffffff;
.pagination ul > li {
display: inline;
}

.pages .page_no:hover {
background: #f9f9f9;
.pagination ul > li > a,
.pagination ul > li > span {
float: left;
padding: 4px 12px;
line-height: 20px;
text-decoration: none;
background-color: #ffffff;
border: 1px solid #dddddd;
border-left-width: 0;
}

.pages .page_current {
color: #999;
.pagination ul > li > a:hover,
.pagination ul > li > a:focus,
.pagination ul > .active > a,
.pagination ul > .active > span {
background-color: #f5f5f5;
}

.pagination ul > .active > a,
.pagination ul > .active > span {
color: #999999;
cursor: default;
background: #f9f9f9;
}

.pages a:hover {
text-decoration: none !important;
.pagination ul > .disabled > span,
.pagination ul > .disabled > a,
.pagination ul > .disabled > a:hover,
.pagination ul > .disabled > a:focus {
color: #999999;
cursor: default;
background-color: transparent;
}

.pagination ul > li:first-child > a,
.pagination ul > li:first-child > span {
border-left-width: 1px;
-webkit-border-bottom-left-radius: 4px;
border-bottom-left-radius: 4px;
-webkit-border-top-left-radius: 4px;
border-top-left-radius: 4px;
-moz-border-radius-bottomleft: 4px;
-moz-border-radius-topleft: 4px;
}

.pagination ul > li:last-child > a,
.pagination ul > li:last-child > span {
-webkit-border-top-right-radius: 4px;
border-top-right-radius: 4px;
-webkit-border-bottom-right-radius: 4px;
border-bottom-right-radius: 4px;
-moz-border-radius-topright: 4px;
-moz-border-radius-bottomright: 4px;
}

.pages-top {
.pagination-top {
margin-top: 0px;
margin-bottom: 15px;
}

.pages-bottom {
.pagination-bottom {
margin-top: 0px;
margin-bottom: 0px;
}

Expand Down Expand Up @@ -7047,4 +7086,4 @@ ul.unstyled, ol.unstyled {

.clearfix {
margin-top: -4px;
}
}
9 changes: 4 additions & 5 deletions skins/neverland/html/tpl_footer.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,17 @@

<footer id="copyright" class="copyright align-center">{{site_copyright}}</footer>
</div>

<div class="pre-cache">
<input type="checkbox" checked="checked" />
</div>

<!-- HPot QuickLink -->
<a href="http://www.ssdfreaks.com/household.php?to=857"><!-- enthusiast-offence --></a>

<script type="text/javascript" src="http://cdn.kde.org/js/jquery.js"></script>
<script type="text/javascript" src="http://cdn.kde.org/js/jquery.cookie.js"></script>
<script type="text/javascript" src="http://cdn.kde.org/js/bootstrap.js"></script>
<script type="text/javascript" src="http://cdn.kde.org/nav/global-nav.js"></script>
<script type="text/javascript" src="[[skin_path]]/js/jquery.js"></script>
<script type="text/javascript" src="[[skin_path]]/js/jquery.cookie.js"></script>
<script type="text/javascript" src="[[skin_path]]/js/bootstrap.js"></script>
<script type="text/javascript" src="[[skin_path]]/js/main.js"></script>
</body>
</html>
Loading

0 comments on commit f0521ce

Please sign in to comment.