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

style fixes for sidebar in/out

Browse Source
This commit is contained in:
Oliver Gorwits
2012-02-01 13:37:17 +00:00
parent c7bae9b638
commit 74c8443d9f
4 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Netdisco/public/css/netdisco.css
View File

@@ -205,9 +205,9 @@ h3.device_label {
/* for placing the sidebar toggle icons */ /* for placing the sidebar toggle icons */
#sidebar_toggle_img_in { #sidebar_toggle_img_in {
float: right; float: left;
margin-top: -7px; margin-top: -6px;
margin-right: -16px; margin-left: -18px;
cursor: pointer; cursor: pointer;
} }
@@ -226,8 +226,7 @@ h3.device_label {
/* make the sidebar fixed on the screen */ /* make the sidebar fixed on the screen */
.container-fluid > .sidebar { .container-fluid > .sidebar {
position: fixed; position: absolute;
margin-top: 50px;
right: 20px; right: 20px;
width: 200px; width: 200px;
left: auto; left: auto;

5
Netdisco/public/javascripts/netdisco.js
View File

@@ -120,7 +120,7 @@ $(document).ready(function() {
$('.sidebar').toggle( $('.sidebar').toggle(
function() { function() {
$('#sidebar_toggle_img_out').toggle(); $('#sidebar_toggle_img_out').toggle();
$('.content').animate({'margin-right': '10px !important'}, 100); $('.content').animate({'margin-right': '10px !important'}, 50);
$('.device_label_right').toggle(); $('.device_label_right').toggle();
} }
); );
@@ -129,10 +129,11 @@ $(document).ready(function() {
$('#sidebar_toggle_img_out').click( $('#sidebar_toggle_img_out').click(
function() { function() {
$('#sidebar_toggle_img_out').toggle(); $('#sidebar_toggle_img_out').toggle();
$('.content').animate({'margin-right': '220px !important'}, 200, $('.content').animate({'margin-right': '220px !important'}, 100,
function() { function() {
$('.device_label_right').toggle(); $('.device_label_right').toggle();
$('.sidebar').toggle(200); $('.sidebar').toggle(200);
$(window).scrollTop(0);
} }
); );
} }

4
Netdisco/views/device.tt
View File

@@ -1,12 +1,12 @@
<img class="sidebar_toggle" id="sidebar_toggle_img_out" <img class="sidebar_toggle" id="sidebar_toggle_img_out"
src="[% uri_base %]/images/dusseldorf_settings.png" src="[% uri_base %]/images/diagona_settings.png"
rel="twipsy" data-placement="left" data-offset="5" title="Show Options"/> rel="twipsy" data-placement="left" data-offset="5" title="Show Options"/>
<div class="container-fluid"> <div class="container-fluid">
<div class="sidebar"> <div class="sidebar">
<div class="well"> <div class="well">
<img class="sidebar_toggle" id="sidebar_toggle_img_in" <img class="sidebar_toggle" id="sidebar_toggle_img_in"
src="[% uri_base %]/images/splashyfish_right.png" src="[% uri_base %]/images/splashyfish_right.png"
rel="twipsy" data-placement="left" data-offset="5" title="Hide"/> rel="twipsy" data-placement="left" data-offset="5" title="Hide Sidebar"/>
<h3 class="device_label">[% d.ip %]</h3> <h3 class="device_label">[% d.ip %]</h3>
[% IF d.dns %] [% IF d.dns %]
<p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p> <p class="device_label">[% d.dns.remove(settings.domain_suffix) %]</p>

4
Netdisco/views/search.tt
View File

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