135/netdisco
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add sidebar hiding to search as well, and factor JS out to own file

Browse Source
This commit is contained in:
Oliver Gorwits
2012-01-21 00:21:49 +00:00
parent f844938a65
commit 23df3d39dd
6 changed files with 35 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Netdisco/public/css/style.css
View File

@@ -172,8 +172,8 @@ form .clearfix.success input {
/* for placing the sidebar toggle icons */
#sidebar_toggle_img_in {
position: fixed;
top: 55px;
left: 25px;
top: 60px;
left: 205px;
}
/* for placing the sidebar toggle icons */

2
Netdisco/views/device.tt
View File

@@ -6,7 +6,7 @@
<div class="well">
<img class="sidebar_toggle" id="sidebar_toggle_img_in"
src="[% uri_base %]/images/application_side_contract.png"
rel="twipsy" data-placement="right" data-offset="5" title="Hide Sidebar"/>
rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
<h3 class="device_label">[% d.ip %]</h3>
<p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>
<div class="tab-content">

20
Netdisco/views/js/device.js
View File

@@ -114,23 +114,5 @@
};
$('.add-on :checkbox').each(syncCheckBox).click(syncCheckBox);
// sidebar toggle
$('#sidebar_toggle_img_in').click(
function() {
$('.sidebar').toggle(
function() {
$('#sidebar_toggle_img_out').toggle();
$('.nd_content').animate({'margin-left': '5px !important'}, 100);
}
);
}
);
$('#sidebar_toggle_img_out').click(
function() {
$('#sidebar_toggle_img_out').toggle();
$('.nd_content').animate({'margin-left': '225px !important'}, 200,
function() { $('.sidebar').toggle(200) }
);
}
);
[%+ INCLUDE 'js/sidebar.js' -%]
});

2
Netdisco/views/js/search.js
View File

@@ -104,4 +104,6 @@
$(this).parent(".clearfix").addClass('success');
}
});
[%+ INCLUDE 'js/sidebar.js' -%]
});

23
Netdisco/views/js/sidebar.js Normal file
View File

@@ -0,0 +1,23 @@
// sidebar toggle
$('#sidebar_toggle_img_in').click(
function() {
$('#sidebar_toggle_img_in').toggle();
$('.sidebar').toggle(
function() {
$('#sidebar_toggle_img_out').toggle();
$('.nd_content').animate({'margin-left': '5px !important'}, 100);
}
);
}
);
$('#sidebar_toggle_img_out').click(
function() {
$('#sidebar_toggle_img_out').toggle();
$('.nd_content').animate({'margin-left': '225px !important'}, 200,
function() {
$('.sidebar').toggle(200);
$('#sidebar_toggle_img_in').toggle();
}
);
}
);

6
Netdisco/views/search.tt
View File

@@ -1,6 +1,12 @@
<img class="sidebar_toggle" id="sidebar_toggle_img_out"
src="[% uri_base %]/images/application_side_expand.png"
rel="twipsy" data-placement="right" data-offset="5" title="Show Sidebar"/>
<div class="container-fluid">
<div class="sidebar">
<div class="well">
<img class="sidebar_toggle" id="sidebar_toggle_img_in"
src="[% uri_base %]/images/application_side_contract.png"
rel="twipsy" data-placement="below" data-offset="5" title="Hide Sidebar"/>
<div class="tab-content">
[% FOREACH tab IN vars.tabs %]
<div id="[% tab.id %]_search" class="tab-pane [% 'active' IF params.tab == tab.id %]">