PsychoticNinja/Stikked
1
0
Fork 0
mirror of https://github.com/claudehohl/Stikked.git synced 2025-04-26 04:51:08 -05:00
Code Issues Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
Claude 2016-09-04 20:59:03 +02:00
commit 2a8f3e7017
5 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
htdocs/application/controllers/Main.php
View File

@ -512,6 +512,12 @@ class Main extends CI_Controller
if ($check)
{
$data = $this->pastes->getPaste(3);
if (isset($_GET['preview']))
{
$this->load->helper('text');
$data['raw'] = character_limiter($data['raw'], 500);
}
$this->load->view('view/raw', $data);
}
else

7
htdocs/themes/default/css/jquery-ui.min.css vendored Normal file
View File

File diff suppressed because one or more lines are too long

6
htdocs/themes/default/js/jquery-ui-selectable-combined.min.js vendored
View File

File diff suppressed because one or more lines are too long

12
htdocs/themes/default/js/stikked.js
View File

@ -50,6 +50,18 @@ ST.spamadmin = function() {
}
return false;
});
$(document).tooltip({
items: "td.first a",
content: function(done) {
var pid = $(this).attr('href').split('view/')[1];
$.get(base_url + 'view/raw/' + pid + '?preview', function(data) {
done(data);
});
},
show: false,
hide: false
});
}
// needed by .selectable

1
htdocs/themes/default/views/defaults/header.php
View File

@ -28,6 +28,7 @@ $this->carabiner->config(array(
// CSS
$this->carabiner->css('reset.css');
$this->carabiner->css('jquery-ui.min.css');
$this->carabiner->css('fonts.css');
$this->carabiner->css('main.css');
$this->carabiner->css('print.css', 'print');