diff --git a/htdocs/application/views/defaults/footer.php b/htdocs/application/views/defaults/footer.php index 4ec6bfa..3281bad 100755 --- a/htdocs/application/views/defaults/footer.php +++ b/htdocs/application/views/defaults/footer.php @@ -4,7 +4,7 @@ load->view("defaults/stats"); +$this->load->view('defaults/stats'); //Javascript $this->carabiner->js('jquery.js'); diff --git a/htdocs/application/views/view/view_footer.php b/htdocs/application/views/view/view_footer.php index a355b45..2cbc6ad 100755 --- a/htdocs/application/views/view/view_footer.php +++ b/htdocs/application/views/view/view_footer.php @@ -1,4 +1,15 @@ load->view('defaults/footer_message.php'); ?> - load->view("defaults/stats")?> +load->view('defaults/stats'); + +//Javascript +$this->carabiner->js('jquery.js'); +$this->carabiner->js('jquery.timers.js'); +$this->carabiner->js('jquery.clipboard.js'); +$this->carabiner->js('stikked.js'); + +$this->carabiner->display('js'); + +?> diff --git a/htdocs/static/js/stikked.js b/htdocs/static/js/stikked.js index 9197eca..5e7b851 100644 --- a/htdocs/static/js/stikked.js +++ b/htdocs/static/js/stikked.js @@ -23,8 +23,17 @@ ST.show = function() { ST.expand = function() { $('.expand').click(function() { - $('.paste').css('width', '90%'); - $('.text_formatted').hide().css('width', '100%').css('margin-left', '0').fadeIn(500); + var window_width = $(window).width(); + if(window_width > 900){ + var spacer = 20; //Math.round(window_width / 10); + var new_width = (window_width - (spacer * 3)); + + $('.text_formatted').animate({ + 'width': new_width+'px', + 'left': '-'+(((window_width - 900) / 2 - spacer))+'px' + }, 200); + } + return false; }); }; diff --git a/htdocs/static/styles/main.css b/htdocs/static/styles/main.css index 168c0a6..76c0c29 100644 --- a/htdocs/static/styles/main.css +++ b/htdocs/static/styles/main.css @@ -378,6 +378,7 @@ h4 { margin-top: 10px; margin-left: 10px; background: #ebf4fb; + position: relative; } .paste .text_formatted.full {