Some cleanup, setup improvements and other misc items

application/classes/Controller/Admin/Setup.php

@@ -19,55 +19,29 @@ class Controller_Admin_Setup extends Controller_TemplateDefault {
 	 */
 	public function action_edit() {
 		$o = Company::instance()->so();
-		$output = '';
 
-		if ($_POST) {
-			// Entry updated
-			if ($o->values($_POST)->check() AND $o->save())
-				SystemMessage::add(array(
-					'title'=>'Site Configuration Recorded',
-					'type'=>'info',
-					'body'=>'Site Config successfully recorded.',
-				));
-		}
+		// Store our new values
+		$o->values($_POST);
 
-		$output .= Form::open();
+		// Run validation and save
+		if ($o->changed())
+			if ($o->check() AND $o->save())
+				SystemMessage::factory()
+					->title('Record updated')
+					->type('success')
+					->body(_('Your setup record has been updated.'));
 
-		// site_details
-		$output .= View::factory($this->viewpath())
-			->set('o',$o);;
+		Block::factory()
+			->title('Update Site Configuration')
+			->title_icon('icon-wrench')
+			->type('form-horizontal')
+			->body(View::factory('setup/admin/edit')->set('o',$o));
 
-		$output .= '<div>'.Form::submit('submit','submit',array('class'=>'form_button')).'</div>';
-		$output .= Form::close();
-
-		Block::add(array(
-			'title'=>_('Update Site Configuration'),
-			'body'=>$output,
-		));
-
-		// module_config
-		$output = '';
-		$output .= View::factory($this->viewpath().'/module/head');
-
-		foreach ($o->module_config as $mid => $detail) {
-			$mo = ORM::factory('Module',$mid);
-
-			$output .= View::factory($this->viewpath().'/module/body')
-				->set('mo',$mo);
-
-			Script::add(array('type'=>'stdin','data'=>'
-				$(document).ready(function() {
-					$("div[id='.$mo->name.']").load("'.URL::link('admin',$mo->name.'/setup',TRUE).'");
-				});'
-			));
-		}
-
-		$output .= View::factory($this->viewpath().'/module/foot');
-
-		Block::add(array(
-			'title'=>_('Update Module Specific Configuration'),
-			'body'=>$output,
-		));
+		Block::factory()
+			->title('Update Module Configuration')
+			->title_icon('icon-wrench')
+			->type('form-horizontal')
+			->body(View::factory('setup/admin/module')->set('o',$o)->set('mid',NULL));
 	}
 }
 ?>