diff --git a/htdocs/application/config/routes.php b/htdocs/application/config/routes.php index af32184..f007610 100644 --- a/htdocs/application/config/routes.php +++ b/htdocs/application/config/routes.php @@ -46,7 +46,6 @@ $route['cron/:any'] = "main/cron"; $route['view/raw/:any'] = 'main/raw'; $route['view/rss/:any'] = 'main/rss'; $route['view/embed/:any'] = 'main/embed'; -$route['view/options'] = 'main/view_options'; $route['view/download/:any'] = 'main/download'; $route['view/:any'] = 'main/view'; $route['lists'] = 'main/lists'; diff --git a/htdocs/application/controllers/main.php b/htdocs/application/controllers/main.php index be3a9d4..69dc1fd 100755 --- a/htdocs/application/controllers/main.php +++ b/htdocs/application/controllers/main.php @@ -11,8 +11,6 @@ * - download() * - lists() * - view() - * - _view_options_prep() - * - view_options() * - cron() * - about() * - _valid_lang() @@ -355,15 +353,6 @@ class Main extends CI_Controller } $data = $this->pastes->getPaste(2, true); $data['reply_form'] = $this->_form_prep($data['lang_code'], 'Re: ' . $data['title'], $data['raw'], $data['pid']); - - if ($this->db_session->userdata('full_width')) - { - $data['full_width'] = true; - } - else - { - $data['full_width'] = false; - } $this->load->view('view/view', $data); } else @@ -372,66 +361,6 @@ class Main extends CI_Controller } } - function _view_options_prep() - { - $this->load->helper('form'); - - if ($this->db_session->userdata('remember_view') > 0) - { - $data['full_width_set'] = $this->db_session->userdata('full_width'); - $data['view_raw_set'] = $this->db_session->userdata('view_raw'); - } - else - { - $data['full_width_set'] = false; - $data['view_raw_set'] = false; - } - return $data; - } - - function view_options() - { - - if (!$this->input->post('submit')) - { - $data = $this->_view_options_prep(); - $this->load->view('view/view_options', $data); - } - else - { - $this->load->library('form_validation'); - $rules = array( - array( - 'field' => 'full_width', - 'label' => 'full_width', - 'rules' => 'max_length[1]', - ) , - array( - 'field' => 'view_raw', - 'label' => 'view_raw', - 'rules' => 'max_length[1]', - ) , - ); - $this->form_validation->set_rules($rules); - - if ($this->form_validation->run() == false) - { - exit('Ugh, stupid skiddie.'); - } - else - { - $user_data = array( - 'full_width' => $this->input->post('full_width') , - 'view_raw' => $this->input->post('view_raw') , - 'remember_view' => true - ); - $this->db_session->set_userdata($user_data); - $this->db_session->set_flashdata('settings_changed', 'true'); - redirect(); - } - } - } - function cron() { $this->load->model('pastes'); diff --git a/htdocs/application/views/list.php b/htdocs/application/views/list.php index d8dbb2e..31a6695 100755 --- a/htdocs/application/views/list.php +++ b/htdocs/application/views/list.php @@ -1,5 +1,4 @@ load->view('defaults/header');?> -">Change paste viewing options

Recent Pastes rss

Embed '); ?>" />
- ">Download Paste or ">View RawExpand paste to full width of browser | Change Viewing Options + ">Download Paste or ">View RawExpand paste to full width of browser @@ -27,8 +27,8 @@ -
"> -
"> +
+
diff --git a/htdocs/application/views/view/view_options.php b/htdocs/application/views/view/view_options.php deleted file mode 100755 index 53100ea..0000000 --- a/htdocs/application/views/view/view_options.php +++ /dev/null @@ -1,26 +0,0 @@ -load->view("defaults/header"); ?> - -
-
" method="post"> - -

Change paste viewing options

-

Here you can change your preferences for viewing pastes. Requires cookies to be enabled.

- -
- -
- 'full_width', 'id' => 'full_width', 'value' => '1', 'checked' => $full_width_set); - echo form_checkbox($set); - ?> -

Expand Pastes by default

-
-
-
-
-
-
- -load->view("defaults/footer.php"); ?> diff --git a/htdocs/static/styles/main.css b/htdocs/static/styles/main.css index 7c1fb48..edf13c2 100644 --- a/htdocs/static/styles/main.css +++ b/htdocs/static/styles/main.css @@ -220,10 +220,6 @@ h4 { float: left; } -.form_wrapper.full .text_beside { - width: 250px; -} - .form_wrapper textarea { width: 694px; } @@ -372,10 +368,6 @@ h4 { font-size: 100%; } -.paste.full { - width: 90%; -} - .paste .text_formatted { clear: both; float: left; @@ -387,11 +379,6 @@ h4 { position: relative; } -.paste .text_formatted.full { - width: 100%; - margin-left: 10px; -} - .text_formatted ol { padding-left: 50px; }