Пара багфиксов.

This commit is contained in:
Linux User 2011-07-12 12:19:38 +08:00
parent 78c94ef5fe
commit dd37096a58
2 changed files with 2 additions and 2 deletions

View file

@ -11,7 +11,7 @@ class Controller_Navigation extends Controller_Template {
if (Auth::instance()->logged_in('admin')){ if (Auth::instance()->logged_in('admin')){
$this->template->admin_actions = View::factory('navigation/admin')->render(); $this->template->admin_actions = View::factory('navigation/admin')->render();
} }
$this->template->pages = ORM::factory('page')->where('id','>',1)->find_all(); $this->template->pages = ORM::factory('page')->where('id','>',1)->order_by('order')->find_all();
} }
public function action_view(){$this->request->redirect('');} public function action_view(){$this->request->redirect('');}
} }

View file

@ -61,7 +61,7 @@ a, a:visited{
margin: 0 2em 0 6em; margin: 0 2em 0 6em;
text-align: justify; text-align: justify;
width: 70%; width: 70%;
min-height: 500px; min-height: 600px;
} }
#footer{ #footer{
/*clear: both;*/ /*clear: both;*/