developers
/
Orbit
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix structure title (page slide)

This commit is contained in:
chris 2013-07-29 14:59:02 +08:00
parent d434b878a7
commit fe10cc62d9
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/basic/orbit_js_1.0.1.js
View File

@ -487,7 +487,7 @@ function openSlide() {
$openSlide.each(function() { $openSlide.each(function() {
if($(this).hasClass('view-page')) { if($(this).hasClass('view-page')) {
$(this).pageslide({ W: $pageslideW, iframe: true }); $(this).pageslide({ W: $pageslideW, iframe: true });
} else if($('#items').length) { } else if($('.item-groups').length) {
$(this).pageslide({ W: 324 }); $(this).pageslide({ W: 324 });
} else { } else {
$(this).pageslide(); $(this).pageslide();

2
app/assets/javascripts/lib/jquery.mjs.nestedSortable.js
View File

@ -240,7 +240,7 @@
// for Orbit ----> Check the number of pages in each page // for Orbit ----> Check the number of pages in each page
if($('#items').length) { if($('.item-groups').length) {
var $sortable = $('.sortable'), var $sortable = $('.sortable'),
$host = $sortable.children('.navbar').eq(0), $host = $sortable.children('.navbar').eq(0),
$navbar = $('.sortable li').children('.navbar'), $navbar = $('.sortable li').children('.navbar'),

9
app/assets/javascripts/lib/jquery.pageslide.js
View File

@ -77,7 +77,7 @@
slideAnimateIn['right'] = '+=' + slideWidth; slideAnimateIn['right'] = '+=' + slideWidth;
break; break;
default: default:
if($sidebarState && !$('#items').length) { if($sidebarState && !$('.item-groups').length) {
$pageslide.css({ left: '-' + (slideWidth-241) + 'px', right: 'auto' }); $pageslide.css({ left: '-' + (slideWidth-241) + 'px', right: 'auto' });
}else{ }else{
$pageslide.css({ left: '-' + (slideWidth-61) + 'px', right: 'auto' }); $pageslide.css({ left: '-' + (slideWidth-61) + 'px', right: 'auto' });
@ -123,7 +123,7 @@
// Open // Open
$.pageslide( settings ); $.pageslide( settings );
if($('#items').length) { if($('.item-groups').length) {
$('.item-menu > a, .navbar-inner').removeClass("active"); $('.item-menu > a, .navbar-inner').removeClass("active");
$(this).parents('.navbar-inner').addClass('active').end().addClass('active'); $(this).parents('.navbar-inner').addClass('active').end().addClass('active');
if(!$.support.touch) { if(!$.support.touch) {
@ -136,8 +136,9 @@
}); });
} }
} }
console.log("ff")
$pageName = $self.parents('.item-title').children('a').text(); $pageName = $self.closest('.item-menu').siblings('a').text();
$('.page-name').text($pageName); $('.page-name').text($pageName);
} else if($('.tags-groups').length) { } else if($('.tags-groups').length) {
$(this).parents('li').addClass("active").siblings().removeClass("active").parent('ul').siblings().children('li').removeClass("active"); $(this).parents('li').addClass("active").siblings().removeClass("active").parent('ul').siblings().children('li').removeClass("active");
@ -247,7 +248,7 @@
break; break;
} }
if($('#items').length) { if($('.item-groups').length) {
$(".navbar-inner").removeClass("active"); $(".navbar-inner").removeClass("active");
$('.item-menu > a, .navbar-inner').removeClass("active"); $('.item-menu > a, .navbar-inner').removeClass("active");
if(!$.support.touch) { if(!$.support.touch) {

2
app/assets/javascripts/lib/orbit_js_1.0.1.js
View File

@ -445,7 +445,7 @@ function openSlide() {
$openSlide.each(function() { $openSlide.each(function() {
if($(this).hasClass('view-page')) { if($(this).hasClass('view-page')) {
$(this).pageslide({ W: $pageslideW, iframe: true}); $(this).pageslide({ W: $pageslideW, iframe: true});
} else if($('#items').length) { } else if($('.item-groups').length) {
$(this).pageslide({ W: 324}); $(this).pageslide({ W: 324});
} else { } else {
$(this).pageslide(); $(this).pageslide();

2
app/views/admin/items/index.html.erb
View File

@ -9,7 +9,7 @@
<div id="view-page" class="nano" style="display:none"> <div id="view-page" class="nano" style="display:none">
<div class="page-info clearfix"> <div class="page-info clearfix">
<a class="pull-right" href="javascript:$.pageslide.close()"><i class="icons-arrow-left-2"></i></a> <a class="pull-right" href="javascript:$.pageslide.close()"><i class="icons-arrow-left-2"></i></a>
<h3 class="page-name">Communications and liaison</h3> <h3 class="page-name"></h3>
</div> </div>
<div class="content"> <div class="content">
</div> </div>