Changed: #1315 Update.

--HG--
branch : gsoc2011-kerozcak

code/ryzom/tools/server/www/webtt/app/config/database.php

@@ -8,11 +8,14 @@ class DATABASE_CONFIG {
 		'login' => 'webtt',
 		'password' => 'webtt77',
 		'database' => 'webtt2',
-		'encoding' => 'y'
+		'encoding' => 'utf8'
 	);
 	var $raw_files = array(
-		'driver' => "",
+		'datasource' => 'RawFilesSource',
-		'datasource' => 'raw_files',
+		'path' => '/home/kaczorek/projects/webtt/distfiles/translation',
+		'extension' => '(uxt|txt)',
+		'readonly' => true,
+		'recursive' => true,
 	);
 }
 ?>

code/ryzom/tools/server/www/webtt/app/config/routes.php

@@ -31,3 +31,9 @@
  * ...and connect the rest of 'Pages' controller's urls.
  */
 	Router::connect('/pages/*', array('controller' => 'pages', 'action' => 'display'));
+/**
+ * Connect 'Pages' controller's urls for admin prefix.
+ */
+	Router::connect('/admin/pages/*', array('controller' => 'pages', 'action' => 'display', 'admin' => true));
+	Router::connect('/admin/pages', array('controller' => 'pages', 'action' => 'display', 'admin' => true, 'home'));
+	Router::connect('/admin', array('controller' => 'pages', 'action' => 'display', 'admin' => true, 'home'));

code/ryzom/tools/server/www/webtt/app/controllers/app_controller.php

@@ -33,5 +33,41 @@
  * @link http://book.cakephp.org/view/957/The-App-Controller
  */
 class AppController extends Controller {
-	var $components = array('DebugKit.Toolbar', 'Session');
+	var $components = array('DebugKit.Toolbar', 'Session', 'PathResolver', 'Auth' => array("authorize"=>"controller"));
+	var $layout = "new";
+	
+	function beforeFilter() {
+		parent::beforeFilter();
+		$this->Auth->loginAction = array('admin' => false, 'controller' => 'users', 'action' => 'login');
+
+		if ($this->Auth->user('role') == "admin")
+			$this->Auth->allow("*");
+		else if ($this->Auth->user())
+		{
+			// $this->Auth->allow('index', 'view', 'add', 'delete', 'edit');
+			foreach ($this->methods as $method)
+				if (mb_strpos($method, 'admin_') !== 0)
+					$this->Auth->allow($method);
+		}
+	}
+
+	function isAuthorized() {
+/*		if (isset($this->params['prefix']) && $this->params['prefix'] == "admin" && $this->Auth->user('role') != "admin")
+		{
+			return false;
+		}
+
+		return true;*/
+		$action = $this->params['action'];
+		$allowedActions = array_map('strtolower', $this->Auth->allowedActions);
+		$isAllowed = (
+			$this->Auth->allowedActions == array('*') ||
+			in_array($action, $allowedActions)
+		);
+//		$this->log($isAllowed);
+		return $isAllowed;
+//		
+	}
+
+
 }

code/ryzom/tools/server/www/webtt/app/controllers/file_identifiers_controller.php

@@ -26,9 +26,9 @@ class FileIdentifiersController extends AppController {
 				$this->Session->setFlash(__('The file identifier could not be saved. Please, try again.', true));
 			}
 		}
-		$translationFiles = $this->FileIdentifier->TranslationFile->find('list');
+		$importedTranslationFiles = $this->FileIdentifier->ImportedTranslationFile->find('list');
 		$identifiers = $this->FileIdentifier->Identifier->find('list');
-		$this->set(compact('translationFiles', 'identifiers'));
+		$this->set(compact('importedTranslationFiles', 'identifiers'));
 	}
 
 	function edit($id = null) {
@@ -47,9 +47,9 @@ class FileIdentifiersController extends AppController {
 		if (empty($this->data)) {
 			$this->data = $this->FileIdentifier->read(null, $id);
 		}
-		$translationFiles = $this->FileIdentifier->TranslationFile->find('list');
+		$importedTranslationFiles = $this->FileIdentifier->ImportedTranslationFile->find('list');
 		$identifiers = $this->FileIdentifier->Identifier->find('list');
-		$this->set(compact('translationFiles', 'identifiers'));
+		$this->set(compact('importedTranslationFiles', 'identifiers'));
 	}
 
 	function delete($id = null) {
@@ -87,9 +87,9 @@ class FileIdentifiersController extends AppController {
 				$this->Session->setFlash(__('The file identifier could not be saved. Please, try again.', true));
 			}
 		}
-		$translationFiles = $this->FileIdentifier->TranslationFile->find('list');
+		$importedTranslationFiles = $this->FileIdentifier->ImportedTranslationFile->find('list');
 		$identifiers = $this->FileIdentifier->Identifier->find('list');
-		$this->set(compact('translationFiles', 'identifiers'));
+		$this->set(compact('importedTranslationFiles', 'identifiers'));
 	}
 
 	function admin_edit($id = null) {
@@ -108,9 +108,9 @@ class FileIdentifiersController extends AppController {
 		if (empty($this->data)) {
 			$this->data = $this->FileIdentifier->read(null, $id);
 		}
-		$translationFiles = $this->FileIdentifier->TranslationFile->find('list');
+		$importedTranslationFiles = $this->FileIdentifier->ImportedTranslationFile->find('list');
 		$identifiers = $this->FileIdentifier->Identifier->find('list');
-		$this->set(compact('translationFiles', 'identifiers'));
+		$this->set(compact('importedTranslationFiles', 'identifiers'));
 	}
 
 	function admin_delete($id = null) {

code/ryzom/tools/server/www/webtt/app/controllers/identifiers_controller.php

@@ -2,10 +2,42 @@
 class IdentifiersController extends AppController {
 
 	var $name = 'Identifiers';
-
+//	var $layout = "new";
 	function index() {
 		$this->Identifier->recursive = 0;
-		$this->set('identifiers', $this->paginate());
+//		Router::connectNamed(array('language'));
+		 
+		$conditions = null;
+		if (isset($this->passedArgs['language']) && $lang = $this->passedArgs['language'])
+			$conditions = array('Identifier.language_id' => $lang);
+		if (isset($this->passedArgs['translation_file_id']) && $translation_file_id = $this->passedArgs['translation_file_id'])
+			$conditions = array('Identifier.translation_file_id' => $translation_file_id);
+		$this->set('identifiers', $this->paginate($conditions));
+	}
+
+	function admin_withoutBestTranslation()
+	{
+		if (isset($this->passedArgs['imported_translation_file_id']) && $imported_translation_file_id = $this->passedArgs['imported_translation_file_id'])
+		{
+			$identifier_ids = $this->Identifier->withoutBestTranslation(array('ImportedTranslationFile.id' => $this->passedArgs['imported_translation_file_id']));
+			if ($identifier_ids === false)
+			{
+				$this->Session->setFlash(__('Error: no conditions specified', true));
+			}
+			else
+			{
+				$conditions = array('Identifier.id' => $identifier_ids, 'BestTranslation.id' => NULL);
+				$this->set('identifiers', $this->paginate($conditions));
+			}
+//			$this->log($this->Identifier->withoutBestTranslation(array('ImportedTranslationFile.id' => $this->passedArgs['imported_translation_file_id'])));
+			// TOTHINK: try to achieve that with custom find with pagination
+		}
+		else
+		{
+			$this->Session->setFlash(__('No imported file specified', true));
+			$this->redirect($this->referer());
+		}
+		$this->render('index');
 	}
 
 	function view($id = null) {

code/ryzom/tools/server/www/webtt/app/controllers/imported_translation_files_controller.php

@@ -2,7 +2,7 @@
 class ImportedTranslationFilesController extends AppController {
 
 	var $name = 'ImportedTranslationFiles';
-	var $layout = "default_debug";
+//	var $layout = "default_debug";
 	function index() {
 		$this->ImportedTranslationFile->recursive = 0;
 		$this->set('importedTranslationFiles', $this->paginate());
@@ -149,6 +149,7 @@ class ImportedTranslationFilesController extends AppController {
 	}
 	function admin_index() {
 		$this->ImportedTranslationFile->recursive = 0;
+//		FireCake::dump("??",$_SERVER);
 		$this->set('importedTranslationFiles', $this->paginate());
 	}
 
@@ -157,7 +158,7 @@ class ImportedTranslationFilesController extends AppController {
 			$this->Session->setFlash(__('Invalid translation file', true));
 			$this->redirect(array('action' => 'index'));
 		}
-		$this->set('translationFile', $this->ImportedTranslationFile->read(null, $id));
+		$this->set('importedTranslationFile', $this->ImportedTranslationFile->read(null, $id));
 	}
 
 	function admin_add() {

code/ryzom/tools/server/www/webtt/app/controllers/languages_controller.php

@@ -9,6 +9,7 @@ class LanguagesController extends AppController {
 		FireCake::enable();
 		firecake('testestestes');
 		FireCake::dump('test','testsss');*/
+		App::import("Vendor","functions_render");
 		$this->Language->recursive = 0;
 		$this->set('languages', $this->paginate());
 	}

code/ryzom/tools/server/www/webtt/app/controllers/raw_files_controller.php

@@ -5,33 +5,51 @@ class RawFilesController extends AppController {
 	var $helpers = array('Paginator', 'Time', 'Session');
 	var $components = array('Session');
 
-	function index() {
+	function admin_index() {
 		$this->RawFile->recursive = 1;
 //		var_dump($this->RawFile->find('count'));
 //		$db =& ConnectionManager::getDataSource($this->RawFile->useDbConfig);
 //		var_dump($db->calculate($this->RawFile, 'count'));
-		$this->set('rawFiles', $this->paginate());
+		$conditions['RawFile.dir'] = array("diff","translated");
+		$this->set('rawFiles', $this->paginate($conditions));
+//		$this->log(Router::parse($this->referer()));
 //		var_dump($this->paginate());
 	}
 
-	function admin_index() {
+	function admin_listdir($extension = null) {
-		$this->index();
-	}
-
-	function listdir($ext = null) {
 		$this->RawFile->recursive = 0;
-		$this->set('rawFiles', $this->paginate(array("ext" => $ext)));
+		$this->set('rawFiles', $this->paginate(array("RawFile.extension" => $extension)));
+		$this->rendeR("admin_index");
 //		var_dump($this->paginate());
 	}
 
-	function view($id = null) {
+	function admin_view($dir = null, $filename = null) {
-		if (!$id) {
+		if (!$filename) {
 			$this->Session->setFlash(__('Invalid raw file', true));
 			$this->redirect(array('action' => 'index'));
 		}
-		$this->set('rawFile', $this->RawFiles->read(null, $id));
+		if (!$this->RawFile->open($dir, $filename))
+		{
+			$this->Session->setFlash(__('Can\'t open file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+//		$id = $dir . DS . $filename;
+//		$this->set('rawFile', $this->RawFile->read(null, $id));
+		$this->set('rawFile', $rawFile = $this->RawFile->find('first', array(
+			"conditions" => array(
+				"RawFile.dir" => $dir,
+				"RawFile.filename" => $filename,
+				),
+					)));
+		
+		$this->set('fileContent', $this->RawFile->_currentFile->read());
 	}
 
+/*	function import($dir = null, $filename = null) {
+		$this->admin_import($dir, $filename);
+	}*/
+
 	function admin_import($dir = null, $filename = null) {
 //		$this->view = "index";
 //		App::import("Vendor","UxtParser", array("file" => 'UxtParser.php'));
@@ -47,12 +65,16 @@ class RawFilesController extends AppController {
 			return 0;
 		}
 		$importedTranslationFileModel = $this->RawFile->ImportedTranslationFile;
-		$languageModel = $importedTranslationFileModel->Language;
+		$translationFileModel = $importedTranslationFileModel->TranslationFile;
-		$identifierModel = $languageModel->Identifier;
+		$languageModel = $translationFileModel->Language;
+//		$identifierModel = $languageModel->Identifier;
+		$identifierModel = $translationFileModel->Identifier;
+		$identifierColumnModel = $identifierModel->IdentifierColumn;
+		$translationModel = $identifierModel->Translation;
 		$fileIdentifierModel = $importedTranslationFileModel->FileIdentifier;
 
 //		$filename="diff/pl_diff_4DEC868A.uxt";
-		$importedTranslationFile = $importedTranslationFileModel->find('first', array('conditions' => array('ImportedTranslationFile.filename' => $dir . DS . $filename)));
+		$importedTranslationFile = $importedTranslationFileModel->find('first', array('conditions' => array('ImportedTranslationFile.filename' => $dir . DS . $filename), "recursive" => -1));
 /*		var_dump($translationFile);
 		return 0;*/
 		if ($importedTranslationFile)
@@ -63,8 +85,6 @@ class RawFilesController extends AppController {
 		}
 //		var_dump($file);
 //		$parser = new UxtParser();
-		$parsedFile = $this->RawFile->parseFile($filename);
-//		var_dump($parsedFile);
 //		$arr = explode("_", basename($filename, ".uxt"));
 //		var_dump($arr);
 
@@ -76,7 +96,7 @@ class RawFilesController extends AppController {
 			$this->redirect(array('action' => 'index'));
 			return 0;
 		}
-		$language = $importedTranslationFileModel->Language->find('first', array('conditions' => array('code' => $languageCode)));
+		$language = $languageModel->find('first', array('conditions' => array('code' => $languageCode), "recursive" => -1));
 		$language_id = $language['Language']['id'];
 		if (!$language_id)
 		{
@@ -89,66 +109,451 @@ class RawFilesController extends AppController {
 //			var_dump($language_id);
 		}
 
+		$filename_template = preg_replace('/_diff/', '', $filename);
+		$filename_template = preg_replace('/_[A-F0-9]{8}/', '', $filename_template);
+
+//		for global identifiers
+/*		if (preg_match('|^.*_' . $language['Language']['code'] . '.*$|', $filename_template, $matches))
+			$filename_template = preg_replace('/_' . $language['Language']['code'] . '/', '_LC', $filename_template);
+		else if (preg_match('|^.*' . $language['Language']['code'] . '.*$|', $filename_template, $matches))
+			$filename_template = preg_replace('/' . $language['Language']['code'] . '/', 'LC', $filename_template);
+		else
+		{
+			$this->Session->setFlash(__('Can\'t create master translation filename template from current filename', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}*/
+		
+		$translationFile = $translationFileModel->find('first', array('conditions' => array('filename_template' => $filename_template), "recursive" => -1));
+		if (!$translationFile)
+		{
+			$tf_data['filename_template'] = $filename_template;
+			$tf_data['language_id'] = $language_id;
+		}
+		else
+			$tf_data['id'] = $translationFile['TranslationFile']['id'];
+
+		$res = $translationFileModel->saveAll(array('TranslationFile' => $tf_data));
+		$translation_file_id = $translationFileModel->id;
+
+		$parsedFile = $this->RawFile->parseFile();
+/*		var_dump($parsedFile);
+		$this->render('index');
+		return 0;*/
+//		$this->log($parsedFile);
+		if (!$parsedFile)
+		{
+			$this->Session->setFlash(__('Error importing file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+//		$this->log($parsedFile);
 //		return 0;
 
+		ini_set('max_execution_time',0);
+
+		$processedEntities = 0;
+
 		$importedTranslationFileModel->create();
 		$data['ImportedTranslationFile']['language_id'] = $language_id;
+		$data['ImportedTranslationFile']['translation_file_id'] = $translation_file_id;
 		$data['ImportedTranslationFile']['filename'] = $dir . DS . $filename;
+		$data['ImportedTranslationFile']['file_last_modified_date'] = $this->RawFile->_currentFileLastChange;
+
+//			$data['TranslationFile'] = $tf_data;
+		$importedTranslationFileModel->saveAll($data);
+		$importedTranslationFile_id = $importedTranslationFileModel->id;
+
 		//$this->ImportedTranslationFile->save($data);
 		foreach ($parsedFile as $ent)
 		{
-			$fi_data = array();
+			if (!isset($ent['type']))
-			if ($ent['type'] != "string")
+				var_dump($ent);
+
+			if ($ent['type'] == 'sheet_description')
+			{
+				$_columns = $ent['columns'];
+				$_sheet_id_column = $ent['sheet_id_column'];
+			}
+
+			if ($ent['type'] != "string" && $ent['type'] != "phrase" && $ent['type'] != 'sheet')
 				continue;
 
+			$newIdentifier = false;
+			$i_data = array();
 			$i_data['language_id'] = $language_id;
+			$i_data['translation_file_id'] = $translation_file_id;
+			if (isset($ent['index']))
 				$i_data['translation_index'] = $ent['index'];
+			if (isset($ent['arguments']))
+				$i_data['arguments'] = $ent['arguments'];
+	
+			if (isset($ent['diff']) && isset($ent['string']))
+			{
 				$i_data['reference_string'] = $ent['string'];
+			}
 
 			unset($identifierModel->id);
-			$identifier = $identifierModel->find('first',array('conditions' => array('Identifier.identifier' => $ent['identifier'], 'Identifier.language_id' => $language_id)));
+			$identifier = $identifierModel->find('first',array('conditions' => array('Identifier.identifier' => $ent['identifier'], 'Identifier.translation_file_id' => $translation_file_id), 'contain' => 'IdentifierColumn'));
+			//App::import('Vendor', 'DebugKit.FireCake');
+//			FireCake::log($ent['identifier'], "Identifier");
+//			FireCake::dump("identifier",$identifier);
+/*			$this->log($ent['identifier']);
+			$this->log($identifier);*/
 			if ($identifier)
 			{
 //				var_dump($identifier);
 				$i_data['id']=$identifier['Identifier']['id'];
+//				$this->log("found");
 			}
 			else
 			{
+				$identifierModel->create();
 				$i_data['identifier'] = $ent['identifier'];
+				if (isset($ent['diff']))
 					$i_data['translated'] = false;
+				$newIdentifier = true;
+//				$this->log("not found");
+//				$this->log("id: # " . $identifierModel->id . " #");
+//				$this->log($i_data);
+
 			}
 //			var_dump($i_data);
-			$identifierModel->save(array('Identifier' => $i_data));
+			$res = $identifierModel->saveAll($tarr = array('Identifier' => $i_data));
 			$identifier_id = $identifierModel->id;
-//			var_dump($identifier_id);
+/*			$this->log('identifier saveAll res');
+			$this->log($res);
+			$this->log(var_export($res,true));
+			$this->log($identifierModel->validationErrors);
+			$this->log($identifierModel);
+			$this->log('#identifier id');
+			$this->log($identifier_id);
+			$this->log("tarr");
+			$this->log($tarr);*/
+
+			if (isset($ent['columns']) && is_array($ent['columns']))
+			{
+/*				$this->log($_columns);
+				$this->log($ent['columns']);*/
+				$ic_data = array();
+				foreach ($ent['columns'] as $column_no => $value)
+				{
+					unset($identifierColumnModel->id);
+					$ic_arr = array();
+					$ic_arr['identifier_id'] = $identifier_id;
+					$column_name = $_columns[$column_no];
+/*					$this->log($identifier);
+					$this->log($column_name);*/
+					if (!$newIdentifier)
+					{
+						foreach ($identifier['IdentifierColumn'] as $identifierColumn_no => $identifierColumn)
+						{
+							if ($identifierColumn['column_name'] == $column_name)
+							{
+								$ic_arr['id'] = $identifierColumn['id'];
+								break;
+							}
+						}
+					}
+					$ic_arr['column_name'] = $column_name;
+					if (isset($ent['diff']))
+						$ic_arr['reference_string'] = $value;
+					$ic_data[] = $ic_arr;
+//					$this->log($ic_arr);
+					$res = $identifierColumnModel->save($ic_arr);
+//					$this->log($res);
+					$identifierColumn_id = $identifierColumnModel->id;
+/*					$this->log($identifierColumnModel->validationErrors);
+					$this->log(var_export($res,true));*/
+					
+					if (!isset($ent['diff'])) // it is translated file and we add translation
+					{
+						unset($translationModel->id);
+						if ($newIdentifier) // ovbiously there's no translation for identifier we just created
+							$translation = array();
+						else
+							$translation = $translationModel->find('first',array('conditions' => array('Translation.identifier_column_id' => $identifierColumn_id, 'Translation.translation_text' => $value), "recursive" => -1));
+
+						if (!$translation)
+						{
+							$t_data['identifier_column_id'] = $identifierColumn_id;
+							$t_data['translation_text'] = $value;
+							// TODO: change user_id for authorized user
+							$t_data['user_id'] = 1;
+						}
+						else
+							$t_data['id'] = $translation['Translation']['id'];
+//						var_dump($i_data);
+						$translationModel->save(array('Translation' => $t_data));
+					}
+
+				}
+/*				$res = $identifierColumnModel->saveAll($tarr = array('IdentifierColumn' => $ic_data));
+				$this->log($tarr);
+				$this->log(var_export($res,true));
+				$this->log($identifierColumnModel->validationErrors);*/
+			}
+			else
+			{
+				if (!isset($ent['diff'])) // it is translated file and we add translation
+				{
+					unset($translationModel->id);
+					if ($newIdentifier) // ovbiously there's no translation for identifier we just created
+						$translation = array();
+					else
+						$translation = $translationModel->find('first',array('conditions' => array('Translation.identifier_id' => $identifier_id, 'Translation.translation_text' => $ent["string"]), "recursive" => -1));
+					if (!$translation)
+					{
+						$t_data['identifier_id'] = $identifier_id;
+						if (isset($ent['string'])) // sheets doesn't have string (they have columns)
+							$t_data['translation_text'] = $ent['string'];
+						// TODO: change user_id for authorized user
+						$t_data['user_id'] = 1;
+					}
+					else
+						$t_data['id'] = $translation['Translation']['id'];
+//					var_dump($i_data);
+					$translationModel->save(array('Translation' => $t_data));
+				}
+			}
 
 			unset($fileIdentifierModel->id);
-			//TODO - set FileIdentifier['id'] if we import already imported file (importing imported file temporarly disabled)
+			$fi_data = array();
+			$fi_data['imported_translation_file_id'] = $importedTranslationFile_id;
+			// TOTHINK - set FileIdentifier['id'] if we import already imported file (not supporting importing imported file)
 //			$identifier = $this->ImportedTranslationFile->FileIdentifier->find('first',array('conditions' => array('FileIdentifier.identifier' => $ent['identifier'], 'FileIdentifier.translation_file_id' => $)));
 //			$data['FileIdentifier']['translation_file_id'] = $this->ImportedTranslationFile->id;
-			if ($ent['diff'])
+			if (isset($ent['arguments']))
+				$fi_data['arguments'] = $ent['arguments'];
+
+			if (isset($_sheet_id_column))
+				$fi_data['arguments'] = $_sheet_id_column;
+
+			if (isset($ent['diff'])) // it is diff file
+			{
+				if (isset($ent['command']))
+					$fi_data['command'] = $ent['command'];
+				else
 					$fi_data['command'] = "DIFF " . mb_strtoupper($ent['diff']);
+
+				if (isset($ent['string']))
+					$fi_data['reference_string'] = $ent['string'];
+
+				if (isset($ent['index']))
 					$fi_data['translation_index'] = $ent['index'];
 //				$data['FileIdentifier']['identifier_id'] = ;
-			$fi_data['reference_string'] = $ent['string'];
 				$fi_data['identifier_id'] = $identifier_id;
 
+				$res = $fileIdentifierModel->saveAll($tarr = array('FileIdentifier' => $fi_data));
+//				$this->log($res);
+/*				$this->log("#fi_data");
+				$this->log($fi_data);*/
+				$fileIdentifier_id = $fileIdentifierModel->id;
+			}
+
 //			$this->ImportedTranslationFile->FileIdentifier->create();
 //			$this->ImportedTranslationFile->FileIdentifier->save($data);
-			$data['FileIdentifier'][] = $fi_data;
+//			$data['FileIdentifier'][] = $fi_data;
 //			$l_data['Language']['id'] = $language_id;
 //			$l_data['Identifier'][] = $i_data;
 //			$data['Identifier'][] = $i_data;
+
+			$processedEntities++;
+
 		}
+/*		$this->render('admin_index');
+		return 0;*/
 //		var_dump($data);
 //		$this->ImportedTranslationFile->Language->saveAll($l_data);
-		$importedTranslationFileModel->saveAll($data);
+		if ($processedEntities == 0)
-		$this->Session->setFlash(__('Translation file imported', true));
+		{
+			$importedTranslationFileModel->delete($importedTranslationFile_id);
+			$this->Session->setFlash(__('File was not imported because it seems empty', true));
+//			$this->redirect(array('action' => 'index'));
+			$this->redirect($this->referer());
+			return 0;
+		}
+		else
+		{
+			$this->Session->setFlash(__('Translation file imported into database successfully. Processed entities: ' . $processedEntities, true));
 			$this->redirect(array('controller' => 'imported_translation_files', 'action' => 'view', $importedTranslationFileModel->id));
+//			$this->render('admin_index');
+			return 0;
+		}
 //		$this->ImportedTranslationFile->recursive = 0;
 //		$this->set('importedTranslationFiles', $this->paginate());
 //		$this->render('index');
 	}
 
+	function admin_export($dir = null, $filename = null, $importedTranslationFileId = null) {
+		if (!$filename) {
+			$this->Session->setFlash(__('Invalid file', true));
+			$this->redirect($this->referer());
+//			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+		if (!$this->RawFile->open($dir, $filename, $writable = true))
+		{
+			$this->Session->setFlash(__('Can\'t open file for writing', true));
+			$this->redirect($this->referer());
+//			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+
+		$importedTranslationFileModel = $this->RawFile->ImportedTranslationFile;
 
+		$importedTranslationFileModel->contain(array(
+			'TranslationFile',
+			'FileIdentifier' => array('Identifier' => array(
+				'Translation',
+				'IdentifierColumn' => 'Translation',
+				)),
+		));
+
+		$importedTranslationFile = $importedTranslationFileModel->find('first', array(
+			'conditions' => array(
+				'ImportedTranslationFile.filename' => $dir . DS . $filename
+				),
+//			'recursive' => 3
+//			'order' => 'FileIdentifier.translation_index',
+			)
+		);
+/*		var_dump($translationFile);
+		return 0;*/
+		if (!$importedTranslationFile)
+		{
+			$this->Session->setFlash(__('No imported translation file found for chosen file', true));
+			$this->redirect($this->referer());
+//			$this->redirect(array('controller' => 'imported_translation_files', 'action' => 'index'));
+			return 0;
+		}
+		
+		$translationFileModel = $importedTranslationFileModel->TranslationFile;
+		$identifierModel = $translationFileModel->Identifier;
+
+		// TODO: check if all identifiers have "best" translation
+		$identifier_ids = $identifierModel->withoutBestTranslation(array('ImportedTranslationFile.id' => $importedTranslationFile['ImportedTranslationFile']['id']));
+		if ($identifier_ids === false)
+		{
+			$this->Session->setFlash(__('Error: no conditions specified', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+		else if (count($identifier_ids) > 0)
+		{
+			$this->Session->setFlash(__('Best translation is not set for some of the identifiers in this file. Set best translation before export.', true));
+			$this->redirect(array('controller' => 'identifiers', 'action' => 'withoutBestTranslation', 'imported_translation_file_id' => $importedTranslationFile['ImportedTranslationFile']['id']));
+			return 0;
+		}
+
+		$translationFile_id = $importedTranslationFile['ImportedTranslationFile']['translation_file_id'];
+
+		$i=0;
+		$sortResult = Set::sort($importedTranslationFile['FileIdentifier'], '{n}.translation_index', 'asc');
+		if (!$sortResult)
+		{
+			$this->Session->setFlash(__('Sorting error', true));
+			$this->redirect($this->referer());
+			return 0;
+		}
+
+		foreach ($sortResult as $fileIdentifier)
+		{
+			if ($fileIdentifier['Identifier']['IdentifierColumn'] && !isset($entities[0]))
+			{
+				foreach ($fileIdentifier['Identifier']['IdentifierColumn'] as $column_no => $identifierColumn)
+					$_columns[$column_no] = $identifierColumn['column_name'];
+				$ent['columns'] = $_columns;
+				$ent['type'] = 'sheet_description';
+				$ent['sheet_id_column'] = $fileIdentifier['arguments'];
+				$ent['diff'] = ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? true : null);
+				$entities[] = $ent;
+				$ent = array();
+			}
+			$ent = array(
+				'diff' => ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? $fileIdentifier['command'] : null),
+				'command' => ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? $fileIdentifier['command'] : null),
+				'index' => ((isset($fileIdentifier['translation_index']) && !empty($fileIdentifier['translation_index'])) ? $fileIdentifier['translation_index'] : null),
+				'internal_index' => $i++,
+				'type' => ((count($fileIdentifier['Identifier']['IdentifierColumn']) > 0) ? 'sheet' : 'string'),
+//				'type' => ((isset($fileIdentifier['command']) && !empty($fileIdentifier['command'])) ? $fileIdentifier['command'] : null),
+				'identifier' => $fileIdentifier['Identifier']['identifier'],
+				'arguments' => ((isset($fileIdentifier['arguments']) && !empty($fileIdentifier['arguments'])) ? $fileIdentifier['arguments'] : null),
+//				'string' => '',
+			);
+//			$this->log($fileIdentifier['Identifier']['Translation']);
+//			if (Set::numeric(array_keys($fileIdentifier['Identifier']['Translation'])))
+			if (isset($fileIdentifier['Identifier']['Translation'][0]))
+			{
+//				$this->log('numeric');
+				$ent['string'] = $fileIdentifier['Identifier']['Translation'][0]['translation_text'];
+			}
+			else if (isset($fileIdentifier['Identifier']['Translation']['translation_text']))
+				$ent['string'] = $fileIdentifier['Identifier']['Translation']['translation_text'];
+
+			if (isset($fileIdentifier['Identifier']['BestTranslation']['translation_text']))
+				$ent['string'] = $fileIdentifier['Identifier']['BestTranslation']['translation_text'];
+
+			if (($export_reference_if_empty_translation = true) && !isset($ent['string']))
+				$ent['string'] = $fileIdentifier['Identifier']['reference_string'];
+			else if (!isset($ent['string']))
+				$ent['string'] = '';
+
+			foreach ($fileIdentifier['Identifier']['IdentifierColumn'] as $column_no => $identifierColumn)
+			{
+/*				if (isset($identifierColumn['Translation']['translation_text']))
+					$ent['columns'][$column_no] = $identifierColumn['Translation']['translation_text'];*/
+
+				if (isset($identifierColumn['Translation'][0]))
+					$ent['columns'][$column_no] = $identifierColumn['Translation'][0]['translation_text'];
+				else if (isset($identifierColumn['Translation']['translation_text']))
+					$ent['columns'][$column_no] = $identifierColumn['Translation']['translation_text'];
+
+				if (isset($identifierColumn['BestTranslation']['translation_text']))
+					$ent['columns'][$column_no] = $identifierColumn['BestTranslation']['translation_text'];
+
+				if ($export_reference_if_empty_translation && !isset($ent['columns'][$column_no]))
+					$ent['columns'][$column_no] = $identifierColumn['reference_string'];
+				else if (!isset($ent['columns'][$column_no]))
+					$ent['columns'][$column_no] = '';
+			}
+			if ($fileIdentifier['command'])
+				$ent['command'] = $ent['diff'] = $fileIdentifier['command'];
+
+			$entities[] = $ent;
+		}
+/*		$sources = ConnectionManager::sourceList();
+		$sqlLogs = array();
+		foreach ($sources as $source)
+		{
+			$db =& ConnectionManager::getDataSource($source);
+			if (!$db->isInterfaceSupported('getLog'))
+				continue;
+			$sqlLogs[$source] = $db->getLog();
+		}
+		$this->log($sqlLogs);*/
+
+//		$this->log($importedTranslationFile);
+/*		$this->log($sortResult);
+		$this->log($entities);*/
+
+		ini_set('max_execution_time',0);
+
+		$result = $this->RawFile->buildFile($entities);
+//		$this->log($result);
+//			$this->render('admin_index');
+//			$this->redirect(array('controller' => 'imported_translation_files', 'action' => 'index'));
+//			return 0;
+
+/*		var_dump($parsedFile);
+		$this->render('index');
+		return 0;*/
+//		$this->log($parsedFile);
+		if (!$result)
+		{
+			$this->Session->setFlash(__('Error exporting file', true));
+			$this->redirect(array('action' => 'index'));
+			return 0;
+		}
+	}
 }

code/ryzom/tools/server/www/webtt/app/controllers/translations_controller.php

@@ -5,7 +5,10 @@ class TranslationsController extends AppController {
 
 	function index() {
 		$this->Translation->recursive = 0;
-		$this->set('translations', $this->paginate());
+		$conditions = null;
+		if (isset($this->passedArgs['identifier_id']) && $identifier = $this->passedArgs['identifier_id'])
+			$conditions = array('Translation.identifier_id' => $identifier);
+		$this->set('translations', $this->paginate($conditions));
 	}
 
 	function view($id = null) {
@@ -14,21 +17,34 @@ class TranslationsController extends AppController {
 			$this->redirect(array('action' => 'index'));
 		}
 //		$this->recursive=2;
-		$this->set('translation', $bumz = $this->Translation->read(null, $id));
+		$this->set('translation', $translation = $this->Translation->read(null, $id));
-//		var_dump($bumz);
+		$this->set('identifier', $identifier = $this->Translation->Identifier->read(null, $translation['Translation']['identifier_id']));
+//		var_dump($translation);
+//		var_dump($identifier);
 	}
 
 	function add() {
 		if (!empty($this->data)) {
 			$this->Translation->create();
-			if ($this->Translation->save($this->data)) {
+			if ($res = $this->Translation->save($this->data)) {
 				$this->Session->setFlash(__('The translation has been saved', true));
-				$this->redirect(array('action' => 'index'));
+				$this->redirect(array('action' => 'index', 'identifier_id' => $res['Translation']['identifier_id']));
 			} else {
 				$this->Session->setFlash(__('The translation could not be saved. Please, try again.', true));
 			}
 		}
-		$identifiers = $this->Translation->Identifier->find('list');
+		if (empty($this->passedArgs['identifier_id']))
+		{
+			$this->Session->setFlash(__('You need to choose identifier for translation', true));
+			$this->redirect(array('controller' => 'identifiers', 'action' => 'index'));
+		}
+		else
+		{
+			$identifier_id = $this->passedArgs['identifier_id'];
+			$this->set('identifier', $identifier = $this->Translation->Identifier->read(null, $identifier_id));
+//			$this->data['Translation.identifier_id'] = $identifier_id;
+		}
+//		$identifiers = $this->Translation->Identifier->find('list', array('recursive' => -1));
 		$users = $this->Translation->User->find('list');
 		$this->set(compact('identifiers', 'users'));
 	}
@@ -49,9 +65,11 @@ class TranslationsController extends AppController {
 		if (empty($this->data)) {
 			$this->data = $this->Translation->read(null, $id);
 		}
+//		var_dump($this->data);
+		$identifier = $this->Translation->Identifier->read(null, $this->data['Translation']['identifier_id']);
 		$identifiers = $this->Translation->Identifier->find('list');
 		$users = $this->Translation->User->find('list');
-		$this->set(compact('identifiers', 'users'));
+		$this->set(compact('identifiers', 'users', 'identifier'));
 	}
 
 	function delete($id = null) {
@@ -61,14 +79,28 @@ class TranslationsController extends AppController {
 		}
 		if ($this->Translation->delete($id)) {
 			$this->Session->setFlash(__('Translation deleted', true));
-			$this->redirect(array('action'=>'index'));
+//			$this->redirect(array('action'=>'index'));
+			$this->redirect($this->referer());
 		}
 		$this->Session->setFlash(__('Translation was not deleted', true));
 		$this->redirect(array('action' => 'index'));
 	}
 	function admin_index() {
-		$this->Translation->recursive = 0;
+		return $this->index();
-		$this->set('translations', $this->paginate());
+	}
+
+	function admin_setBest($id) {
+		if (!$id) {
+			$this->Session->setFlash(__('Invalid id for translation', true));
+			$this->redirect($this->referer());
+		}
+		if ($this->Translation->setBest($id))
+			$this->Session->setFlash(__('Set successful', true));
+		else
+			$this->Session->setFlash(__('Set error', true));
+		$this->redirect($this->referer());
+//		$this->index();
+//		$this->render('index');
 	}
 
 	function admin_view($id = null) {

code/ryzom/tools/server/www/webtt/app/controllers/users_controller.php

@@ -3,6 +3,8 @@ class UsersController extends AppController {
 
 	var $name = 'Users';
 
+	var $components = array('Email');
+
 	function index() {
 		$this->User->recursive = 0;
 		$this->set('users', $this->paginate());
@@ -113,4 +115,60 @@ class UsersController extends AppController {
 		$this->Session->setFlash(__('User was not deleted', true));
 		$this->redirect(array('action' => 'index'));
 	}
+	
+	function login() {
+	}
+
+	function logout() {
+		   $this->redirect($this->Auth->logout());
+	}
+	
+	function beforeFilter() {
+		parent::beforeFilter();
+		$this->Auth->allow(array('register', 'login', 'logout', 'confirm'));
+	}
+
+	function register() {
+		if(!empty($this->data)) {
+			$this->User->create();
+/*			$assigned_password = 'newpass';
+			$this->data['User']['password'] = $this->Auth->password($assigned_password);*/
+			$this->data['User']['password'] = $this->Auth->password($this->data['User']['passwd']);
+			$this->data['User']['confirm_hash'] = $this->Auth->password($this->data['User']['name'] . time());
+			if($user = $this->User->save($this->data)) {
+				// send signup email containing password to the user
+//				$this->Session->setFlash('your password is ' . $assigned_password);
+//				$this->Session->setFlash('your password is ' . var_export($this->data['User']['password'], true));
+//				$this->Auth->login($this->data);
+//				$this->Email->delivery = 'debug';
+				$this->Email->from = 'webtt-noreply@openlink.pl';
+				$this->Email->to = $user['User']['email'];
+				$this->Email->subject = 'WebTT registration';
+				$this->Email->sendAs = 'text';
+				$this->Email->template = 'registration';
+				$this->set('user', $this->data);
+				$this->set('serverName', $_SERVER['SERVER_NAME']);
+				$this->params['url']['ext'] = 'no_debug';
+//				var_dump($this->helpers);
+				unset($this->helpers['DebugKit.Toolbar']);
+				$this->Email->send();
+				$this->Session->setFlash('Thank you for registreation. Please use confirm link from email to finalize registration.');
+				$this->redirect('/');
+			}
+		}
+	}
+	
+	function confirm($confirm_hash)
+	{
+		$user = $this->User->find('first', array('conditions' => array('User.confirm_hash' => $confirm_hash)));
+		if (!$user)
+		{
+			$this->Session->setFlash('No user found. Please register again.');
+			$this->redirect('/');
+		}
+		$this->User->id = $user['User']['id'];
+		$this->User->save(array('confirm_hash' => null));
+		$this->Session->setFlash('Thank you for registreation. You can now log in.');
+		$this->redirect('/');
+	}
 }

code/ryzom/tools/server/www/webtt/app/controllers/votes_controller.php

@@ -5,6 +5,13 @@ class VotesController extends AppController {
 
 	function index() {
 		$this->Vote->recursive = 0;
+//		var_dump($this->Vote->belongsTo);
+//		var_dump($this->Vote->getAssociated());
+//		$model = $this->{$this->modelClass};
+//		$this->log($tree=$this->PathResolver->getAssociationsTree($model));
+//		$this->log($this->PathResolver->getAssociationsGraph('User',$tree));
+//		$this->log($this->PathResolver->printPath($model), 'info');
+//		$this->log($this->PathResolver->node_path('Language', $tree));
 		$this->set('votes', $this->paginate());
 	}
 
@@ -31,6 +38,36 @@ class VotesController extends AppController {
 		$this->set(compact('translations', 'users'));
 	}
 
+	function vote() {
+		if (empty($this->passedArgs['translation']))
+		{
+			$this->Session->setFlash(__('You need to choose translation for your vote', true));
+			$this->redirect(array('controller' => 'translations', 'action' => 'index'));
+		}
+		else
+		{
+			$translation_id = $this->passedArgs['translation'];
+			$translation = $this->Vote->Translation->read(null, $translation_id);
+			if (!$translation)
+			{
+				$this->Session->setFlash(__("Translation doesn't exist.", true));
+				$this->redirect(array('controller' => 'translations', 'action' => 'index'));
+			}
+			$vote = array("Vote" => array(
+							'translation_id' => $translation_id,
+							// TODO: authorized user
+							'user_id' => 1,
+						),
+					);
+			$this->Vote->create();
+			$this->Vote->save($vote);
+			$this->Session->setFlash(__('Vote added', true));
+			$this->redirect($this->referer(array('controller' => 'translations', 'action' => 'index')));
+//			$this->redirect(array('controller' => 'translations', 'action' => 'index'));
+//			$this->data['Translation.identifier_id'] = $identifier_id;
+		}
+	}
+
 	function edit($id = null) {
 		if (!$id && empty($this->data)) {
 			$this->Session->setFlash(__('Invalid vote', true));

code/ryzom/tools/server/www/webtt/app/models/app_model.php

@@ -33,4 +33,6 @@
  */
 class AppModel extends Model {
 //	var $useDbConfig = 'raw_files';
+	var $scaffoldForbiddenActions = null;
+	var $scaffoldActions = null;
 }

code/ryzom/tools/server/www/webtt/app/models/datasources/raw_files_source.php

@@ -50,28 +50,7 @@ class RawFilesSource extends DataSource {
  *
  * @var string
  */
-	public $description = 'File Data Source';
+	public $description = 'Directory Contents Data Source';
-
-/**
- * Column delimiter
- *
- * @var string
- */
-	public $delimiter = ';';
-
-/**
- * Maximum Columns
- *
- * @var integer
- */
-	public $maxCol = 0;
-
-/**
- * Field Names
- *
- * @var mixed
- */
-	public $fields = null;
 
 /**
  * File Handle
@@ -80,42 +59,39 @@ class RawFilesSource extends DataSource {
  */
 	public $handle = false;
 
-/**
- * Page to start on
- *
- * @var integer
- */
-	public $page = 1;
-
-/**
- * Limit of records
- *
- * @var integer
- */
-	public $limit = 99999;
-
 /**
  * Default configuration.
  *
  * @var array
  */
 	var $_baseConfig = array(
-		'datasource' => 'raw_files',
+		'datasource' => 'Datasources.RawFilesSource',
-		'path' => '/home/kaczorek/projects/webtt/distfiles/translation',
+		'path' => '.',
-		'extension' => 'uxt',
+		'extension' => 'txt',
 		'readonly' => true,
-		'recursive' => true);
+		'recursive' => false);
 
-	protected $_schema = array(
+	var $_schema = array(
-		'files' => array(
+//		'files' => array(
 			'filename' => array(
 				'type' => 'string',
 				'null' => false,
 				'key' => 'primary',
-				'lenght' => 255	
+				'length' => 255	
-				)
+				),
-			)
+			'size' => array(
+				'type' => 'string',
+				'null' => false,
+				'length' => 40,
+				),
+			'modified' => array(
+				'type' => 'string',
+				'null' => false,
+				'length' => 40,
+				),
+	//		)
 		);
+
 /**
  * Constructor
  *
@@ -132,7 +108,7 @@ class RawFilesSource extends DataSource {
 	}
 
 /**
- * Connects to the mailbox using options in the given configuration array.
+ * Connects to the directory using options in the given configuration array.
  *
  * @return boolean True if the file could be opened.
  */
@@ -159,68 +135,19 @@ class RawFilesSource extends DataSource {
 /**
  * List available sources
  *
- * @return array of available CSV files
+ * @return array of available files
  */
  	public function listSources() {
-		$this->config['database'] = 'csv';
+		return array('raw_files');
-		$cache = parent::listSources();
-		if ($cache !== null) {
-			return $cache;
-		}
-
-		$extPattern = '\.' . preg_quote($this->config['extension']);
-		if ($this->config['recursive']) {
-			$list = $this->connection->findRecursive('.*' . $extPattern, true);
-			foreach($list as &$item) {
-				$item = mb_substr($item, mb_strlen($this->config['path'] . DS));
-			}
-		} else {
-			$list = $this->connection->find('.*' . $extPattern, true);
-		}
-
-		foreach ($list as &$item) {
-			$item = preg_replace('/' . $extPattern . '$/i', '', $item);
-		}
-
-		parent::listSources($list);
-		unset($this->config['database']);
-		return $list;
 	}
 
 /**
- * Returns a Model description (metadata) or null if none found.
+ * Returns a Model description (metadata).
  *
  * @return mixed
  */
 	public function describe($model) {
-		$this->__getDescriptionFromFirstLine($model);
+		return $this->_schema;
-		return $this->fields;
-	}
-
-/**
- * Get Description from First Line, and store into class vars
- *
- * @param Model $model
- * @return boolean True, Success
- */
-	private function __getDescriptionFromFirstLine($model) {
-		$filename = $model->table . '.' . $this->config['extension'];
-		$handle = fopen($this->config['path'] . DS .  $filename, 'r');
-		$line = rtrim(fgets($handle));
-		$data_comma = explode(',', $line);
-		$data_semicolon = explode(';', $line);
-
-		if (count($data_comma) > count($data_semicolon)) {
-			$this->delimiter = ',';
-			$this->fields = $data_comma;
-			$this->maxCol = count($data_comma);
-		} else {
-			$this->delimiter = ';';
-			$this->fields = $data_semicolon;
-			$this->maxCol = count($data_semicolon);
-		}
-		fclose($handle);
-		return true;
 	}
 
 /**
@@ -240,42 +167,22 @@ class RawFilesSource extends DataSource {
 		}
 	}
 
-	public function read(&$model, $queryData = array(), $recursive = null) {
+/**
-		if ($queryData["conditions"] && $queryData["conditions"]["ext"])
+ * Private method to determine if file is in one of given directories
-			$extension = $queryData["conditions"]["ext"];
+ *
-		else
+ * @return boolean
-			$extension = $this->config['extension'];
+ */
-
+	private function fileInDir($filepath, $dirs)
-		$extPattern = '\.' . preg_quote($extension);
+	{
-		if ($this->config['recursive']) {
+		foreach ($dirs as $dir)
-			$list = $this->connection->findRecursive('.*' . $extPattern, true);
+		{
-			foreach($list as &$item) {
+			$dir = $this->connection->realpath($this->config['path']) . DS . $dir;
-				$item = mb_substr($item, mb_strlen($this->connection->realpath($this->config['path']) . DS));
+			if ($dir . DS . basename($filepath) === $filepath)
-			}
+				return true;
-			unset($item);
-		} else {
-			$list = $this->connection->find('.*' . $extPattern, true);
-		}
-
-		$nlist = array();
-		foreach ($list as $item) {
-			$file = new File($path = $this->config['path'] . DS . $item, false);
-//			var_dump($item);
-//			$item = preg_replace('/' . $extPattern . '$/i', '', $item);
-			$resultSet[] = array(
-				$model->alias => array(
-					'filename' => $item,
-					'size' => $file->size(),
-					'modified' => $file->lastChange(),
-					),
-				);
 		}
-		if ($model->findQueryType === 'count') {
+		return false;
-			return array(array(array('count' => count($resultSet))));
 	}
 
-		return $resultSet;
-	}
 /**
  * Read Data
  *
@@ -284,159 +191,85 @@ class RawFilesSource extends DataSource {
  * @param integer $recursive Number of levels of association
  * @return mixed
  */
-	public function read_z(&$model, $queryData = array(), $recursive = null) {
+	public function read(&$model, $queryData = array(), $recursive = null) {
-		$config = $this->config;
+		if (isset($queryData["conditions"][$model->alias . ".extension"]))
-		$filename = $config['path'] . DS . $model->table . '.' . $config['extension'];
+			$extension = preg_quote($queryData["conditions"][$model->alias . ".extension"]);
-		if (!Set::extract($this->handle, $model->table)) {
+		else
-			$this->handle[$model->table] = fopen($filename, 'r');
+			$extension = $this->config['extension'];
-		} else {
-			fseek($this->handle[$model->table], 0, SEEK_SET) ;
-		}
-		$queryData = $this->__scrubQueryData($queryData);
 
-		if (isset($queryData['limit']) && !empty($queryData['limit'])) {
+		if (isset($queryData["conditions"][$model->alias . ".filename"]))
-			$this->limit = $queryData['limit'];
+		{
+			$filename = $queryData["conditions"][$model->alias .".filename"];
+			$searchPattern = preg_quote($queryData["conditions"][$model->alias .".filename"], '/');
+		}
+		else
+		{
+//			$searchPattern = '.*' . '\.' . preg_quote($extension);
+			$searchPattern = '.*' . '\.' . $extension;
 		}
 
-		if (isset($queryData['page']) && !empty($queryData['page'])) {
+		if (isset($queryData["conditions"][$model->alias . ".dir"]))
-			$this->page = $queryData['page'];
+		{
+//			$dir = $this->connection->realpath($this->config['path']) . DS . $queryData["conditions"][$model->alias . ".dir"];
+			$dir = is_array($dir = $queryData["conditions"][$model->alias . ".dir"]) ? $dir : array($dir);
 		}
 
-		if (empty($queryData['fields'])) {
+/*		var_dump($queryData);*/
-			$fields = $this->fields;
+//		var_dump($searchPattern);
-			$allFields = true;
+
-		} else {
+		if ($this->config['recursive']) {
-			$fields = $queryData['fields'];
+			$list = $this->connection->findRecursive($searchPattern, true);
-			$allFields = false;
+/*			$this->log($list);
-			$_fieldIndex = array();
+			echo "list#\n";
-			$index = 0;
+			var_dump($list);*/
-			// generate an index array of all wanted fields
+			foreach($list as &$item) {
-			foreach($this->fields as $field) {
+				$temp = $item;
-				if (in_array($field,  $fields)) {
+				$item = array();
-					$_fieldIndex[] = $index;
+				$item["full"] = $temp;
+				$item["short"] = mb_substr($temp, mb_strlen($this->connection->realpath($this->config['path']) . DS));
 			}
-				$index++;
+			unset($item);
+		} else {
+			$list = $this->connection->find($searchPattern, true);
+			foreach($list as &$item) {
+				$temp = $item;
+				$item = array();
+				$item["full"] = $this->config['path'] . DS .$temp;
+				$item["short"] = $temp;
 			}
+			unset($item);
 		}
 
-		$lineCount = 0;
-		$recordCount = 0;
-		$findCount = 0;
 		$resultSet = array();
-
+		foreach ($list as $item) {
-		// Daten werden aus der Datei in ein Array $data gelesen
+/*			if (isset($dir) && isset($filename))
-		while (($data = fgetcsv($this->handle[$model->table], 8192, $this->delimiter)) !== FALSE) {
+			{
-			if ($lineCount == 0) {
+				echo "dirconcat#\n";
-				$lineCount++;
+				var_dump($dir . DS . $filename);
+				echo "itemfull#\n";
+				var_dump($item["full"]);
+				if ($dir . DS . $filename === $item["full"])
 					continue;
-			} else {
+			}*/
-				// Skip over records, that are not complete
+			if (isset($dir))
-				if (count($data) < $this->maxCol) {
+				if (!$this->fileInDir($item["full"], $dir))
 					continue;
+			$file = new File($path = $this->config['path'] . DS . $item["short"], false);
+//			var_dump($item);
+//			$item = preg_replace('/' . $extPattern . '$/i', '', $item);
+			$resultSet[] = array(
+				$model->alias => array(
+					'filename' => $item["short"],
+					'size' => $file->size(),
+					'modified' => $file->lastChange(),
+					),
+				);
 		}
-
-				$record = array();
-				$i = 0;
-				foreach($this->fields as $field) {
-					$record[$model->alias][$field] = $data[$i++];
-				}
-
-				if ($this->__checkConditions($record, $queryData['conditions'], $model)) {
-					// Compute the virtual pagenumber
-					$_page = floor($findCount / $this->limit) + 1;
-					if ($this->page <= $_page) {
-						if (!$allFields) {
-							$record = array();
-							if (count($_fieldIndex) > 0) {
-								foreach($_fieldIndex as $i) {
-									$record[$model->alias][$this->fields[$i]] = $data[$i];
-								}
-							}
-						}
-						$resultSet[] = $record ;
-						$recordCount++;
-					}
-				}
-				unset($record);
-				$findCount++;
-
-				if ($recordCount >= $this->limit) {
-					break;
-				}
-			}
-		}
-
 		if ($model->findQueryType === 'count') {
 			return array(array(array('count' => count($resultSet))));
 		}
-		return $resultSet;
-	}
 
-/**
+		return $resultSet;
- * Private helper method to remove query metadata in given data array.
- *
- * @param array $data Data
- * @return array Cleaned Data
- */
-	private function __scrubQueryData($data) {
-		foreach (array('conditions', 'fields', 'joins', 'order', /*'limit', 'offset',*/ 'group') as $key) {
-			if (!isset($data[$key]) || empty($data[$key])) {
-				$data[$key] = array();
-			}
-		}
-		if (!isset($data['limit']) || empty($data['limit'])) {
-			$data['limit'] = PHP_INT_MAX;
-		}
-		if (!isset($data['offset']) || empty($data['offset'])) {
-			$data['offset'] = 0;
-		}
-		return $data;
-	}
-
-/**
- * Private helper method to check conditions.
- *
- * @param array $record
- * @param array $conditions
- * @return bool
- */
-	private function __checkConditions($record, $conditions, $model) {
-		$result = true;
-		foreach ($conditions as $name => $value) {
-            $alias = $model->alias;
-            if (strpos($name, '.') !== false) {
-                list($alias, $name) = explode('.', $name);
-            }
-
-			if (strtolower($name) === 'or') {
-				$cond = $value;
-				$result = false;
-				foreach ($cond as $name => $value) {
-					if (Set::matches($this->__createRule($name, $value), $record[$alias])) {
-						return true;
-					}
-				}
-			} else {
-				if (!Set::matches($this->__createRule($name, $value), $record[$alias])) {
-					return false;
-				}
-			}
-		}
-		return $result;
-	}
-
-/**
- * Private helper method to crete rule.
- *
- * @param string $name
- * @param string $value
- * @return string
- */
-	private function __createRule($name, $value) {
-		if (strpos($name, ' ') !== false) {
-			return array(str_replace(' ', '', $name) . $value);
-		}
-		return array("{$name}={$value}");
 	}
 
 /**
@@ -445,7 +278,7 @@ class RawFilesSource extends DataSource {
  * @param Model $model 
  * @param mixed $func 
  * @param array $params 
- * @return array
+ * @return array with the field name with records count
  */
 	public function calculate(&$model, $func, $params = array()) {
 		return array('count');

code/ryzom/tools/server/www/webtt/app/models/file_identifier.php

@@ -2,6 +2,9 @@
 class FileIdentifier extends AppModel {
 	var $name = 'FileIdentifier';
 	var $displayField = 'command';
+	var $order = 'FileIdentifier.id';
+
+	var $scaffoldForbiddenActions = array("index", "add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $belongsTo = array(
@@ -10,14 +13,14 @@ class FileIdentifier extends AppModel {
 			'foreignKey' => 'imported_translation_file_id',
 			'conditions' => '',
 			'fields' => '',
-			'order' => ''
+//			'order' => ''
 		),
 		'Identifier' => array(
 			'className' => 'Identifier',
 			'foreignKey' => 'identifier_id',
 			'conditions' => '',
 			'fields' => '',
-			'order' => ''
+//			'order' => ''
 		)
 	);
 }

code/ryzom/tools/server/www/webtt/app/models/identifier.php

@@ -3,17 +3,18 @@ class Identifier extends AppModel {
 	var $name = 'Identifier';
 	var $displayField = 'identifier';
 	var $actsAs = array('Containable');
+
 	var $validate = array(
-		'translation_index' => array(
+/*		'translation_index' => array(
 			'numeric' => array(
 				'rule' => array('numeric'),
-				//'message' => 'Your custom message here',
+				'message' => 'Your custom message here',
-				//'allowEmpty' => false,
+				'allowEmpty' => false,
-				//'required' => false,
+				//'required' => true,
 				//'last' => false, // Stop validation after this rule
 				//'on' => 'create', // Limit validation to 'create' or 'update' operations
 			),
-		),
+		),*/
 		'identifier' => array(
 			'A_Za_z0_9' => array(
 				'rule' => '/[A-Za-z0-9_@]+/',
@@ -25,22 +26,56 @@ class Identifier extends AppModel {
 			),
 		),
 	);
+
+	var $scaffoldForbiddenActions = array("add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $belongsTo = array(
-		'Language' => array(
+/*		'Language' => array(
 			'className' => 'Language',
 			'foreignKey' => 'language_id',
 			'conditions' => '',
 			'fields' => '',
 			'order' => ''
-		)
+		),*/
+		'TranslationFile' => array(
+			'className' => 'TranslationFile',
+			'foreignKey' => 'translation_file_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
+	);
+
+	var $hasOne = array(
+		'BestTranslation' => array(
+			'className' => 'Translation',
+			'foreignKey' => 'identifier_id',
+			'dependent' => false,
+			'conditions' => array('BestTranslation.best' => true),
+			'fields' => '',
+			'order' => '',
+		),
 	);
 
 	var $hasMany = array(
 		'Translation' => array(
 			'className' => 'Translation',
 			'foreignKey' => 'identifier_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
+		'Comment' => array(
+			'className' => 'Comment',
+			'foreignKey' => 'identifier_id',
 			'dependent' => false,
 			'conditions' => '',
 			'fields' => '',
@@ -63,7 +98,36 @@ class Identifier extends AppModel {
 			'exclusive' => '',
 			'finderQuery' => '',
 			'counterQuery' => ''
-		)
+		),
+		'IdentifierColumn' => array(
+			'className' => 'IdentifierColumn',
+			'foreignKey' => 'identifier_id',
+			'dependent' => true,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
 	);
 	
+	function withoutBestTranslation($conditions = array())
+	{
+/*		$this->contain(array(
+			'FileIdentifier' => array('ImportedTranslationFile' => array(
+				'conditions' => array('ImportedTranslationFile.id' => 248)
+			)),
+		));
+
+		$res = $this->find('all', array('conditions' => array('Identifier.id' => array(125219, 131609, 67133))));*/
+//		$fileIdentifier_ids = $this->FileIdentifier->find('list', array('fields' => array('FileIdentifier.id', 'FileIdentifier.id'), 'conditions' => array('FileIdentifier.imported_translation_file_id' => 248)));
+		// TOTHINK: try to achieve that with Linkable behaviour
+		if (isset($conditions['ImportedTranslationFile.id']))
+			return $identifier_ids = $this->FileIdentifier->find('list', array('fields' => array('Identifier.id', 'Identifier.id'), 'conditions' => array('FileIdentifier.imported_translation_file_id' => $conditions['ImportedTranslationFile.id']), 'recursive' => 1));
+		else
+			return false;
+	}
 }

code/ryzom/tools/server/www/webtt/app/models/imported_translation_file.php

@@ -2,6 +2,9 @@
 class ImportedTranslationFile extends AppModel {
 	var $name = 'ImportedTranslationFile';
 	var $displayField = 'filename';
+
+	var $scaffoldForbiddenActions = array("index", "add", "admin_add", "edit", "admin_edit", "delete", "admin_delete");
+
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $actsAs = array('Containable');
@@ -13,7 +16,14 @@ class ImportedTranslationFile extends AppModel {
 			'conditions' => '',
 			'fields' => '',
 			'order' => ''
-		)
+		),
+		'TranslationFile' => array(
+			'className' => 'TranslationFile',
+			'foreignKey' => 'translation_file_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
 	);
 
 	var $hasMany = array(
@@ -23,7 +33,7 @@ class ImportedTranslationFile extends AppModel {
 			'dependent' => true,
 			'conditions' => '',
 			'fields' => '',
-			'order' => '',
+			'order' => 'FileIdentifier.id',
 			'limit' => '',
 			'offset' => '',
 			'exclusive' => '',

code/ryzom/tools/server/www/webtt/app/models/language.php

@@ -2,11 +2,13 @@
 class Language extends AppModel {
 	var $name = 'Language';
 	var $displayField = 'name';
+
+	var $scaffoldForbiddenActions = array("add", "edit", "delete");
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $hasMany = array(
-		'Identifier' => array(
+		'TranslationFile' => array(
-			'className' => 'Identifier',
+			'className' => 'TranslationFile',
 			'foreignKey' => 'language_id',
 			'dependent' => false,
 			'conditions' => '',
@@ -30,7 +32,20 @@ class Language extends AppModel {
 			'exclusive' => '',
 			'finderQuery' => '',
 			'counterQuery' => ''
-		)
+		),
+		'Identifier' => array(
+			'className' => 'Identifier',
+			'foreignKey' => 'language_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),
 	);
 
 }

code/ryzom/tools/server/www/webtt/app/models/raw_file.php

@@ -3,7 +3,7 @@ class RawFile extends AppModel {
 	var $name = 'RawFile';
 	var $useDbConfig = 'raw_files';
 	var $displayField = 'filename';
-	var $useTable = false;
+//	var $useTable = false;
 	var $primaryKey = 'filename';
 	
 	var $_parser;
@@ -34,28 +34,103 @@ class RawFile extends AppModel {
 		)
 	);*/
 
-	public function open($dir, $filename)
+	public function open($dir, $filename, $write = false)
 	{
+		$this->_currentFile = null;
+		$this->_currentFileLastModified = null;
+
 		$ds = $this->getDataSource();
 		$file = new File($filepath = $ds->config['path'] . DS . $dir . DS . $filename, false);
 		if (!$file)
 			return false;
 		if (!$file->readable())
 			return false;
+		if ($write && !$file->writable())
+			return false;
 //		var_dump($filename);
 		$this->_currentFile = $file;
+		$this->_currentFileLastChange = $file->lastChange();
 		return $file;
 	}
 
-	public function parseFile($file)
+	public function parseFile()
 	{
-		App::import("Vendor","UxtParser", array("file" => 'UxtParser.php'));
+//		var_dump($this->_currentFile);
-		$parser = $this->_parser = new UxtParser();
 		if (!$this->_currentFile)
 			return false;
+
+		// TODO: file types array with filenames regex
+		if (
+			preg_match('|^([a-z]{2})_diff_[A-F0-9]{8}\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^r2_([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","StringParser", array("file" => 'StringParser.php'));
+			$parser = $this->_parser = new StringParser();
+		}
+		else if (
+			preg_match('|^phrase_([a-z]{2})_diff_[A-F0-9]{8}\.txt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^phrase_([a-z]{2})\.txt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","PhraseParser", array("file" => 'PhraseParser.php'));
+			$parser = $this->_parser = new PhraseParser();
+		}
+		else if (preg_match('|^.*_words_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^.*_words_([a-z]{2})\..*$|', $this->_currentFile->name, $matches))
+		{
+			App::import("Vendor","SheetParser", array("file" => 'SheetParser.php'));
+			$parser = $this->_parser = new SheetParser();
+		}
+		else
+		{
+			return false;
+		}
 		$entities = $parser->parseFile($this->_currentFile->read());
 		return $entities;
 	}
+
+	public function buildFile($entities)
+	{
+//		var_dump($this->_currentFile);
+		if (!$this->_currentFile)
+			return false;
+
+		// TODO: file types array with filenames regex
+		if (
+			preg_match('|^([a-z]{2})_diff_[A-F0-9]{8}\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^r2_([a-z]{2})\.uxt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","StringParser", array("file" => 'StringParser.php'));
+			$parser = $this->_parser = new StringParser();
+		}
+		else if (
+			preg_match('|^phrase_([a-z]{2})_diff_[A-F0-9]{8}\.txt$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^phrase_([a-z]{2})\.txt$|', $this->_currentFile->name, $matches)
+		)
+		{
+			App::import("Vendor","PhraseParser", array("file" => 'PhraseParser.php'));
+			$parser = $this->_parser = new PhraseParser();
+		}
+		else if (preg_match('|^.*_words_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $this->_currentFile->name, $matches)
+			|| preg_match('|^.*_words_([a-z]{2})\..*$|', $this->_currentFile->name, $matches))
+		{
+			App::import("Vendor","SheetParser", array("file" => 'SheetParser.php'));
+			$parser = $this->_parser = new SheetParser();
+		}
+		else
+		{
+			return false;
+		}
+		$content = $parser->buildFile($entities);
+		$ret = $this->_currentFile->write($content);
+		return $ret;
+	}
+
+
 	public function getLanguageCode($filename)
 	{
 //		var_dump($filename);
@@ -63,5 +138,15 @@ class RawFile extends AppModel {
 			return $matches[1];
 		else if (preg_match('|^([a-z]{2})\.uxt$|', $filename, $matches))
 			return $matches[1];
+		else if (preg_match('|^r2_([a-z]{2})\.uxt$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^phrase_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^phrase_([a-z]{2})\..*$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^.*_words_([a-z]{2})_diff_[A-F0-9]{8}\..*$|', $filename, $matches))
+			return $matches[1];
+		else if (preg_match('|^.*_words_([a-z]{2})\..*$|', $filename, $matches))
+			return $matches[1];
 	}
 }

code/ryzom/tools/server/www/webtt/app/models/translation.php

@@ -2,6 +2,9 @@
 class Translation extends AppModel {
 	var $name = 'Translation';
 	var $displayField = 'translation_text';
+
+	var $scaffoldForbiddenActions = array();
+	var $scaffoldActions = array("add" => "fk", "index" => "fk");
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $belongsTo = array(
@@ -12,6 +15,13 @@ class Translation extends AppModel {
 			'fields' => '',
 			'order' => ''
 		),
+		'IdentifierColumn' => array(
+			'className' => 'IdentifierColumn',
+			'foreignKey' => 'identifier_column_id',
+			'conditions' => '',
+			'fields' => '',
+			'order' => ''
+		),
 		'User' => array(
 			'className' => 'User',
 			'foreignKey' => 'user_id',
@@ -34,7 +44,44 @@ class Translation extends AppModel {
 			'exclusive' => '',
 			'finderQuery' => '',
 			'counterQuery' => ''
-		)
+		),
+/*		'Comment' => array(
+			'className' => 'Comment',
+			'foreignKey' => 'translation_id',
+			'dependent' => false,
+			'conditions' => '',
+			'fields' => '',
+			'order' => '',
+			'limit' => '',
+			'offset' => '',
+			'exclusive' => '',
+			'finderQuery' => '',
+			'counterQuery' => ''
+		),*/
 	);
 
+	function setBest()
+	{
+		if (!$this->id)
+			return false;
+		$this->read();
+		if (!isset($this->data['Translation']['identifier_id']))
+			return false;
+
+		// set best on chosen translation
+		$ret = $this->save(array('best' => 1));
+		$best_id = $this->id;
+
+		// reset best on other translations
+		$ret = $this->updateAll(array('Translation.best' => 0), array(
+			'AND' => array(
+				'Translation.identifier_id' => $ret['Translation']['identifier_id'],
+				'Translation.id !=' => $best_id,
+			),
+		));
+		$this->log($ret);
+		// TODO: test!
+		
+		return $this->id;
+	}
 }

code/ryzom/tools/server/www/webtt/app/models/user.php

@@ -2,6 +2,23 @@
 class User extends AppModel {
 	var $name = 'User';
 	var $displayField = 'name';
+
+	var $validate = array(
+		'username' => array(
+			'alphaNumeric',
+/*			'uniqueCheck' => array(
+				'rule' => 'isUnique',
+				'message' => 'That username has already been taken.',
+			),*/
+		),
+		'email' => array('rule' => 'email', 'message' => 'Wrong format'),
+		'name' => array('rule' => 'notEmpty'),
+//		'password' => array('rule' => 'notEmpty'),
+		'passwd' => array('rule' => 'notEmpty'),
+	);
+
+	var $scaffoldForbiddenActions = array("add", "edit", "delete");
+
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $hasMany = array(

code/ryzom/tools/server/www/webtt/app/models/vote.php

@@ -2,6 +2,8 @@
 class Vote extends AppModel {
 	var $name = 'Vote';
 	var $displayField = 'translation_id';
+
+	var $scaffoldForbiddenActions = array("delete");
 	//The Associations below have been created with all possible keys, those that are not needed can be removed
 
 	var $belongsTo = array(

code/ryzom/tools/server/www/webtt/app/tests/cases/controllers/translation_files_controller.test.php

@@ -1,5 +1,5 @@
 <?php
-/* TranslationFiles Test cases generated on: 2011-05-29 20:05:35 : 1306692335*/
+/* TranslationFiles Test cases generated on: 2011-07-04 15:19:54 : 1309785594*/
 App::import('Controller', 'TranslationFiles');
 
 class TestTranslationFilesController extends TranslationFilesController {
@@ -11,7 +11,7 @@ class TestTranslationFilesController extends TranslationFilesController {
 }
 
 class TranslationFilesControllerTestCase extends CakeTestCase {
-	var $fixtures = array('app.translation_file', 'app.language', 'app.identifier', 'app.translation', 'app.user', 'app.vote');
+	var $fixtures = array('app.translation_file', 'app.language', 'app.identifier', 'app.translation', 'app.user', 'app.vote', 'app.comment', 'app.file_identifier', 'app.imported_translation_file', 'app.raw_file');
 
 	function startTest() {
 		$this->TranslationFiles =& new TestTranslationFilesController();
@@ -23,4 +23,44 @@ class TranslationFilesControllerTestCase extends CakeTestCase {
 		ClassRegistry::flush();
 	}
 
+	function testIndex() {
+
+	}
+
+	function testView() {
+
+	}
+
+	function testAdd() {
+
+	}
+
+	function testEdit() {
+
+	}
+
+	function testDelete() {
+
+	}
+
+	function testAdminIndex() {
+
+	}
+
+	function testAdminView() {
+
+	}
+
+	function testAdminAdd() {
+
+	}
+
+	function testAdminEdit() {
+
+	}
+
+	function testAdminDelete() {
+
+	}
+
 }

code/ryzom/tools/server/www/webtt/app/tests/cases/models/translation_file.test.php

@@ -1,9 +1,9 @@
 <?php
-/* TranslationFile Test cases generated on: 2011-05-29 19:13:14 : 1306689194*/
+/* TranslationFile Test cases generated on: 2011-07-04 13:04:17 : 1309777457*/
 App::import('Model', 'TranslationFile');
 
 class TranslationFileTestCase extends CakeTestCase {
-	var $fixtures = array('app.translation_file', 'app.language', 'app.identifier');
+	var $fixtures = array('app.translation_file', 'app.language', 'app.identifier', 'app.translation', 'app.user', 'app.vote', 'app.comment', 'app.file_identifier', 'app.imported_translation_file', 'app.raw_file');
 
 	function startTest() {
 		$this->TranslationFile =& ClassRegistry::init('TranslationFile');

code/ryzom/tools/server/www/webtt/app/tests/fixtures/translation_file_fixture.php

@@ -1,12 +1,12 @@
 <?php
-/* TranslationFile Fixture generated on: 2011-05-29 19:13:14 : 1306689194 */
+/* TranslationFile Fixture generated on: 2011-07-04 13:04:11 : 1309777451 */
 class TranslationFileFixture extends CakeTestFixture {
 	var $name = 'TranslationFile';
 
 	var $fields = array(
 		'id' => array('type' => 'integer', 'null' => false, 'default' => NULL, 'length' => 10, 'key' => 'primary'),
 		'language_id' => array('type' => 'integer', 'null' => true, 'default' => NULL, 'length' => 10),
-		'filename' => array('type' => 'string', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
+		'filename_template' => array('type' => 'string', 'null' => true, 'default' => NULL, 'collate' => 'utf8_general_ci', 'charset' => 'utf8'),
 		'created' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
 		'modified' => array('type' => 'datetime', 'null' => true, 'default' => NULL),
 		'indexes' => array('PRIMARY' => array('column' => 'id', 'unique' => 1)),
@@ -17,9 +17,9 @@ class TranslationFileFixture extends CakeTestFixture {
 		array(
 			'id' => 1,
 			'language_id' => 1,
-			'filename' => 'Lorem ipsum dolor sit amet',
+			'filename_template' => 'Lorem ipsum dolor sit amet',
-			'created' => '2011-05-29 19:13:14',
+			'created' => '2011-07-04 13:04:11',
-			'modified' => '2011-05-29 19:13:14'
+			'modified' => '2011-07-04 13:04:11'
 		),
 	);
 }

code/ryzom/tools/server/www/webtt/app/vendors/UxtParser.php

@@ -2,6 +2,7 @@
 class UxtParser
 {
 	var $pipeline_directory = "/home/kaczorek/projects/webtt/distfiles/translation/";
+	var $debug = false;
 
 	function removeComments($str)
 	{
@@ -12,12 +13,16 @@ class UxtParser
 //		var_dump($str);
 //As a pertinent note, there's an issue with this function where parsing any string longer than 94326 characters long will silently return null. So be careful where you use it at.
 //http://pl.php.net/manual/en/function.preg-replace.php#98843
-		$returnString = preg_replace('!/\*.*?\*/!s', '', $str); // /* .*? */ s
+		ini_set('pcre.backtrack_limit', 10000000);
+		//$returnString = preg_replace('!/\*.*?\*/!s', '', $str); // /* .*? */ s
+		// added [^/] because there was //******* in translation file
+		$returnString = preg_replace('![^/]/\*.*?\*/!s', '', $str); // /* .*? */ s
 		// PHP 5.2.0
 		// if (PREG_NO_ERROR !== preg_last_error())
 		if ($returnString === null)
 		{
 			$returnStr = $str;
+			var_dump("PREG ERROR");
 			// exception
 		}
 		return $returnString;
@@ -57,11 +62,17 @@ class UxtParser
 				else
 					unset($type);
 			}
-/*			else if (mb_substr($str, 0, 8) == "// INDEX")
+			else if (mb_substr($str, 0, 8) == "// INDEX")
 			{
 				list($j, $type, $index) = explode(" ", $str);
+				$type = "internal_index";
 //				$arr = explode(" ", $str);
-			}*/
+			}
+			else if (mb_substr($str, 0, 13) == "// HASH_VALUE")
+			{
+				list($j, $type, $hash_value) = explode(" ", $str);
+				$type = "hash_value";
+			}
 /*			if (!isset($type))
 			{
 				var_dump(isset($type));
@@ -71,7 +82,7 @@ class UxtParser
 			if (isset($type))
 			{
 				$type = mb_strtolower($type);
-				$arr = compact("type","command","index");
+				$arr = compact("type","command","index","hash_value");
 			}
 		}
 		else if (!(mb_substr($str, 0, 2) == "//") && mb_strlen($str))
@@ -104,6 +115,7 @@ class UxtParser
 	{
 		$parsedEnt = array();
 		$newEnt = false;
+		$prevStringLine = false;
 		$entities = array();
 
 //		$file = file_get_contents($this->pipeline_directory . $file);
@@ -115,54 +127,107 @@ class UxtParser
 		$file = $this->removeComments($file);
 //		var_dump($file);
 		$lines = explode("\n", $file);
-//		echo "<pre>################################\n";
+		if ($this->debug)			
+		{
+			echo "<pre>\n\n";
+		}
+		$line_no=1;
 		foreach ($lines as $line)
 		{
+			if ($this->debug)
+			{
+				echo "\n\t#################### LINE NUMBER " . $line_no++ . "\n\n";
+			}
+
+//			var_dump($line);
 			$line = rtrim($line);
 			$parsedLine = $this->parseLine($line);
 
+			if ($this->debug)
+			{
+				echo "%%%% parsedLine\n";
+				var_dump($parsedLine);
+				echo "\n";
+			
+				echo "%%%% prevStringLine\n";
+				var_dump($prevStringLine);
+				echo "\n";
+			}
+
 			if (!$parsedLine)
 				continue;
 
-			if ($parsedLine["type"] == "index")
+			// if line start with diff (diff files) or hash_value (translated files) and before was line with translation, then we start new ent
-				$parsedEnt["index"] = $parsedLine["index"];
+
+			if ($prevStringLine && (
+					($parsedLine["type"] == "diff" && $parsedEnt) || ($parsedLine["type"] == "hash_value" && $parsedEnt)
+				))
+			{
+/*				echo "%%%% prevStringLine %%%%%\n";
+				var_dump($parsedEnt);*/
+				$newEnt = true;
+			}
+
+			if ($newEnt)
+			{
+				if ($this->debug)			
+				{
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n";
+					echo "\t%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%%%%% newEnt %%%%%\n";
+					echo "\t%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%\n\n";
+					var_dump($parsedEnt);
+				}
+				if (!isset($parsedEnt["diff"]) && !isset($parsedEnt["index"]))
+					$parsedEnt["index"] = $parsedEnt["internal_index"];
+
+				$entities[] = $parsedEnt;
+				$parsedEnt =array();
+				$newEnt = false;
+			}
+
+			if ($parsedLine["type"] == "internal_index")
+					$parsedEnt["internal_index"] = $parsedLine["index"];
 
 			if ($parsedLine["type"] == "string")
 			{
-/*				echo "%%%% parsedEnt %%%%%\n";
+				$prevStringLine = true;
+
+				if ($this->debug)			
+				{
+					echo "%%%% parsedEnt %%%%%\n";
 					var_dump($parsedEnt);
 
-				echo "%%%% parsedLine %%%%%\n";
+//					echo "%%%% parsedLine %%%%%\n";
-				var_dump($parsedLine);
+//					var_dump($parsedLine);
-*/
+				}
 
 				if (!$parsedLine['identifier'])
 				{
-//					echo "ZLACZENIE \n";
+					if ($this->debug) echo "ZLACZENIE \n";
-					$parsedEnt['string'] .= "\n" . $parsedLine['string'];
+					if ($this->debug && !isset($parsedEnt['string']))
+					{
+						echo "!isset parsedEnt['string']\n";
+						var_dump($line);
+						var_dump($parsedEnt);
+						var_dump($parsedLine);
+					}
+					$parsedEnt['string'] .= $parsedLine['string'] . "\n";
 				}
 				else
 				{
-//					echo "DODANIE \n";
+					if ($this->debug) echo "DODANIE \n";
 					$parsedEnt += $parsedLine;
+					$parsedEnt['string'] .= "\n";
 				}
 
-/*				echo "%%%% parsedEnt after %%%%%\n";
+				if ($this->debug)			
-				var_dump($parsedEnt);*/
-			}
-
-			if ($parsedLine["type"] == "diff" && $parsedEnt)
 				{
-				$newEnt = true;
+					echo "%%%% parsedEnt after %%%%%\n";
+					var_dump($parsedEnt);
 				}
-
-			if ($newEnt)
-			{
-//				var_dump($parsedEnt);
-				$entities[] = $parsedEnt;
-				$parsedEnt =array();
-				$newEnt = false;
 			}
+			else
+				$prevStringLine = false;
 
 			if ($parsedLine["type"] == "diff")
 			{
@@ -171,9 +236,19 @@ class UxtParser
 			}
 		}
 		if ($parsedEnt)
+		{
+			if (!isset($parsedEnt["diff"]) && !isset($parsedEnt["index"]))
+				$parsedEnt["index"] = $parsedEnt["internal_index"];
+
 			$entities[] = $parsedEnt;
-/*		var_dump($entities);
+		}
-		echo "</pre>\n";*/
+
+		if ($this->debug)			
+		{
+			echo "<pre>";
+			var_dump($entities);
+			echo "</pre>\n";
+		}
 		return $entities;
 	}
 }

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/add.ctp

@@ -1,25 +1,46 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('File Identifier', true)); ?></h2>
+    
 	<div class="fileIdentifiers form">
 	<?php echo $this->Form->create('FileIdentifier');?>
 		<fieldset>
-		<legend><?php __('Add File Identifier'); ?></legend>
+				 		<legend><?php printf(__('File Identifier', true)); ?></legend>
 					<?php
-		echo $this->Form->input('translation_file_id');
+		echo $this->Form->input('imported_translation_file_id');
 		echo $this->Form->input('command');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_add.ctp

@@ -1,25 +1,46 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('File Identifier', true)); ?></h2>
+    
 	<div class="fileIdentifiers form">
 	<?php echo $this->Form->create('FileIdentifier');?>
 		<fieldset>
-		<legend><?php __('Admin Add File Identifier'); ?></legend>
+				 		<legend><?php printf(__('File Identifier', true)); ?></legend>
 					<?php
-		echo $this->Form->input('translation_file_id');
+		echo $this->Form->input('imported_translation_file_id');
 		echo $this->Form->input('command');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_edit.ctp

@@ -1,27 +1,47 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('File Identifier', true)); ?></h2>
+    
 	<div class="fileIdentifiers form">
 	<?php echo $this->Form->create('FileIdentifier');?>
 		<fieldset>
-		<legend><?php __('Admin Edit File Identifier'); ?></legend>
+						<legend><?php printf(__('File Identifier # %s', true), $this->Form->value('FileIdentifier.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
-		echo $this->Form->input('translation_file_id');
+		echo $this->Form->input('imported_translation_file_id');
 		echo $this->Form->input('command');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('FileIdentifier.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('FileIdentifier.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_index.ctp

@@ -1,17 +1,28 @@
-<div class="fileIdentifiers index">
+<div class="grid_3">
-	<h2><?php __('File Identifiers');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('translation_file_id');?></th>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('command');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('translation_index');?></th>
+				</ul>				<h5><?php echo __('Imported Translation Files', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('identifier_id');?></th>
+				<ul class="menu">
-			<th><?php echo $this->Paginator->sort('reference_string');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<h5><?php echo __('Identifiers', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('File Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('imported_translation_file_id'),$paginator->sort('command'),$paginator->sort('translation_index'),$paginator->sort('identifier_id'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($fileIdentifiers as $fileIdentifier):
@@ -21,26 +32,28 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $fileIdentifier['FileIdentifier']['id']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['id']; ?></td>
 		<td>
-			<?php echo $this->Html->link($fileIdentifier['TranslationFile']['filename'], array('controller' => 'translation_files', 'action' => 'view', $fileIdentifier['TranslationFile']['id'])); ?>
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
 		</td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['command']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['command']; ?></td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?></td>
 		<td>
 			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
 		</td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['arguments']; ?></td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['created']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['modified']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['created']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $fileIdentifier['FileIdentifier']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $fileIdentifier['FileIdentifier']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $fileIdentifier['FileIdentifier']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $fileIdentifier['FileIdentifier']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -50,18 +63,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('action' => 'add')); ?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/admin_view.ctp

@@ -1,58 +1,101 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="fileIdentifiers view">
 	<h2><?php  __('File Identifier');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation File'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
-			<?php echo $this->Html->link($fileIdentifier['TranslationFile']['filename'], array('controller' => 'translation_files', 'action' => 'view', $fileIdentifier['TranslationFile']['id'])); ?>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Imported Translation File'); ?></div>
-			&nbsp;
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
-		</dd>
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Command'); ?></dt>
+		</div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Command'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['command']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation Index'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Identifier'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Reference String'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
-			<?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
-			&nbsp;
+			<?php echo $fileIdentifier['FileIdentifier']['arguments']; ?>
-		</dd>
+
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		</div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<textarea rows="10" style="width: 100%" readonly="true"><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></textarea>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
-</div>
+		<div style="clear: both"></div>
-<div class="actions">
+			</div>
-	<h3><?php __('Actions'); ?></h3>
+		</div>
-	<ul>
+	</div>
-		<li><?php echo $this->Html->link(__('Edit File Identifier', true), array('action' => 'edit', $fileIdentifier['FileIdentifier']['id'])); ?> </li>
+</div>
-		<li><?php echo $this->Html->link(__('Delete File Identifier', true), array('action' => 'delete', $fileIdentifier['FileIdentifier']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $fileIdentifier['FileIdentifier']['id'])); ?> </li>
+
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('action' => 'index')); ?> </li>
+
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/edit.ctp

@@ -1,27 +1,47 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('File Identifier', true)); ?></h2>
+    
 	<div class="fileIdentifiers form">
 	<?php echo $this->Form->create('FileIdentifier');?>
 		<fieldset>
-		<legend><?php __('Edit File Identifier'); ?></legend>
+						<legend><?php printf(__('File Identifier # %s', true), $this->Form->value('FileIdentifier.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
-		echo $this->Form->input('translation_file_id');
+		echo $this->Form->input('imported_translation_file_id');
 		echo $this->Form->input('command');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('FileIdentifier.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('FileIdentifier.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/index.ctp

@@ -1,17 +1,28 @@
-<div class="fileIdentifiers index">
+<div class="grid_3">
-	<h2><?php __('File Identifiers');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('translation_file_id');?></th>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('command');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('translation_index');?></th>
+				</ul>				<h5><?php echo __('Imported Translation Files', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('identifier_id');?></th>
+				<ul class="menu">
-			<th><?php echo $this->Paginator->sort('reference_string');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<h5><?php echo __('Identifiers', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('File Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('imported_translation_file_id'),$paginator->sort('command'),$paginator->sort('translation_index'),$paginator->sort('identifier_id'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($fileIdentifiers as $fileIdentifier):
@@ -21,26 +32,28 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $fileIdentifier['FileIdentifier']['id']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['id']; ?></td>
 		<td>
-			<?php echo $this->Html->link($fileIdentifier['TranslationFile']['filename'], array('controller' => 'translation_files', 'action' => 'view', $fileIdentifier['TranslationFile']['id'])); ?>
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
 		</td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['command']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['command']; ?></td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?></td>
 		<td>
 			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
 		</td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['arguments']; ?></td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['created']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></td>
-		<td><?php echo $fileIdentifier['FileIdentifier']['modified']; ?>&nbsp;</td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['created']; ?></td>
+		<td><?php echo $fileIdentifier['FileIdentifier']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $fileIdentifier['FileIdentifier']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $fileIdentifier['FileIdentifier']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $fileIdentifier['FileIdentifier']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $fileIdentifier['FileIdentifier']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -50,18 +63,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('action' => 'add')); ?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/file_identifiers/view.ctp

@@ -1,58 +1,101 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('File Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="fileIdentifiers view">
 	<h2><?php  __('File Identifier');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation File'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
-			<?php echo $this->Html->link($fileIdentifier['TranslationFile']['filename'], array('controller' => 'translation_files', 'action' => 'view', $fileIdentifier['TranslationFile']['id'])); ?>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Imported Translation File'); ?></div>
-			&nbsp;
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
-		</dd>
+			<?php echo $this->Html->link($fileIdentifier['ImportedTranslationFile']['filename'], array('controller' => 'imported_translation_files', 'action' => 'view', $fileIdentifier['ImportedTranslationFile']['id'])); ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Command'); ?></dt>
+		</div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Command'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['command']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation Index'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['translation_index']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Identifier'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($fileIdentifier['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $fileIdentifier['Identifier']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Reference String'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
-			<?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
-			&nbsp;
+			<?php echo $fileIdentifier['FileIdentifier']['arguments']; ?>
-		</dd>
+
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		</div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<textarea rows="10" style="width: 100%" readonly="true"><?php echo $fileIdentifier['FileIdentifier']['reference_string']; ?></textarea>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $fileIdentifier['FileIdentifier']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
-</div>
+		<div style="clear: both"></div>
-<div class="actions">
+			</div>
-	<h3><?php __('Actions'); ?></h3>
+		</div>
-	<ul>
+	</div>
-		<li><?php echo $this->Html->link(__('Edit File Identifier', true), array('action' => 'edit', $fileIdentifier['FileIdentifier']['id'])); ?> </li>
+</div>
-		<li><?php echo $this->Html->link(__('Delete File Identifier', true), array('action' => 'delete', $fileIdentifier['FileIdentifier']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $fileIdentifier['FileIdentifier']['id'])); ?> </li>
+
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('action' => 'index')); ?> </li>
+
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/add.ctp

@@ -1,25 +1,52 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Identifier', true)); ?></h2>
+    
 	<div class="identifiers form">
 	<?php echo $this->Form->create('Identifier');?>
 		<fieldset>
-		<legend><?php __('Add Identifier'); ?></legend>
+				 		<legend><?php printf(__('Identifier', true)); ?></legend>
 					<?php
 		echo $this->Form->input('language_id');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 		echo $this->Form->input('translated');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_add.ctp

@@ -1,25 +1,69 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifier Columns</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Identifier', true)); ?></h2>
+    
 	<div class="identifiers form">
 	<?php echo $this->Form->create('Identifier');?>
 		<fieldset>
-		<legend><?php __('Admin Add Identifier'); ?></legend>
+				 		<legend><?php printf(__('Identifier', true)); ?></legend>
 					<?php
 		echo $this->Form->input('language_id');
+		echo $this->Form->input('translation_file_id');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 		echo $this->Form->input('translated');
 	?>
 		</fieldset>
+		<div class="box">
 <?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_edit.ctp

@@ -1,27 +1,70 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifier Columns</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Identifier', true)); ?></h2>
+    
 	<div class="identifiers form">
 	<?php echo $this->Form->create('Identifier');?>
 		<fieldset>
-		<legend><?php __('Admin Edit Identifier'); ?></legend>
+						<legend><?php printf(__('Identifier # %s', true), $this->Form->value('Identifier.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('language_id');
+		echo $this->Form->input('translation_file_id');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 		echo $this->Form->input('translated');
 	?>
 		</fieldset>
+		<div class="box">
 <?php echo $this->Form->end(__('Submit', true));?>
+</div>	</div>
+
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Identifier.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Identifier.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_index.ctp

@@ -1,17 +1,47 @@
-<div class="identifiers index">
+<div class="grid_3">
-	<h2><?php __('Identifiers');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('language_id');?></th>
+				<h5><?php echo __('Identifiers', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('translation_index');?></th>
+				<ul class="menu">
-			<th><?php echo $this->Paginator->sort('identifier');?></th>
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('reference_string');?></th>
+				</ul>
-			<th><?php echo $this->Paginator->sort('translated');?></th>
+				<h5><?php echo __('Translation Files', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				<ul class="menu">
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-			<th class="actions"><?php __('Actions');?></th>
+				</ul>
-	</tr>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translations', true); ?></h5>
+				<ul class="menu">
+				</ul>
+				<h5><?php echo __('Comments', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Identifier Columns', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('translation_file_id'),$paginator->sort('translation_index'),$paginator->sort('identifier'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('translated'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($identifiers as $identifier):
@@ -21,24 +51,27 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $identifier['Identifier']['id']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['id']; ?></td>
+		<td><?php echo $identifier['Identifier']['language_id']; ?></td>
 		<td>
-			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
 		</td>
-		<td><?php echo $identifier['Identifier']['translation_index']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['translation_index']; ?></td>
-		<td><?php echo $identifier['Identifier']['identifier']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['identifier']; ?></td>
-		<td><?php echo $identifier['Identifier']['reference_string']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['arguments']; ?></td>
-		<td><?php echo $identifier['Identifier']['translated']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['reference_string']; ?></td>
-		<td><?php echo $identifier['Identifier']['created']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['translated']; ?></td>
-		<td><?php echo $identifier['Identifier']['modified']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['created']; ?></td>
+		<td><?php echo $identifier['Identifier']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $identifier['Identifier']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $identifier['Identifier']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $identifier['Identifier']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifier['Identifier']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -48,18 +81,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('action' => 'add')); ?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/admin_view.ctp

@@ -1,76 +1,214 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Identifier Columns</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifier Columns', true)), array('controller' => 'identifier_columns', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="identifiers view">
 	<h2><?php  __('Identifier');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+								<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['id']; ?>
-			&nbsp;
+				</div>
-		</dd>
+				<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Language'); ?></dt>
+				<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+
-			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Language Id'); ?></div>
-			&nbsp;
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
-		</dd>
+					<?php echo $identifier['Identifier']['language_id']; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation Index'); ?></dt>
+				</div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
+				<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+					<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['translation_index']; ?>
-			&nbsp;
+				</div>
-		</dd>
+				<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Identifier'); ?></dt>
+				<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['identifier']; ?>
-			&nbsp;
+				</div>
-		</dd>
+				<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Reference String'); ?></dt>
+				<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+					<?php echo $identifier['Identifier']['arguments']; ?>
+				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['reference_string']; ?>
-			&nbsp;
+				</div>
-		</dd>
+				<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translated'); ?></dt>
+				<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['translated']; ?>
-			&nbsp;
+				</div>
-		</dd>
+				<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+				<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['created']; ?>
-			&nbsp;
+				</div>
-		</dd>
+				<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+				<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+
+				<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+				<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 					<?php echo $identifier['Identifier']['modified']; ?>
-			&nbsp;
-		</dd>
-	</dl>
 				</div>
+				<?php $i++; ?>
+				<div style="clear: both"></div>
+
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+			<!-- BestTranslation -->
+			<div class="related">
+				<h3><?php printf(__('Related %s (%s)', true), __('Translations', true), __('Best Translation', true));?></h3>
+				<?php if (!empty($identifier['BestTranslation']['id'])):?>
+				<div class="dl">
+				<?php $i = 0; $class = ' class="altrow"';?>
+
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['id'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['identifier_id'];?>
+					</div>
+					<div style="clear: both"></div>
+<!--					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier Column Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['identifier_column_id'];?>
+					</div>
+					<div style="clear: both"></div>-->
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation Text');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['translation_text'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User Id');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['user_id'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Best');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['best'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Created');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['created'];?>
+					</div>
+					<div style="clear: both"></div>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Modified');?></div>
+					<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+						<?php echo $identifier['BestTranslation']['modified'];?>
+					</div>
+					<div style="clear: both"></div>
+				</div>
+				<?php endif; ?>
+
 				<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
 					<ul>
-		<li><?php echo $this->Html->link(__('Edit Identifier', true), array('action' => 'edit', $identifier['Identifier']['id'])); ?> </li>
+<?php if (!empty($identifier['BestTranslation']['id'])):?>
-		<li><?php echo $this->Html->link(__('Delete Identifier', true), array('action' => 'delete', $identifier['Identifier']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifier['Identifier']['id'])); ?> </li>
+						<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'edit', $identifier['BestTranslation']['id'])); ?></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('action' => 'index')); ?> </li>
+					<?php endif; ?>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add')); ?> </li>
 					</ul>
 				</div>
+			</div>
+		<!-- Translation -->
 		<div class="related">
-	<h3><?php __('Related Translations');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
 			<?php if (!empty($identifier['Translation'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 						<th><?php __('Id'); ?></th>
 						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Identifier Column Id'); ?></th>
 						<th><?php __('Translation Text'); ?></th>
 						<th><?php __('User Id'); ?></th>
+						<th><?php __('Best'); ?></th>
 						<th><?php __('Created'); ?></th>
 						<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 				<?php
 				$i = 0;
 				foreach ($identifier['Translation'] as $translation):
@@ -82,14 +220,66 @@
 				<tr<?php echo $class;?>>
 					<td><?php echo $translation['id'];?></td>
 					<td><?php echo $translation['identifier_id'];?></td>
+					<td><?php echo $translation['identifier_column_id'];?></td>
 					<td><?php echo $translation['translation_text'];?></td>
 					<td><?php echo $translation['user_id'];?></td>
+					<td><?php echo $translation['best'];?></td>
 					<td><?php echo $translation['created'];?></td>
 					<td><?php echo $translation['modified'];?></td>
 					<td class="actions">
 						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(sprintf(__('Set as %s', true), __('Best Translation', true)), array('controller' => 'translations', 'action' => 'setBest', $translation['id']));?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add'));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- Comment -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Comments', true));?></h3>
+			<?php if (!empty($identifier['Comment'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Comment'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['Comment'] as $comment):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $comment['id'];?></td>
+					<td><?php echo $comment['translation_id'];?></td>
+					<td><?php echo $comment['identifier_id'];?></td>
+					<td><?php echo $comment['user_id'];?></td>
+					<td><?php echo $comment['comment'];?></td>
+					<td><?php echo $comment['created'];?></td>
+					<td><?php echo $comment['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'comments', 'action' => 'view', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'comments', 'action' => 'edit', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'comments', 'action' => 'delete', $comment['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['id'])); ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
@@ -98,25 +288,29 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add'));?> </li>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
+		<!-- FileIdentifier -->
 		<div class="related">
-	<h3><?php __('Related File Identifiers');?></h3>
+			<h3><?php printf(__('Related %s', true), __('File Identifiers', true));?></h3>
 			<?php if (!empty($identifier['FileIdentifier'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 						<th><?php __('Id'); ?></th>
-		<th><?php __('Translation File Id'); ?></th>
+						<th><?php __('Imported Translation File Id'); ?></th>
 						<th><?php __('Command'); ?></th>
 						<th><?php __('Translation Index'); ?></th>
 						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Arguments'); ?></th>
 						<th><?php __('Reference String'); ?></th>
 						<th><?php __('Created'); ?></th>
 						<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 				<?php
 				$i = 0;
 				foreach ($identifier['FileIdentifier'] as $fileIdentifier):
@@ -127,17 +321,16 @@
 				?>
 				<tr<?php echo $class;?>>
 					<td><?php echo $fileIdentifier['id'];?></td>
-			<td><?php echo $fileIdentifier['translation_file_id'];?></td>
+					<td><?php echo $fileIdentifier['imported_translation_file_id'];?></td>
 					<td><?php echo $fileIdentifier['command'];?></td>
 					<td><?php echo $fileIdentifier['translation_index'];?></td>
 					<td><?php echo $fileIdentifier['identifier_id'];?></td>
+					<td><?php echo $fileIdentifier['arguments'];?></td>
 					<td><?php echo $fileIdentifier['reference_string'];?></td>
 					<td><?php echo $fileIdentifier['created'];?></td>
 					<td><?php echo $fileIdentifier['modified'];?></td>
 					<td class="actions">
 						<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'file_identifiers', 'action' => 'edit', $fileIdentifier['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'file_identifiers', 'action' => 'delete', $fileIdentifier['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $fileIdentifier['id'])); ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
@@ -146,7 +339,56 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add'));?> </li>
 				</ul>
 			</div>
 		</div>
+		<!-- IdentifierColumn -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Identifier Columns', true));?></h3>
+			<?php if (!empty($identifier['IdentifierColumn'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Identifier Id'); ?></th>
+						<th><?php __('Column Name'); ?></th>
+						<th><?php __('Reference String'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($identifier['IdentifierColumn'] as $identifierColumn):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $identifierColumn['id'];?></td>
+					<td><?php echo $identifierColumn['identifier_id'];?></td>
+					<td><?php echo $identifierColumn['column_name'];?></td>
+					<td><?php echo $identifierColumn['reference_string'];?></td>
+					<td><?php echo $identifierColumn['created'];?></td>
+					<td><?php echo $identifierColumn['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'identifier_columns', 'action' => 'view', $identifierColumn['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/edit.ctp

@@ -1,27 +1,53 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Identifier', true)); ?></h2>
+    
 	<div class="identifiers form">
 	<?php echo $this->Form->create('Identifier');?>
 		<fieldset>
-		<legend><?php __('Edit Identifier'); ?></legend>
+						<legend><?php printf(__('Identifier # %s', true), $this->Form->value('Identifier.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('language_id');
 		echo $this->Form->input('translation_index');
 		echo $this->Form->input('identifier');
+		echo $this->Form->input('arguments');
 		echo $this->Form->input('reference_string');
 		echo $this->Form->input('translated');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Identifier.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Identifier.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/index.ctp

@@ -1,17 +1,28 @@
-<div class="identifiers index">
+<div class="grid_3">
-	<h2><?php __('Identifiers');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('language_id');?></th>
+				<h5><?php echo __('Identifiers', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('translation_index');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('identifier');?></th>
+				</ul>				<h5><?php echo __('Languages', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('reference_string');?></th>
+				<ul class="menu">
-			<th><?php echo $this->Paginator->sort('translated');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<h5><?php echo __('Translations', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Identifiers');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_file_id'),$paginator->sort('identifier'),$paginator->sort('arguments'),$paginator->sort('reference_string'),$paginator->sort('translated'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($identifiers as $identifier):
@@ -21,22 +32,26 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $identifier['Identifier']['id']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['id']; ?></td>
 		<td>
-			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
 		</td>
-		<td><?php echo $identifier['Identifier']['translation_index']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['identifier']; ?></td>
-		<td><?php echo $identifier['Identifier']['identifier']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['arguments']; ?></td>
-		<td><?php echo $identifier['Identifier']['reference_string']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['reference_string']; ?></td>
-		<td><?php echo $identifier['Identifier']['translated']; ?>&nbsp;</td>
+		<td><?php echo $identifier['Identifier']['translated']; ?></td>
-		<td><?php echo $identifier['Identifier']['created']; ?>&nbsp;</td>
-		<td><?php echo $identifier['Identifier']['modified']; ?>&nbsp;</td>
 		<td class="actions">
-			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $identifier['Identifier']['id'])); ?>
+			<?php echo $this->Html->link(__('View details and comments', true), array('action' => 'view', $identifier['Identifier']['id'])); ?>
+			| <?php echo $this->Html->link(__('Add Comment', true), array('controller' => 'comments', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id'])); ?>
+			| <?php echo $this->Html->link(__('Add Translation', true), array('controller' => 'translations', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id'])); ?>
+			| <?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index', 'identifier_id' => $identifier['Identifier']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -46,17 +61,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/identifiers/view.ctp

@@ -1,64 +1,114 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Identifiers', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Comments</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Comments', true)), array('controller' => 'comments', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="identifiers view">
 	<h2><?php  __('Identifier');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $identifier['Identifier']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Language'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
-			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation File'); ?></div>
-			&nbsp;
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
-		</dd>
+			<?php echo $this->Html->link($identifier['TranslationFile']['filename_template'], array('controller' => 'translation_files', 'action' => 'view', $identifier['TranslationFile']['id'])); ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation Index'); ?></dt>
+		</div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<?php $i++; ?>
-			<?php echo $identifier['Identifier']['translation_index']; ?>
+		<div style="clear: both"></div>
-			&nbsp;
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
-		</dd>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Identifier'); ?></dt>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
 			<?php echo $identifier['Identifier']['identifier']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Reference String'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
-			<?php echo $identifier['Identifier']['reference_string']; ?>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
-			&nbsp;
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
-		</dd>
+			<?php echo $identifier['Identifier']['arguments']; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translated'); ?></dt>
+
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<textarea rows="10" style="width: 100%" readonly="true"><?php echo $identifier['Identifier']['reference_string']; ?></textarea>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $identifier['Identifier']['translated']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $identifier['Identifier']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $identifier['Identifier']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
 		</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-	</ul>
 	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Translation -->
 		<div class="related">
-	<h3><?php __('Related Translations');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
 			<?php if (!empty($identifier['Translation'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 						<th><?php __('Id'); ?></th>
 						<th><?php __('Identifier Id'); ?></th>
@@ -68,6 +118,7 @@
 						<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 				<?php
 				$i = 0;
 				foreach ($identifier['Translation'] as $translation):
@@ -85,8 +136,8 @@
 					<td><?php echo $translation['modified'];?></td>
 					<td class="actions">
 						<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
@@ -95,47 +146,62 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add'));?> </li>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id']));?></li>
 				</ul>
 			</div>
 		</div>
+		<!-- Comment -->
 		<div class="related">
-	<h3><?php __('Related File Identifiers');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Comments', true));?></h3>
-	<?php if (!empty($identifier['FileIdentifier'])):?>
+			<?php if (!empty($identifier['Comment'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 						<th><?php __('Id'); ?></th>
-		<th><?php __('Translation File Id'); ?></th>
+						<th><?php __('Translation Id'); ?></th>
-		<th><?php __('Command'); ?></th>
-		<th><?php __('Translation Index'); ?></th>
 						<th><?php __('Identifier Id'); ?></th>
-		<th><?php __('Reference String'); ?></th>
+						<th><?php __('User Id'); ?></th>
+						<th><?php __('Comment'); ?></th>
 						<th><?php __('Created'); ?></th>
 						<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 				<?php
 				$i = 0;
-		foreach ($identifier['FileIdentifier'] as $fileIdentifier):
+				foreach ($identifier['Comment'] as $comment):
 					$class = null;
 					if ($i++ % 2 == 0) {
 						$class = ' class="altrow"';
 					}
 				?>
 				<tr<?php echo $class;?>>
-			<td><?php echo $fileIdentifier['id'];?></td>
+					<td><?php echo $comment['id'];?></td>
-			<td><?php echo $fileIdentifier['translation_file_id'];?></td>
+					<td><?php echo $comment['translation_id'];?></td>
-			<td><?php echo $fileIdentifier['command'];?></td>
+					<td><?php echo $comment['identifier_id'];?></td>
-			<td><?php echo $fileIdentifier['translation_index'];?></td>
+					<td><?php echo $comment['user_id'];?></td>
-			<td><?php echo $fileIdentifier['identifier_id'];?></td>
+					<td><?php echo $comment['comment'];?></td>
-			<td><?php echo $fileIdentifier['reference_string'];?></td>
+					<td><?php echo $comment['created'];?></td>
-			<td><?php echo $fileIdentifier['created'];?></td>
+					<td><?php echo $comment['modified'];?></td>
-			<td><?php echo $fileIdentifier['modified'];?></td>
 					<td class="actions">
-				<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'comments', 'action' => 'view', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'comments', 'action' => 'edit', $comment['id'])); ?>
+						<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'comments', 'action' => 'delete', $comment['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $comment['id'])); ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
 			</table>
 			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+						<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Comment', true)), array('controller' => 'comments', 'action' => 'add', 'identifier_id' => $identifier['Identifier']['id']));?></li>
+				</ul>
+			</div>
+		</div>
+		<!-- /RELATED -->
+	</div>
+</div>
+
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_add.ctp

@@ -1,22 +1,50 @@
-<div class="translationFiles form">
+<div class="grid_3">
-<?php echo $this->Form->create('TranslationFile');?>
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Imported Translation File', true)); ?></h2>
+    
+	<div class="importedTranslationFiles form">
+	<?php echo $this->Form->create('ImportedTranslationFile');?>
 		<fieldset>
-		<legend><?php __('Admin Add Translation File'); ?></legend>
+				 		<legend><?php printf(__('Imported Translation File', true)); ?></legend>
 					<?php
 		echo $this->Form->input('language_id');
 		echo $this->Form->input('filename');
+		echo $this->Form->input('merged');
+		echo $this->Form->input('file_last_modified_date');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_edit.ctp

@@ -1,24 +1,51 @@
-<div class="translationFiles form">
+<div class="grid_3">
-<?php echo $this->Form->create('TranslationFile');?>
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Imported Translation File', true)); ?></h2>
+    
+	<div class="importedTranslationFiles form">
+	<?php echo $this->Form->create('ImportedTranslationFile');?>
 		<fieldset>
-		<legend><?php __('Admin Edit Translation File'); ?></legend>
+						<legend><?php printf(__('Imported Translation File # %s', true), $this->Form->value('ImportedTranslationFile.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('language_id');
 		echo $this->Form->input('filename');
+		echo $this->Form->input('merged');
+		echo $this->Form->input('file_last_modified_date');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('TranslationFile.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('TranslationFile.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_index.ctp

@@ -1,14 +1,33 @@
-<div class="importedTranslationFiles index">
+<div class="grid_3">
-	<h2><?php __('Imported Translation Files');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('language_id');?></th>
+				<h5><?php echo __('Imported Translation Files', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('filename');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>				<h5><?php echo __('Languages', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<ul class="menu">
-			<th class="actions"><?php __('Actions');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Raw Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Imported Translation Files');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('filename'),$paginator->sort('merged'),$paginator->sort('file_last_modified_date'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($importedTranslationFiles as $importedTranslationFile):
@@ -18,21 +37,26 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?></td>
 		<td>
 			<?php echo $this->Html->link($importedTranslationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $importedTranslationFile['Language']['id'])); ?>
 		</td>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?></td>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?></td>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $importedTranslationFile['ImportedTranslationFile']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $importedTranslationFile['ImportedTranslationFile']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Export', true), array('controller' => 'raw_files', 'action' => 'export', $importedTranslationFile['ImportedTranslationFile']['filename']), null, sprintf(__('Are you sure you want to export "%s"?', true), $importedTranslationFile['ImportedTranslationFile']['filename'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -42,18 +66,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('action' => 'add')); ?></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/admin_view.ctp

@@ -1,64 +1,119 @@
-<div class="translationFiles view">
+<div class="grid_3">
-<h2><?php  __('Translation File');?></h2>
+	<div class="box menubox">		<h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+			<a href="#" id="toggle-admin-actions">Actions</a>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+		</h2>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="inbox">
-			<?php echo $translationFile['TranslationFile']['id']; ?>
+		<div class="block" id="admin-actions">
-			&nbsp;
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
-		</dd>
+			<ul class="menu">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Language'); ?></dt>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			</ul>
-			<?php echo $this->Html->link($translationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $translationFile['Language']['id'])); ?>
+				
-			&nbsp;
+			<h5>Languages</h5>
-		</dd>
+			<ul class="menu">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Filename'); ?></dt>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-			<?php echo $translationFile['TranslationFile']['filename']; ?>
+			</ul>
-			&nbsp;
+
-		</dd>
+			<h5>Raw Files</h5>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+			<ul class="menu">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
-			<?php echo $translationFile['TranslationFile']['created']; ?>
+			</ul>
-			&nbsp;
+
-		</dd>
+			<h5>File Identifiers</h5>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+			<ul class="menu">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-			<?php echo $translationFile['TranslationFile']['modified']; ?>
-			&nbsp;
-		</dd>
-	</dl>
-</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('Edit Translation File', true), array('action' => 'edit', $translationFile['TranslationFile']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('Delete Translation File', true), array('action' => 'delete', $translationFile['TranslationFile']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translationFile['TranslationFile']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation File', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Language', true), array('controller' => 'languages', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
+	<div class="importedTranslationFiles view">
+	<h2><?php  __('Imported Translation File');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($importedTranslationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $importedTranslationFile['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Merged'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('File Last Modified Date'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
 					<div class="related">
-	<h3><?php __('Related File Identifiers');?></h3>
+			<h3><?php printf(__('Related %s', true), __('File Identifiers', true));?></h3>
-	<?php if (!empty($translationFile['FileIdentifier'])):?>
+			<?php if (!empty($importedTranslationFile['FileIdentifier'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
-		<th><?php __('Translation File Id'); ?></th>
+		<th><?php __('Imported Translation File Id'); ?></th>
 		<th><?php __('Command'); ?></th>
 		<th><?php __('Translation Index'); ?></th>
 		<th><?php __('Identifier Id'); ?></th>
-		<th><?php __('Reference String'); ?></th>
+		<th><?php __('Arguments'); ?></th>
 		<th><?php __('Created'); ?></th>
-		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
-		foreach ($translationFile['FileIdentifier'] as $fileIdentifier):
+				foreach ($importedTranslationFile['FileIdentifier'] as $fileIdentifier):
 					$class = null;
 					if ($i++ % 2 == 0) {
 						$class = ' class="altrow"';
@@ -66,17 +121,14 @@
 				?>
 		<tr<?php echo $class;?>>
 			<td><?php echo $fileIdentifier['id'];?></td>
-			<td><?php echo $fileIdentifier['translation_file_id'];?></td>
+			<td><?php echo $fileIdentifier['imported_translation_file_id'];?></td>
 			<td><?php echo $fileIdentifier['command'];?></td>
 			<td><?php echo $fileIdentifier['translation_index'];?></td>
 			<td><?php echo $fileIdentifier['identifier_id'];?></td>
-			<td><?php echo $fileIdentifier['reference_string'];?></td>
+			<td><?php echo $fileIdentifier['arguments'];?></td>
 			<td><?php echo $fileIdentifier['created'];?></td>
-			<td><?php echo $fileIdentifier['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'file_identifiers', 'action' => 'edit', $fileIdentifier['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'file_identifiers', 'action' => 'delete', $fileIdentifier['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $fileIdentifier['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -85,7 +137,12 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New File Identifier', true), array('controller' => 'file_identifiers', 'action' => 'add'));?> </li>
+					<li></li>
 				</ul>
 			</div>
 		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/index.ctp

@@ -1,14 +1,32 @@
-<div class="importedTranslationFiles index">
+<div class="grid_3">
-	<h2><?php __('Imported Translation Files');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('language_id');?></th>
+				<h5><?php echo __('Imported Translation Files', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('filename');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>				<h5><?php echo __('Languages', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<ul class="menu">
-			<th class="actions"><?php __('Actions');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-	</tr>
+				</ul>
+				<h5><?php echo __('Raw Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('File Identifiers', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Imported Translation Files');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('language_id'),$paginator->sort('filename'),$paginator->sort('merged'),$paginator->sort('file_last_modified_date'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($importedTranslationFiles as $importedTranslationFile):
@@ -18,19 +36,24 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?></td>
 		<td>
 			<?php echo $this->Html->link($importedTranslationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $importedTranslationFile['Language']['id'])); ?>
 		</td>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?></td>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?></td>
-		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?>&nbsp;</td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?></td>
+		<td><?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $importedTranslationFile['ImportedTranslationFile']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -40,16 +63,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/imported_translation_files/view.ctp

@@ -1,58 +1,140 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Imported Translation Files', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Languages</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('controller' => 'languages', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('controller' => 'languages', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Raw Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>File Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('File Identifiers', true)), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="importedTranslationFiles view">
 	<h2><?php  __('Imported Translation File');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $importedTranslationFile['ImportedTranslationFile']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Language'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($importedTranslationFile['Language']['name'], array('controller' => 'languages', 'action' => 'view', $importedTranslationFile['Language']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Filename'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Filename'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $importedTranslationFile['ImportedTranslationFile']['filename']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Merged'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['merged']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('File Last Modified Date'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $importedTranslationFile['ImportedTranslationFile']['file_last_modified_date']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $importedTranslationFile['ImportedTranslationFile']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $importedTranslationFile['ImportedTranslationFile']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
 			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
+					<div class="related">
+				<h3><?php printf(__('Related %s', true), __('Raw Files', true));?></h3>
+			<?php if (!empty($importedTranslationFile['RawFile'])):?>
+				<dl>	<?php $i = 0; $class = ' class="altrow"';?>
+					<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Filename');?></div>
+		<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+	<?php echo $importedTranslationFile['RawFile']['filename'];?>
+</div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Size');?></div>
+		<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+	<?php echo $importedTranslationFile['RawFile']['size'];?>
+</div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Modified');?></div>
+		<div class="dd<?php if ($i++ % 2 == 0) echo $class;?>">
+	<?php echo $importedTranslationFile['RawFile']['modified'];?>
+</div>
+				</dl>
+			<?php endif; ?>
 				<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
 					<ul>
-		<li><?php echo $this->Html->link(__('List Translation Files', true), array('action' => 'index')); ?> </li>
+						<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Raw File', true)), array('controller' => 'raw_files', 'action' => 'edit', $importedTranslationFile['RawFile']['filename'])); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List File Identifiers', true), array('controller' => 'file_identifiers', 'action' => 'index')); ?> </li>
 					</ul>
+				</div>
 			</div>
 					<div class="related">
-	<h3><?php __('Related File Identifiers');?></h3>
+			<h3><?php printf(__('Related %s', true), __('File Identifiers', true));?></h3>
 			<?php if (!empty($importedTranslationFile['FileIdentifier'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
-		<th><?php __('Translation File Id'); ?></th>
+		<th><?php __('Imported Translation File Id'); ?></th>
 		<th><?php __('Command'); ?></th>
 		<th><?php __('Translation Index'); ?></th>
 		<th><?php __('Identifier Id'); ?></th>
-		<th><?php __('Reference String'); ?></th>
+		<th><?php __('Arguments'); ?></th>
 		<th><?php __('Created'); ?></th>
-		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($importedTranslationFile['FileIdentifier'] as $fileIdentifier):
@@ -67,9 +149,8 @@
 			<td><?php echo $fileIdentifier['command'];?></td>
 			<td><?php echo $fileIdentifier['translation_index'];?></td>
 			<td><?php echo $fileIdentifier['identifier_id'];?></td>
-			<td><?php echo $fileIdentifier['reference_string'];?></td>
+			<td><?php echo $fileIdentifier['arguments'];?></td>
 			<td><?php echo $fileIdentifier['created'];?></td>
-			<td><?php echo $fileIdentifier['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
 			</td>
@@ -77,46 +158,15 @@
 	<?php endforeach; ?>
 			</table>
 		<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+					<li></li>
+				</ul>
 			</div>
-<!--<div class="related">
-	<h3><?php __('Related Raw Files');?></h3>
-	<?php if (!empty($importedTranslationFile['RawFile'])):?>
-	<table cellpadding = "0" cellspacing = "0">
-	<tr>
-		<th><?php __('Id'); ?></th>
-		<th><?php __('Translation File Id'); ?></th>
-		<th><?php __('Command'); ?></th>
-		<th><?php __('Translation Index'); ?></th>
-		<th><?php __('Identifier Id'); ?></th>
-		<th><?php __('Reference String'); ?></th>
-		<th><?php __('Created'); ?></th>
-		<th><?php __('Modified'); ?></th>
-		<th class="actions"><?php __('Actions');?></th>
-	</tr>
-	<?php
-		$i = 0;
-		foreach ($importedTranslationFile['FileIdentifier'] as $fileIdentifier):
-			$class = null;
-			if ($i++ % 2 == 0) {
-				$class = ' class="altrow"';
-			}
-		?>
-		<tr<?php echo $class;?>>
-			<td><?php echo $fileIdentifier['id'];?></td>
-			<td><?php echo $fileIdentifier['imported_translation_file_id'];?></td>
-			<td><?php echo $fileIdentifier['command'];?></td>
-			<td><?php echo $fileIdentifier['translation_index'];?></td>
-			<td><?php echo $fileIdentifier['identifier_id'];?></td>
-			<td><?php echo $fileIdentifier['reference_string'];?></td>
-			<td><?php echo $fileIdentifier['created'];?></td>
-			<td><?php echo $fileIdentifier['modified'];?></td>
-			<td class="actions">
-				<?php echo $this->Html->link(__('View', true), array('controller' => 'file_identifiers', 'action' => 'view', $fileIdentifier['id'])); ?>
-			</td>
-		</tr>
-	<?php
-		endforeach; ?>
-	</table>
-	<?php endif; ?>
 		</div>
--->
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/languages/add.ctp

@@ -1,36 +1,35 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">
 				<h2>
 			<a href="#" id="toggle-admin-actions">Actions</a>
 		</h2>
+		<div class="inbox">
 		<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+			<h5><?php echo __('Languages', true); ?></h5>
 			<ul class="menu">
-								<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
-			</ul>
 			
 			<h5>Identifiers</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
 			</ul>
 
-			<h5>Translation Files</h5>
+			<h5>Imported Translation Files</h5>
 			<ul class="menu">
-				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
     <h2 id="page-heading"><?php printf(__('Add %s', true), __('Language', true)); ?></h2>
     
 	<div class="languages form">
 	<?php echo $this->Form->create('Language');?>
 		<fieldset>
-	 		<legend><?php printf(__('Language Record', true)); ?></legend>
+				 		<legend><?php printf(__('Language', true)); ?></legend>
 					<?php
 		echo $this->Form->input('name');
 		echo $this->Form->input('code');

code/ryzom/tools/server/www/webtt/app/views/languages/admin_add.ctp

@@ -1,43 +1,48 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">
 				<h2>
 			<a href="#" id="toggle-admin-actions">Actions</a>
 		</h2>
+		<div class="inbox">
 		<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+			<h5><?php echo __('Languages', true); ?></h5>
 			<ul class="menu">
-								<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
-			</ul>
 			
 			<h5>Identifiers</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
 			</ul>
 
 			<h5>Translation Files</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
     <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Language', true)); ?></h2>
     
 	<div class="languages form">
 	<?php echo $this->Form->create('Language');?>
 		<fieldset>
-	 		<legend><?php printf(__('Language Record', true)); ?></legend>
+				 		<legend><?php printf(__('Language', true)); ?></legend>
 					<?php
 		echo $this->Form->input('name');
 		echo $this->Form->input('code');
 	?>
 		</fieldset>
+		<div class="box">
 <?php echo $this->Form->end(__('Submit', true));?>
-	</div>
+</div>	</div>
 
 </div>
 <div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/languages/admin_edit.ctp

@@ -1,45 +1,49 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">
 				<h2>
 			<a href="#" id="toggle-admin-actions">Actions</a>
 		</h2>
+		<div class="inbox">
 		<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+			<h5><?php echo __('Languages', true); ?></h5>
 			<ul class="menu">
-								<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Language.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Language.id'))); ?></li>
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Language.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Language.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
-								<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>
-			</ul>
 			
 			<h5>Identifiers</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
 			</ul>
 
 			<h5>Translation Files</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
     <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Language', true)); ?></h2>
     
 	<div class="languages form">
 	<?php echo $this->Form->create('Language');?>
 		<fieldset>
-	 		<legend><?php printf(__('Language Record', true)); ?></legend>
+						<legend><?php printf(__('Language # %s', true), $this->Form->value('Language.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('name');
 		echo $this->Form->input('code');
 	?>
 		</fieldset>
+		<div class="box">
 <?php echo $this->Form->end(__('Submit', true));?>
-	</div>
+</div>	</div>
 
 </div>
 <div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/languages/admin_index.ctp

@@ -1,35 +1,33 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">
-				<h2>
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-			<a href="#" id="toggle-admin-actions">Actions</a>
+		<div class="inbox">
-		</h2>
 			<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+				<h5><?php echo __('Languages', true); ?></h5>
 				<ul class="menu">
+					<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
 	<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('action' => 'add')); ?> </li>
 				</ul>
-			
+				<h5><?php echo __('Identifiers', true); ?></h5>
-			<h5>Identifiers</h5>
 				<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
 				</ul>
-
+				<h5><?php echo __('Imported Translation Files', true); ?></h5>
-			<h5>Translation Files</h5>
 				<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Imported Translation File', true)), array('controller' => 'imported_translation_files', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Translation Files', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
 				</ul>
 			</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
 	<h2 id="page-heading"><?php __('Languages');?></h2>
-	
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('code'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
-		
-	<table cellpadding="0" cellspacing="0">
-    <?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('code'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
 		echo '<thead>'.$tableHeaders.'</thead>'; ?>
 
 		<?php
@@ -41,11 +39,11 @@ echo '<thead>'.$tableHeaders.'</thead>'; ?>
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $language['Language']['id']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['id']; ?></td>
-		<td><?php echo $language['Language']['name']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['name']; ?></td>
-		<td><?php echo $language['Language']['code']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['code']; ?></td>
-		<td><?php echo $language['Language']['created']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['created']; ?></td>
-		<td><?php echo $language['Language']['modified']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $language['Language']['id'])); ?>
 			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $language['Language']['id'])); ?>
@@ -53,7 +51,8 @@ echo '<thead>'.$tableHeaders.'</thead>'; ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
-<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>    </table>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
 
 	
 	<p>
@@ -65,10 +64,8 @@ echo '<thead>'.$tableHeaders.'</thead>'; ?>
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
-		
 </div>
 <div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/languages/admin_view.ctp

@@ -1,10 +1,10 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">		<h2>
-				<h2>
 			<a href="#" id="toggle-admin-actions">Actions</a>
 		</h2>
+		<div class="inbox">
 		<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+			<h5><?php echo __('Languages', true); ?></h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Language', true)), array('action' => 'edit', $language['Language']['id'])); ?> </li>
 				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Language', true)), array('action' => 'delete', $language['Language']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $language['Language']['id'])); ?> </li>
@@ -15,51 +15,66 @@
 			<h5>Identifiers</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Imported Translation Files</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
 			</ul>
 
 			<h5>Translation Files</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
 
 <div class="box">
 	<div class="languages view">
 	<h2><?php  __('Language');?></h2>
 		<div class="block">
-			<dl><?php $i = 0; $class = ' class="altrow"';?>
+			<div class="dl">
-						<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<?php $i = 1; $class = ' altrow';?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['name']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Code'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Code'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['code']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-			</dl>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
 		</div>
 	</div>
 </div>
@@ -69,6 +84,8 @@
 		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
 	</h2>
 	<div class="block" id="related-records">
+		<!-- RELATED -->
+		<!-- Identifier -->
 		<div class="related">
 			<h3><?php printf(__('Related %s', true), __('Identifiers', true));?></h3>
 			<?php if (!empty($language['Identifier'])):?>
@@ -77,8 +94,10 @@
 					<tr>
 						<th><?php __('Id'); ?></th>
 						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Translation File Id'); ?></th>
 						<th><?php __('Translation Index'); ?></th>
 						<th><?php __('Identifier'); ?></th>
+						<th><?php __('Arguments'); ?></th>
 						<th><?php __('Reference String'); ?></th>
 						<th><?php __('Translated'); ?></th>
 						<th><?php __('Created'); ?></th>
@@ -97,16 +116,16 @@
 				<tr<?php echo $class;?>>
 					<td><?php echo $identifier['id'];?></td>
 					<td><?php echo $identifier['language_id'];?></td>
+					<td><?php echo $identifier['translation_file_id'];?></td>
 					<td><?php echo $identifier['translation_index'];?></td>
 					<td><?php echo $identifier['identifier'];?></td>
+					<td><?php echo $identifier['arguments'];?></td>
 					<td><?php echo $identifier['reference_string'];?></td>
 					<td><?php echo $identifier['translated'];?></td>
 					<td><?php echo $identifier['created'];?></td>
 					<td><?php echo $identifier['modified'];?></td>
 					<td class="actions">
 						<?php echo $this->Html->link(__('View', true), array('controller' => 'identifiers', 'action' => 'view', $identifier['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'identifiers', 'action' => 'edit', $identifier['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'identifiers', 'action' => 'delete', $identifier['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifier['id'])); ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
@@ -115,20 +134,67 @@
 
 			<div class="actions">
 				<ul>
-					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add'));?> </li>
 				</ul>
 			</div>
 		</div>
+		<!-- ImportedTranslationFile -->
 		<div class="related">
-			<h3><?php printf(__('Related %s', true), __('Translation Files', true));?></h3>
+			<h3><?php printf(__('Related %s', true), __('Imported Translation Files', true));?></h3>
-			<?php if (!empty($language['TranslationFile'])):?>
+			<?php if (!empty($language['ImportedTranslationFile'])):?>
 			<table cellpadding = "0" cellspacing = "0">
 				<thead>
 					<tr>
 						<th><?php __('Id'); ?></th>
 						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Translation File Id'); ?></th>
 						<th><?php __('Filename'); ?></th>
 						<th><?php __('Merged'); ?></th>
+						<th><?php __('File Last Modified Date'); ?></th>
+						<th><?php __('Created'); ?></th>
+						<th><?php __('Modified'); ?></th>
+						<th class="actions"><?php __('Actions');?></th>
+					</tr>
+				</thead>
+				<?php
+				$i = 0;
+				foreach ($language['ImportedTranslationFile'] as $importedTranslationFile):
+					$class = null;
+					if ($i++ % 2 == 0) {
+						$class = ' class="altrow"';
+					}
+				?>
+				<tr<?php echo $class;?>>
+					<td><?php echo $importedTranslationFile['id'];?></td>
+					<td><?php echo $importedTranslationFile['language_id'];?></td>
+					<td><?php echo $importedTranslationFile['translation_file_id'];?></td>
+					<td><?php echo $importedTranslationFile['filename'];?></td>
+					<td><?php echo $importedTranslationFile['merged'];?></td>
+					<td><?php echo $importedTranslationFile['file_last_modified_date'];?></td>
+					<td><?php echo $importedTranslationFile['created'];?></td>
+					<td><?php echo $importedTranslationFile['modified'];?></td>
+					<td class="actions">
+						<?php echo $this->Html->link(__('View', true), array('controller' => 'imported_translation_files', 'action' => 'view', $importedTranslationFile['id'])); ?>
+					</td>
+				</tr>
+				<?php endforeach; ?>
+			</table>
+			<?php endif; ?>
+
+			<div class="actions">
+				<ul>
+				</ul>
+			</div>
+		</div>
+		<!-- TranslationFile -->
+		<div class="related">
+			<h3><?php printf(__('Related %s', true), __('Translation Files', true));?></h3>
+			<?php if (!empty($language['TranslationFile'])):?>
+			<table cellpadding = "0" cellspacing = "0">
+				<thead>
+					<tr>
+						<th><?php __('Id'); ?></th>
+						<th><?php __('Language Id'); ?></th>
+						<th><?php __('Filename Template'); ?></th>
 						<th><?php __('Created'); ?></th>
 						<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
@@ -145,14 +211,11 @@
 				<tr<?php echo $class;?>>
 					<td><?php echo $translationFile['id'];?></td>
 					<td><?php echo $translationFile['language_id'];?></td>
-			<td><?php echo $translationFile['filename'];?></td>
+					<td><?php echo $translationFile['filename_template'];?></td>
-			<td><?php echo $translationFile['merged'];?></td>
 					<td><?php echo $translationFile['created'];?></td>
 					<td><?php echo $translationFile['modified'];?></td>
 					<td class="actions">
 						<?php echo $this->Html->link(__('View', true), array('controller' => 'translation_files', 'action' => 'view', $translationFile['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translation_files', 'action' => 'edit', $translationFile['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translation_files', 'action' => 'delete', $translationFile['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translationFile['id'])); ?>
 					</td>
 				</tr>
 				<?php endforeach; ?>
@@ -161,10 +224,10 @@
 
 			<div class="actions">
 				<ul>
-					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'translation_files', 'action' => 'add'));?> </li>
 				</ul>
 			</div>
 		</div>
+		<!-- /RELATED -->
 	</div>
 </div>
 

code/ryzom/tools/server/www/webtt/app/views/languages/edit.ctp

@@ -1,37 +1,35 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">
 				<h2>
 			<a href="#" id="toggle-admin-actions">Actions</a>
 		</h2>
+		<div class="inbox">
 		<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+			<h5><?php echo __('Languages', true); ?></h5>
 			<ul class="menu">
-								<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Language.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Language.id'))); ?></li>
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>			</ul>
-								<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index'));?></li>
-			</ul>
 			
 			<h5>Identifiers</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
 			</ul>
 
-			<h5>Translation Files</h5>
+			<h5>Imported Translation Files</h5>
 			<ul class="menu">
-				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'translation_files', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'translation_files', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
     <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Language', true)); ?></h2>
     
 	<div class="languages form">
 	<?php echo $this->Form->create('Language');?>
 		<fieldset>
-	 		<legend><?php printf(__('Language Record', true)); ?></legend>
+						<legend><?php printf(__('Language # %s', true), $this->Form->value('Language.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('name');

code/ryzom/tools/server/www/webtt/app/views/languages/index.ctp

@@ -1,35 +1,22 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">
-				<h2>
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-			<a href="#" id="toggle-admin-actions">Actions</a>
+		<div class="inbox">
-		</h2>
 			<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+				<h5><?php echo __('Languages', true); ?></h5>
-			<ul class="menu">
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('action' => 'add')); ?></li>
+				</ul>				<h5><?php echo __('Identifiers', true); ?></h5>
-			</ul>
-			
-			<h5>Identifiers</h5>
 				<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-			</ul>
-
-			<h5>Translation Files</h5>
-			<ul class="menu">
-				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Imported Translation File', true)), array('controller' => 'imported_translation_files', 'action' => 'add')); ?> </li>
 				</ul>
 			</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
 	<h2 id="page-heading"><?php __('Languages');?></h2>
-	
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('code'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
-		
-	<table cellpadding="0" cellspacing="0">
-    <?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('code'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
 		echo '<thead>'.$tableHeaders.'</thead>'; ?>
 
 		<?php
@@ -41,19 +28,19 @@ echo '<thead>'.$tableHeaders.'</thead>'; ?>
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $language['Language']['id']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['id']; ?></td>
-		<td><?php echo $language['Language']['name']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['name']; ?></td>
-		<td><?php echo $language['Language']['code']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['code']; ?></td>
-		<td><?php echo $language['Language']['created']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['created']; ?></td>
-		<td><?php echo $language['Language']['modified']; ?>&nbsp;</td>
+		<td><?php echo $language['Language']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $language['Language']['id'])); ?>
-			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $language['Language']['id'])); ?>
+			| <?php echo $this->Html->link(__('List Translation Files', true), array('controller' => 'translation_files', 'action' => 'index', 'language_id' => $language['Language']['id'])); ?>
-			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $language['Language']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $language['Language']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
-<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>    </table>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
+	</table>
 
 	
 	<p>
@@ -65,10 +52,8 @@ echo '<thead>'.$tableHeaders.'</thead>'; ?>
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
-		
 </div>
 <div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/languages/view.ctp

@@ -1,65 +1,67 @@
-<div class="grid_4">	
+<div class="grid_3">
-	<div class="box">			
+	<div class="box menubox">		<h2>
-				<h2>
 			<a href="#" id="toggle-admin-actions">Actions</a>
 		</h2>
+		<div class="inbox">
 		<div class="block" id="admin-actions">
-			<h5>Languages</h5>
+			<h5><?php echo __('Languages', true); ?></h5>
 			<ul class="menu">
-				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Language', true)), array('action' => 'edit', $language['Language']['id'])); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Language', true)), array('action' => 'delete', $language['Language']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $language['Language']['id'])); ?> </li>
 							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Languages', true)), array('action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Language', true)), array('action' => 'add')); ?> </li>
 			</ul>
 				
 			<h5>Identifiers</h5>
 			<ul class="menu">
 				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-			</ul>
-
-			<h5>Translation Files</h5>
-			<ul class="menu">
-				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
-				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation File', true)), array('controller' => 'imported_translation_files', 'action' => 'add')); ?> </li>
 			</ul>
 		</div>
 		</div>
 	</div>
+</div>
 
-<div class="grid_12">
+<div class="grid_13">
 
 <div class="box">
 	<div class="languages view">
 	<h2><?php  __('Language');?></h2>
 		<div class="block">
-			<dl><?php $i = 0; $class = ' class="altrow"';?>
+			<div class="dl">
-						<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<?php $i = 1; $class = ' altrow';?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['name']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Code'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Code'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['code']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $language['Language']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-			</dl>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
 		</div>
 	</div>
 </div>
@@ -77,8 +79,8 @@
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Language Id'); ?></th>
-		<th><?php __('Translation Index'); ?></th>
 		<th><?php __('Identifier'); ?></th>
+		<th><?php __('Arguments'); ?></th>
 		<th><?php __('Reference String'); ?></th>
 		<th><?php __('Translated'); ?></th>
 		<th><?php __('Created'); ?></th>
@@ -97,73 +99,22 @@
 		<tr<?php echo $class;?>>
 			<td><?php echo $identifier['id'];?></td>
 			<td><?php echo $identifier['language_id'];?></td>
-			<td><?php echo $identifier['translation_index'];?></td>
 			<td><?php echo $identifier['identifier'];?></td>
+			<td><?php echo $identifier['arguments'];?></td>
 			<td><?php echo $identifier['reference_string'];?></td>
 			<td><?php echo $identifier['translated'];?></td>
 			<td><?php echo $identifier['created'];?></td>
 			<td><?php echo $identifier['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'identifiers', 'action' => 'view', $identifier['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'identifiers', 'action' => 'edit', $identifier['id'])); ?>
+				| <?php echo $this->Html->link(__('Add Translation', true), array('controller' => 'translations', 'action' => 'add', 'identifier' => $identifier['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'identifiers', 'action' => 'delete', $identifier['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $identifier['id'])); ?>
+				| <?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index', 'identifier' => $identifier['id'])); ?>
-			</td>
-		</tr>
-	<?php endforeach; ?>
-			</table>
-		<?php endif; ?>
-
-			<div class="actions">
-				<ul>
-					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Identifier', true)), array('controller' => 'identifiers', 'action' => 'add'));?> </li>
-				</ul>
-			</div>
-		</div>
-				<div class="related">
-			<h3><?php printf(__('Related %s', true), __('Imported Translation Files', true));?></h3>
-			<?php if (!empty($language['ImportedTranslationFile'])):?>
-			<table cellpadding = "0" cellspacing = "0">
-				<thead>
-					<tr>
-								<th><?php __('Id'); ?></th>
-		<th><?php __('Language Id'); ?></th>
-		<th><?php __('Filename'); ?></th>
-		<th><?php __('Merged'); ?></th>
-		<th><?php __('Created'); ?></th>
-		<th><?php __('Modified'); ?></th>
-						<th class="actions"><?php __('Actions');?></th>
-					</tr>
-				</thead>
-			<?php
-				$i = 0;
-				foreach ($language['ImportedTranslationFile'] as $importedTranslationFile):
-					$class = null;
-					if ($i++ % 2 == 0) {
-						$class = ' class="altrow"';
-					}
-				?>
-		<tr<?php echo $class;?>>
-			<td><?php echo $importedTranslationFile['id'];?></td>
-			<td><?php echo $importedTranslationFile['language_id'];?></td>
-			<td><?php echo $importedTranslationFile['filename'];?></td>
-			<td><?php echo $importedTranslationFile['merged'];?></td>
-			<td><?php echo $importedTranslationFile['created'];?></td>
-			<td><?php echo $importedTranslationFile['modified'];?></td>
-			<td class="actions">
-				<?php echo $this->Html->link(__('View', true), array('controller' => 'imported_translation_files', 'action' => 'view', $importedTranslationFile['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'imported_translation_files', 'action' => 'edit', $importedTranslationFile['id'])); ?>
-				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'imported_translation_files', 'action' => 'delete', $importedTranslationFile['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $importedTranslationFile['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
 			</table>
 		<?php endif; ?>
 
-			<div class="actions">
-				<ul>
-					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Imported Translation File', true)), array('controller' => 'imported_translation_files', 'action' => 'add'));?> </li>
-				</ul>
-			</div>
 		</div>
 			</div>
 </div>

code/ryzom/tools/server/www/webtt/app/views/layouts/new.ctp

@@ -2,11 +2,14 @@
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 	<?php echo $this->Html->charset(); ?>
-	<title><?php echo $title_for_layout; ?></title>
+	<title>
+		<?php __('Ryzom Core: Web Translation Tool :: '); ?>
+		<?php echo $title_for_layout; ?>
+	</title>
 	<?php
 		echo $this->Html->meta('icon');
 		//echo $this->Html->css('cake.generic');
-		echo $this->Html->css(array('reset', 'text', 'grid', 'layout', 'nav'));
+		echo $this->Html->css(array('reset', 'text', 'grid', 'layout', 'nav', 'labelWidth'));
 		echo '<!--[if IE 6]>'.$this->Html->css('ie6').'<![endif]-->';
 		echo '<!--[if IE 7]>'.$this->Html->css('ie').'<![endif]-->';
 		echo $this->Html->script(array('jquery-1.3.2.min.js', 'jquery-ui.js', 'jquery-fluid16.js'));
@@ -14,25 +17,78 @@
 	?>
 </head>
 <body>
-	<div class="container_16">			
+	<div class="container_16" style="background: none repeat scroll 0pt 0pt rgba(40, 60, 60, 0.6);">
 		<div class="grid_16">
-			<h1 id="branding">
+			<div style="text-align: right; float: right">
-				<a href="/">Site</a>
+				<a href="http://dev.ryzom.com/"><img border="0" alt="" src="http://www.ryzom.com/data/logo.gif"></a>
+			</div>
+			<h2 id="branding" style="background: none; float: left">
+				<a href="/">Ryzom Core: Web-Based Translation Tool</a>
 			</h1>
 		</div>
-		<div class="clear"></div>
+		<div style="clear: both"></div>
+	</div>
+	<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+	<?php
+	if
 (isset($this->params['prefix']) && $this->params['prefix'] == "admin") {
+		?>
+		<div class="container_16" style="background: none repeat scroll 0pt 0pt rgba(40, 60, 60, 0.9);">
+			<div class="grid_16">
+				<div style="margin:5px">
+				<h5>
+				<?php echo $this->Html->link(__('Back to admin page', true), array('controller' => 'pages', 'action' => 'display', 'prefix' => 'admin', 'home')); ?>
+				</h5>
+				</div>		
+			</div>
+			<div style="clear: both"></div>
+		</div>
+		<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+		<?php
+	}
+	?>
+	<?php
+	if
 (isset($assocPath)) {
+		?>
+		<div class="container_16" style="background: none repeat scroll 0pt 0pt rgba(40, 60, 60, 0.9);">
 			<div class="grid_16">
-			 <?php // Possible menu here ?>
+				<div style="margin:5px">
+				<h5>/
+				<?php
+				$path = $assocPath;
+				$text = null;
+				while ($path)
+				{
+					$model = key($path);
+					$path = $path[$model];
+					$controller = Inflector::pluralize(Inflector::underscore($model));
+					echo $this->Html->link(__(Inflector::pluralize($model), true), array('controller' => $controller, 'action' => 'index'));
+					if ($path)
+						echo " / ";
+				}
+				?>
+				</h5>
+				</div>		
 			</div>
+			<div style="clear: both"></div>
+		</div>
+		<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+		<?php
+	}
+	?>
+	<div class="container_16">
+<!--		<div class="clear"></div>
-->
 		
 		<div class="clear" style="height: 10px; width: 100%;"></div>
 		
 			<?php echo $this->Session->flash(); ?>
+			<?php echo $this->Session->flash('auth'); ?>
 
 			<?php echo $content_for_layout; ?>
 		
+		<div class="clear" style="height: 10px; width: 100%;" style="clear: both"></div>
+
 		<div class="clear"></div>
 	</div>
-	<?php echo $this->element('sql_dump'); ?>
+	<?php // echo $this->element('sql_dump'); ?>
 </body>
 </html>

code/ryzom/tools/server/www/webtt/app/views/pages/home.ctp

@@ -17,7 +17,9 @@
  * @license       MIT License (http://www.opensource.org/licenses/mit-license.php)
  */
 ?>
-<h3><?php __('Languages'); ?></h3>
+<div class="grid_16">
+	<h3 id="page-heading"><?php __('Languages'); ?></h3>
 	<p>
 	<?php echo $this->Html->link(__('List Languages', true), array('controller' => 'languages', 'action' => 'index')); ?>
 	</p>
+</div>

code/ryzom/tools/server/www/webtt/app/views/raw_files/index.ctp

@@ -1,32 +1,51 @@
-<div class="votes index">
+<div class="grid_3">
-	<h2><?php __('Source files');?></h2>
+	<div class="box menubox">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
+		<div class="inbox">
+			<div class="block" id="admin-actions">
+				<h5>Raw Files</h5>
+				<ul class="menu">				
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Raw Files', true)), array('action' => 'index')); ?> </li>
+				</ul>
+				<h5>Imported Translation Files</h5>
+<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Imported Translation Files', true)), array('controller' => 'imported_translation_files', 'action' => 'index')); ?> </li>
+</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Raw Files');?></h2>
 	<table cellpadding="0" cellspacing="0">
-	<tr>
+		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('filename'),$paginator->sort('size'),$paginator->sort('modified'),__('Actions', true),));
-			<th><?php echo $this->Paginator->sort('filename');?></th>
+echo '<thead>'.$tableHeaders.'</thead>'; ?>
-			<th><?php echo $this->Paginator->sort('size');?></th>
+
-			<th><?php echo $this->Paginator->sort('modified');?></th>
-			<th class="actions"><?php __('Actions');?></th>
-	</tr>
 <?php
 		$i = 0;
-	foreach ($rawFiles as $object):
+		foreach ($rawFiles as $rawFile):
 			$class = null;
 			if ($i++ % 2 == 0) {
 				$class = ' class="altrow"';
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $object['RawFile']['filename']; ?>&nbsp;</td>
+		<td><?php echo $rawFile['RawFile']['filename']; ?></td>
-		<td><?php echo $object['RawFile']['size']; ?>&nbsp;</td>
+		<td><?php echo $rawFile['RawFile']['size']; ?></td>
-		<td><?php echo $this->Time->nice($object['RawFile']['modified']); ?>&nbsp;</td>
+		<td><?php echo $this->Time->nice($rawFile['RawFile']['modified']); ?></td>
 		<td class="actions">
-			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $object['RawFile']['filename'])); ?>
+			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $rawFile['RawFile']['filename'])); ?>
-			<?php echo $this->Html->link(__('Import', true), array('action' => 'import', $object['RawFile']['filename'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Import', true), array('action' => 'import', $rawFile['RawFile']['filename'])); ?>
-			<?php echo $this->Html->link(__('Export', true), array('action' => 'export', $object['RawFile']['filename']), null, sprintf(__('Are you sure you want to export # %s?', true), $object['RawFile']['filename'])); ?>
+<!--			<?php echo ' | ' . $this->Html->link(__('Export', true), array('action' => 'export', $rawFile['RawFile']['filename'])); ?>-->
+<!--			<?php echo ' | ' . __('Export', true); ?>-->
+<!--			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $rawFile['RawFile']['filename']), null, sprintf(__('Are you sure you want to delete # %s?', true), $rawFile['RawFile']['filename'])); ?>-->
 		</td>
 	</tr>
 <?php endforeach; ?>
-	</table>
+<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -41,12 +60,5 @@
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
+<? echo $this->element('sql_dump');?>
-	<ul>
-		<li><?php echo $this->Html->link(__('List Raw Files', true), array('controller' => 'raw_files', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/translations/add.ctp

@@ -1,25 +1,129 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+
+
+<div class="grid_13">
+
+
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Translation', true)); ?></h2>
+    
 	<div class="translations form">
 	<?php echo $this->Form->create('Translation');?>
 		<fieldset>
-		<legend><?php __('Add Translation'); ?></legend>
+				 		<legend><?php printf(__('Translation', true)); ?></legend>
 					<?php
-		echo $this->Form->input('identifier_id');
+//		echo ($identifiers[$identifier['Identifier']['id']
+		echo $this->Form->hidden('identifier_id', array('default' => $identifier['Identifier']['id']));
 		echo $this->Form->input('translation_text');
-		echo $this->Form->input('user_id');
+		// TODO: change user_id for authorized user
+		echo $this->Form->hidden('user_id', array('default' => 1));
 	?>
 		</fieldset>
+		<div class="box">
 		<?php echo $this->Form->end(__('Submit', true));?>
 		</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-
-		<li><?php echo $this->Html->link(__('List Translations', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 	</div>
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Index'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translation_index']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/translations/admin_add.ctp

@@ -1,7 +1,42 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Translation', true)); ?></h2>
+    
 	<div class="translations form">
 	<?php echo $this->Form->create('Translation');?>
 		<fieldset>
-		<legend><?php __('Admin Add Translation'); ?></legend>
+				 		<legend><?php printf(__('Translation', true)); ?></legend>
 					<?php
 		echo $this->Form->input('identifier_id');
 		echo $this->Form->input('translation_text');
@@ -10,16 +45,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Translations', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/translations/admin_edit.ctp

@@ -1,7 +1,42 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Translation.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Translation.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Translation', true)); ?></h2>
+    
 	<div class="translations form">
 	<?php echo $this->Form->create('Translation');?>
 		<fieldset>
-		<legend><?php __('Admin Edit Translation'); ?></legend>
+						<legend><?php printf(__('Translation # %s', true), $this->Form->value('Translation.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('identifier_id');
@@ -11,17 +46,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Translation.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Translation.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/translations/admin_index.ctp

@@ -1,15 +1,35 @@
-<div class="translations index">
+<div class="grid_3">
-	<h2><?php __('Translations');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('identifier_id');?></th>
+				<h5><?php echo __('Translations', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('translation_text');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('user_id');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('action' => 'add')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>				<h5><?php echo __('Identifiers', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<ul class="menu">
-			<th class="actions"><?php __('Actions');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-	</tr>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Translations');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('translation_text'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($translations as $translation):
@@ -19,24 +39,27 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $translation['Translation']['id']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['id']; ?></td>
 		<td>
 			<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
 		</td>
-		<td><?php echo $translation['Translation']['translation_text']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['translation_text']; ?></td>
 		<td>
 			<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
 		</td>
-		<td><?php echo $translation['Translation']['created']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['created']; ?></td>
-		<td><?php echo $translation['Translation']['modified']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $translation['Translation']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $translation['Translation']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -46,23 +69,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('action' => 'add')); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/translations/admin_view.ctp

@@ -1,57 +1,101 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Translation', true)), array('action' => 'edit', $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Translation', true)), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="translations view">
 	<h2><?php  __('Translation');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $translation['Translation']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Identifier'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation Text'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Text'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $translation['Translation']['translation_text']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $translation['Translation']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $translation['Translation']['modified']; ?>
-			&nbsp;
+
-		</dd>
-	</dl>
 		</div>
-<div class="actions">
+		<?php $i++; ?>
-	<h3><?php __('Actions'); ?></h3>
+		<div style="clear: both"></div>
-	<ul>
-		<li><?php echo $this->Html->link(__('Edit Translation', true), array('action' => 'edit', $translation['Translation']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('Delete Translation', true), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Identifier', true), array('controller' => 'identifiers', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 			</div>
+		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
 				<div class="related">
-	<h3><?php __('Related Votes');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
 			<?php if (!empty($translation['Vote'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Translation Id'); ?></th>
@@ -60,6 +104,7 @@
 		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($translation['Vote'] as $vote):
@@ -76,8 +121,8 @@
 			<td><?php echo $vote['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -86,7 +131,12 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add'));?> </li>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/translations/edit.ctp

@@ -1,28 +1,121 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Translation.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Translation.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Translation', true)); ?></h2>
+    
 	<div class="translations form">
 	<?php echo $this->Form->create('Translation');?>
 		<fieldset>
-		<legend><?php __('Edit Translation'); ?></legend>
+						<legend><?php printf(__('Translation # %s', true), $this->Form->value('Translation.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
-		echo $this->Form->input('identifier_id');
+		echo $this->Form->input('identifier_id', array('type' => 'text', 'name'=>'buzu', 'value'=>$identifiers[$this->Form->value('Translation.identifier_id')], 'readonly' => 'readonly'));
+		echo $this->Form->hidden('identifier_id', array('default' => $this->Form->value('Translation.identifier_id')));
 		echo $this->Form->input('translation_text');
-		echo $this->Form->input('user_id');
+		// TODO: change user_id for authorized user
+		echo $this->Form->hidden('user_id', array('default' => 1));
 	?>
 		</fieldset>
+		<div class="box">
 		<?php echo $this->Form->end(__('Submit', true));?>
 		</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Translation.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Translation.id'))); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('action' => 'index'));?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-	</ul>
 	</div>
+
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/translations/index.ctp

@@ -1,15 +1,34 @@
-<div class="translations index">
+<div class="grid_3">
-	<h2><?php __('Translations');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('identifier_id');?></th>
+				<h5><?php echo __('Translations', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('translation_text');?></th>
+				<ul class="menu">
-			<th><?php echo $this->Paginator->sort('user_id');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				</ul>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<h5><?php echo __('Identifiers', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Translations');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('identifier_id'),$paginator->sort('translation_text'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($translations as $translation):
@@ -19,22 +38,28 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $translation['Translation']['id']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['id']; ?></td>
 		<td>
 			<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
 		</td>
-		<td><?php echo $translation['Translation']['translation_text']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['translation_text']; ?></td>
 		<td>
 			<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
 		</td>
-		<td><?php echo $translation['Translation']['created']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['created']; ?></td>
-		<td><?php echo $translation['Translation']['modified']; ?>&nbsp;</td>
+		<td><?php echo $translation['Translation']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $translation['Translation']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?>
+			| <?php echo $this->Html->link(__('Vote', true), array('controller' => 'votes', 'action' => 'vote', 'translation' => $translation['Translation']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -44,20 +69,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('action' => 'add')); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/translations/view.ctp

@@ -1,57 +1,166 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Translations', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Translation', true)), array('action' => 'edit', $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Translation', true)), array('action' => 'delete', $translation['Translation']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['Translation']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Identifiers</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Identifiers', true)), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="translations view">
 		<h2><?php  __('Translation');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 				<?php echo $translation['Translation']['id']; ?>
-			&nbsp;
+			</div>
-		</dd>
+			<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Identifier'); ?></dt>
+			<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+			<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 				<?php echo $this->Html->link($translation['Identifier']['identifier'], array('controller' => 'identifiers', 'action' => 'view', $translation['Identifier']['id'])); ?>
-			[<?php echo $translation['Identifier']['reference_string']; ?>]
+			</div>
-			&nbsp;
+			<?php $i++; ?>
-		</dd>
+			<div style="clear: both"></div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation Text'); ?></dt>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translation Text'); ?></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 				<?php echo $translation['Translation']['translation_text']; ?>
-			&nbsp;
+	
-		</dd>
+			</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
+			<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+			<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 				<?php echo $this->Html->link($translation['User']['name'], array('controller' => 'users', 'action' => 'view', $translation['User']['id'])); ?>
-			&nbsp;
+			</div>
-		</dd>
+			<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+			<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 				<?php echo $translation['Translation']['created']; ?>
-			&nbsp;
+	
-		</dd>
+			</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+			<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<div style="clear: both"></div>
+			<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+			<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 				<?php echo $translation['Translation']['modified']; ?>
-			&nbsp;
+	
-		</dd>
+			</div>
-	</dl>
+			<?php $i++; ?>
+			<div style="clear: both"></div>
+			</div>
+		</div>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('Edit Translation', true), array('action' => 'edit', $translation['Translation']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Identifiers', true), array('controller' => 'identifiers', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-	</ul>
 </div>
+
+<div class="box">
+	<div class="identifiers view">
+	<h2><?php  __('Identifier');?></h2>
+		<div class="block">
+			<div class="dl">
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['id']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Language'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
+			<?php echo $this->Html->link($identifier['Language']['name'], array('controller' => 'languages', 'action' => 'view', $identifier['Language']['id'])); ?>
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Identifier'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['identifier']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Arguments'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['arguments']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Reference String'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['reference_string']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Translated'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['translated']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['created']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
+			<?php echo $identifier['Identifier']['modified']; ?>
+
+		</div>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
+			</div>
+		</div>
+	</div>
+</div>
+
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
 				<div class="related">
-	<h3><?php __('Related Votes');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
 			<?php if (!empty($translation['Vote'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Translation Id'); ?></th>
@@ -60,6 +169,7 @@
 		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($translation['Vote'] as $vote):
@@ -76,7 +186,7 @@
 			<td><?php echo $vote['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -85,7 +195,12 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add'));?> </li>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/users/add.ctp

@@ -1,21 +1,43 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('User', true)); ?></h2>
+    
 	<div class="users form">
 	<?php echo $this->Form->create('User');?>
 		<fieldset>
-		<legend><?php __('Add User'); ?></legend>
+				 		<legend><?php printf(__('User', true)); ?></legend>
 					<?php
 		echo $this->Form->input('name');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Users', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/users/admin_add.ctp

@@ -1,21 +1,43 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('User', true)); ?></h2>
+    
 	<div class="users form">
 	<?php echo $this->Form->create('User');?>
 		<fieldset>
-		<legend><?php __('Admin Add User'); ?></legend>
+				 		<legend><?php printf(__('User', true)); ?></legend>
 					<?php
 		echo $this->Form->input('name');
 	?>
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Users', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/users/admin_edit.ctp

@@ -1,7 +1,37 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('User.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('User.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('User', true)); ?></h2>
+    
 	<div class="users form">
 	<?php echo $this->Form->create('User');?>
 		<fieldset>
-		<legend><?php __('Admin Edit User'); ?></legend>
+						<legend><?php printf(__('User # %s', true), $this->Form->value('User.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('name');
@@ -9,15 +39,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('User.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('User.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/users/admin_index.ctp

@@ -1,13 +1,31 @@
-<div class="users index">
+<div class="grid_3">
-	<h2><?php __('Users');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('name');?></th>
+				<h5><?php echo __('Users', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('action' => 'add')); ?> </li>
-			<th class="actions"><?php __('Actions');?></th>
+				</ul>				<h5><?php echo __('Translations', true); ?></h5>
-	</tr>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Users');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($users as $user):
@@ -17,18 +35,21 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $user['User']['id']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['id']; ?></td>
-		<td><?php echo $user['User']['name']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['name']; ?></td>
-		<td><?php echo $user['User']['created']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['created']; ?></td>
-		<td><?php echo $user['User']['modified']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $user['User']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $user['User']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $user['User']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -38,20 +59,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New User', true), array('action' => 'add')); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/users/admin_view.ctp

@@ -1,45 +1,84 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('User', true)), array('action' => 'edit', $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('User', true)), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="users view">
 	<h2><?php  __('User');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['name']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
 			</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('Edit User', true), array('action' => 'edit', $user['User']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('Delete User', true), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
 				<div class="related">
-	<h3><?php __('Related Translations');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
 			<?php if (!empty($user['Translation'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Identifier Id'); ?></th>
@@ -49,6 +88,7 @@
 		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($user['Translation'] as $translation):
@@ -66,8 +106,8 @@
 			<td><?php echo $translation['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -76,14 +116,15 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add'));?> </li>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
 				<div class="related">
-	<h3><?php __('Related Votes');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
 			<?php if (!empty($user['Vote'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Translation Id'); ?></th>
@@ -92,6 +133,7 @@
 		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($user['Vote'] as $vote):
@@ -108,8 +150,8 @@
 			<td><?php echo $vote['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -118,7 +160,12 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add'));?> </li>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/users/edit.ctp

@@ -1,7 +1,37 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('User', true)); ?></h2>
+    
 	<div class="users form">
 	<?php echo $this->Form->create('User');?>
 		<fieldset>
-		<legend><?php __('Edit User'); ?></legend>
+						<legend><?php printf(__('User # %s', true), $this->Form->value('User.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('name');
@@ -9,15 +39,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('User.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('User.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/users/index.ctp

@@ -1,13 +1,30 @@
-<div class="users index">
+<div class="grid_3">
-	<h2><?php __('Users');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('name');?></th>
+				<h5><?php echo __('Users', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				</ul>				<h5><?php echo __('Translations', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Votes', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Users');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('name'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($users as $user):
@@ -17,18 +34,19 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $user['User']['id']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['id']; ?></td>
-		<td><?php echo $user['User']['name']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['name']; ?></td>
-		<td><?php echo $user['User']['created']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['created']; ?></td>
-		<td><?php echo $user['User']['modified']; ?>&nbsp;</td>
+		<td><?php echo $user['User']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $user['User']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $user['User']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -38,20 +56,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New User', true), array('action' => 'add')); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/users/view.ctp

@@ -1,45 +1,81 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Users', true); ?></h5>
+			<ul class="menu">
+							<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('action' => 'index')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Votes</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('controller' => 'votes', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="users view">
 	<h2><?php  __('User');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Name'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Name'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['name']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $user['User']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
+		<div style="clear: both"></div>
 			</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('Edit User', true), array('action' => 'edit', $user['User']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('Delete User', true), array('action' => 'delete', $user['User']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $user['User']['id'])); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('controller' => 'votes', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add')); ?> </li>
-	</ul>
 		</div>
+	</div>
+</div>
+
+<div class="box">
+	<h2>
+		<a href="#" id="toggle-related-records"><?php echo (__('Related', true)); ?></a>
+	</h2>
+	<div class="block" id="related-records">
 				<div class="related">
-	<h3><?php __('Related Translations');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Translations', true));?></h3>
 			<?php if (!empty($user['Translation'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Identifier Id'); ?></th>
@@ -49,6 +85,7 @@
 		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($user['Translation'] as $translation):
@@ -66,8 +103,8 @@
 			<td><?php echo $translation['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'translations', 'action' => 'view', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'translations', 'action' => 'edit', $translation['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Delete', true), array('controller' => 'translations', 'action' => 'delete', $translation['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $translation['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -76,14 +113,15 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add'));?> </li>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
 				<div class="related">
-	<h3><?php __('Related Votes');?></h3>
+			<h3><?php printf(__('Related %s', true), __('Votes', true));?></h3>
 			<?php if (!empty($user['Vote'])):?>
 			<table cellpadding = "0" cellspacing = "0">
+				<thead>
 					<tr>
 								<th><?php __('Id'); ?></th>
 		<th><?php __('Translation Id'); ?></th>
@@ -92,6 +130,7 @@
 		<th><?php __('Modified'); ?></th>
 						<th class="actions"><?php __('Actions');?></th>
 					</tr>
+				</thead>
 			<?php
 				$i = 0;
 				foreach ($user['Vote'] as $vote):
@@ -108,8 +147,7 @@
 			<td><?php echo $vote['modified'];?></td>
 			<td class="actions">
 				<?php echo $this->Html->link(__('View', true), array('controller' => 'votes', 'action' => 'view', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
+				<?php echo ' | '. $this->Html->link(__('Edit', true), array('controller' => 'votes', 'action' => 'edit', $vote['id'])); ?>
-				<?php echo $this->Html->link(__('Delete', true), array('controller' => 'votes', 'action' => 'delete', $vote['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['id'])); ?>
 			</td>
 		</tr>
 	<?php endforeach; ?>
@@ -118,7 +156,12 @@
 
 			<div class="actions">
 				<ul>
-			<li><?php echo $this->Html->link(__('New Vote', true), array('controller' => 'votes', 'action' => 'add'));?> </li>
+					<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('controller' => 'votes', 'action' => 'add'));?></li>
 				</ul>
 			</div>
 		</div>
+			</div>
+</div>
+
+</div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/votes/add.ctp

@@ -1,7 +1,35 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Add %s', true), __('Vote', true)); ?></h2>
+    
 	<div class="votes form">
 	<?php echo $this->Form->create('Vote');?>
 		<fieldset>
-		<legend><?php __('Add Vote'); ?></legend>
+				 		<legend><?php printf(__('Vote', true)); ?></legend>
 					<?php
 		echo $this->Form->input('translation_id');
 		echo $this->Form->input('user_id');
@@ -9,14 +37,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/votes/admin_add.ctp

@@ -1,7 +1,37 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Add %s', true), __('Vote', true)); ?></h2>
+    
 	<div class="votes form">
 	<?php echo $this->Form->create('Vote');?>
 		<fieldset>
-		<legend><?php __('Admin Add Vote'); ?></legend>
+				 		<legend><?php printf(__('Vote', true)); ?></legend>
 					<?php
 		echo $this->Form->input('translation_id');
 		echo $this->Form->input('user_id');
@@ -9,14 +39,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/votes/admin_edit.ctp

@@ -1,7 +1,37 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+						<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Vote.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Vote.id'))); ?></li>						<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Admin Edit %s', true), __('Vote', true)); ?></h2>
+    
 	<div class="votes form">
 	<?php echo $this->Form->create('Vote');?>
 		<fieldset>
-		<legend><?php __('Admin Edit Vote'); ?></legend>
+						<legend><?php printf(__('Vote # %s', true), $this->Form->value('Vote.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('translation_id');
@@ -10,15 +40,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Vote.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Vote.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/votes/admin_index.ctp

@@ -1,14 +1,31 @@
-<div class="votes index">
+<div class="grid_3">
-	<h2><?php __('Votes');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('translation_id');?></th>
+				<h5><?php echo __('Votes', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('user_id');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				</ul>				<h5><?php echo __('Translations', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Votes');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_id'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($votes as $vote):
@@ -18,23 +35,26 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $vote['Vote']['id']; ?>&nbsp;</td>
+		<td><?php echo $vote['Vote']['id']; ?></td>
 		<td>
 			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
 		</td>
 		<td>
 			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
 		</td>
-		<td><?php echo $vote['Vote']['created']; ?>&nbsp;</td>
+		<td><?php echo $vote['Vote']['created']; ?></td>
-		<td><?php echo $vote['Vote']['modified']; ?>&nbsp;</td>
+		<td><?php echo $vote['Vote']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $vote['Vote']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $vote['Vote']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $vote['Vote']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Delete', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -44,20 +64,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('action' => 'add')); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/votes/admin_view.ctp

@@ -1,43 +1,79 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Vote', true)), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('Delete %s', true), __('Vote', true)), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Translation', true)), array('controller' => 'translations', 'action' => 'add')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('User', true)), array('controller' => 'users', 'action' => 'add')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="votes view">
 	<h2><?php  __('Vote');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $vote['Vote']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $vote['Vote']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $vote['Vote']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
-</div>
+		<div style="clear: both"></div>
-<div class="actions">
+			</div>
-	<h3><?php __('Actions'); ?></h3>
+		</div>
-	<ul>
+	</div>
-		<li><?php echo $this->Html->link(__('Edit Vote', true), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+</div>
-		<li><?php echo $this->Html->link(__('Delete Vote', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?> </li>
+
-		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index')); ?> </li>
+
-		<li><?php echo $this->Html->link(__('New Vote', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/votes/edit.ctp

@@ -1,7 +1,35 @@
+<div class="grid_3">
+	<div class="box menubox">
+				<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+									<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index'));?></li>			</ul>
+			
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+    <h2 id="page-heading"><?php printf(__('Edit %s', true), __('Vote', true)); ?></h2>
+    
 	<div class="votes form">
 	<?php echo $this->Form->create('Vote');?>
 		<fieldset>
-		<legend><?php __('Edit Vote'); ?></legend>
+						<legend><?php printf(__('Vote # %s', true), $this->Form->value('Vote.id')); ?></legend>
 					<?php
 		echo $this->Form->input('id');
 		echo $this->Form->input('translation_id');
@@ -10,15 +38,6 @@
 		</fieldset>
 	<?php echo $this->Form->end(__('Submit', true));?>
 	</div>
-<div class="actions">
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
 
-		<li><?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $this->Form->value('Vote.id')), null, sprintf(__('Are you sure you want to delete # %s?', true), $this->Form->value('Vote.id'))); ?></li>
-		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index'));?></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/views/votes/index.ctp

@@ -1,14 +1,29 @@
-<div class="votes index">
+<div class="grid_3">
-	<h2><?php __('Votes');?></h2>
+	<div class="box menubox">
-	<table cellpadding="0" cellspacing="0">
+		<h2><a href="#" id="toggle-admin-actions">Actions</a></h2>
-	<tr>
+		<div class="inbox">
-			<th><?php echo $this->Paginator->sort('id');?></th>
+			<div class="block" id="admin-actions">
-			<th><?php echo $this->Paginator->sort('translation_id');?></th>
+				<h5><?php echo __('Votes', true); ?></h5>
-			<th><?php echo $this->Paginator->sort('user_id');?></th>
+				<ul class="menu">				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
-			<th><?php echo $this->Paginator->sort('created');?></th>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
-			<th><?php echo $this->Paginator->sort('modified');?></th>
+				</ul>				<h5><?php echo __('Translations', true); ?></h5>
-			<th class="actions"><?php __('Actions');?></th>
+				<ul class="menu">
-	</tr>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+				</ul>
+				<h5><?php echo __('Users', true); ?></h5>
+				<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+				</ul>
+			</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+	<h2 id="page-heading"><?php __('Votes');?></h2>
+	<table cellpadding="0" cellspacing="0">		<?php $tableHeaders = $html->tableHeaders(array($paginator->sort('id'),$paginator->sort('translation_id'),$paginator->sort('user_id'),$paginator->sort('created'),$paginator->sort('modified'),__('Actions', true),));
+		echo '<thead>'.$tableHeaders.'</thead>'; ?>
+
 		<?php
 		$i = 0;
 		foreach ($votes as $vote):
@@ -18,23 +33,25 @@
 			}
 		?>
 	<tr<?php echo $class;?>>
-		<td><?php echo $vote['Vote']['id']; ?>&nbsp;</td>
+		<td><?php echo $vote['Vote']['id']; ?></td>
 		<td>
 			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
 		</td>
 		<td>
 			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
 		</td>
-		<td><?php echo $vote['Vote']['created']; ?>&nbsp;</td>
+		<td><?php echo $vote['Vote']['created']; ?></td>
-		<td><?php echo $vote['Vote']['modified']; ?>&nbsp;</td>
+		<td><?php echo $vote['Vote']['modified']; ?></td>
 		<td class="actions">
 			<?php echo $this->Html->link(__('View', true), array('action' => 'view', $vote['Vote']['id'])); ?>
-			<?php echo $this->Html->link(__('Edit', true), array('action' => 'edit', $vote['Vote']['id'])); ?>
+			<?php echo ' | ' . $this->Html->link(__('Edit', true), array('action' => 'edit', $vote['Vote']['id'])); ?>
-			<?php echo $this->Html->link(__('Delete', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?>
 		</td>
 	</tr>
 	<?php endforeach; ?>
+	<?php echo '<tfoot class=\'dark\'>'.$tableHeaders.'</tfoot>'; ?>
 	</table>
+
+	
 	<p>
 	<?php
 	echo $this->Paginator->counter(array(
@@ -44,20 +61,8 @@
 
 	<div class="paging">
 		<?php echo $this->Paginator->prev('<< '.__('previous', true), array(), null, array('class'=>'disabled'));?>
-	 | 	<?php echo $this->Paginator->numbers();?>
+		| <?php echo $this->Paginator->numbers();?> |
- |
 		<?php echo $this->Paginator->next(__('next', true).' >>', array(), null, array('class' => 'disabled'));?>
 	</div>
 </div>
-<div class="actions">
+<div class="clear"></div>
-	<h3><?php __('Actions'); ?></h3>
-	<ul>
-		<li><?php echo $this->Html->link(__('New Vote', true), array('action' => 'add')); ?></li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><br></li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li style="padding-left: 10px"><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
-</div>

code/ryzom/tools/server/www/webtt/app/views/votes/view.ctp

@@ -1,43 +1,76 @@
+<div class="grid_3">
+	<div class="box menubox">		<h2>
+			<a href="#" id="toggle-admin-actions">Actions</a>
+		</h2>
+		<div class="inbox">
+		<div class="block" id="admin-actions">
+			<h5><?php echo __('Votes', true); ?></h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('Edit %s', true), __('Vote', true)), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Votes', true)), array('action' => 'index')); ?> </li>
+				<li><?php echo $this->Html->link(sprintf(__('New %s', true), __('Vote', true)), array('action' => 'add')); ?> </li>
+			</ul>
+				
+			<h5>Translations</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Translations', true)), array('controller' => 'translations', 'action' => 'index')); ?> </li>
+			</ul>
+
+			<h5>Users</h5>
+			<ul class="menu">
+				<li><?php echo $this->Html->link(sprintf(__('List %s', true), __('Users', true)), array('controller' => 'users', 'action' => 'index')); ?> </li>
+			</ul>
+		</div>
+		</div>
+	</div>
+</div>
+
+<div class="grid_13">
+
+<div class="box">
 	<div class="votes view">
 	<h2><?php  __('Vote');?></h2>
-	<dl><?php $i = 0; $class = ' class="altrow"';?>
+		<div class="block">
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Id'); ?></dt>
+			<div class="dl">
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+			<?php $i = 1; $class = ' altrow';?>
+						<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Id'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $vote['Vote']['id']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Translation'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('Translation'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($vote['Translation']['translation_text'], array('controller' => 'translations', 'action' => 'view', $vote['Translation']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('User'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i % 2 == 0) echo $class;?>"><?php __('User'); ?></div>
+		<div class="dd<?php if ($i % 2 == 0) echo $class;?>">
 			<?php echo $this->Html->link($vote['User']['name'], array('controller' => 'users', 'action' => 'view', $vote['User']['id'])); ?>
-			&nbsp;
+		</div>
-		</dd>
+		<?php $i++; ?>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Created'); ?></dt>
+		<div style="clear: both"></div>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Created'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $vote['Vote']['created']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-		<dt<?php if ($i % 2 == 0) echo $class;?>><?php __('Modified'); ?></dt>
+		<?php $i++; ?>
-		<dd<?php if ($i++ % 2 == 0) echo $class;?>>
+		<div style="clear: both"></div>
+		<div class="dt<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>"><?php __('Modified'); ?></div>
+		<div class="dd<?php if ($i == 1) echo " dh"; else if ($i % 2 == 0) echo $class;?>">
 			<?php echo $vote['Vote']['modified']; ?>
-			&nbsp;
+
-		</dd>
+		</div>
-	</dl>
+		<?php $i++; ?>
-</div>
+		<div style="clear: both"></div>
-<div class="actions">
+			</div>
-	<h3><?php __('Actions'); ?></h3>
+		</div>
-	<ul>
+	</div>
-		<li><?php echo $this->Html->link(__('Edit Vote', true), array('action' => 'edit', $vote['Vote']['id'])); ?> </li>
+</div>
-		<li><?php echo $this->Html->link(__('Delete Vote', true), array('action' => 'delete', $vote['Vote']['id']), null, sprintf(__('Are you sure you want to delete # %s?', true), $vote['Vote']['id'])); ?> </li>
+
-		<li><?php echo $this->Html->link(__('List Votes', true), array('action' => 'index')); ?> </li>
+
-		<li><?php echo $this->Html->link(__('New Vote', true), array('action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Translations', true), array('controller' => 'translations', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New Translation', true), array('controller' => 'translations', 'action' => 'add')); ?> </li>
-		<li><?php echo $this->Html->link(__('List Users', true), array('controller' => 'users', 'action' => 'index')); ?> </li>
-		<li><?php echo $this->Html->link(__('New User', true), array('controller' => 'users', 'action' => 'add')); ?> </li>
-	</ul>
 </div>
+<div class="clear"></div>

code/ryzom/tools/server/www/webtt/app/webroot/css/960.css

@@ -3,6 +3,8 @@
 	Learn more ~ http://960.gs/
 
 	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
 */
 
 /* =Containers

code/ryzom/tools/server/www/webtt/app/webroot/css/cake.generic.css

@@ -207,7 +207,7 @@ div.paging span a {
 dl {
 	line-height: 2em;
 	margin: 0em 0em;
-	width: 60%;
+	width: 80%;
 }
 dl .altrow {
 	background: #f4f4f4;
@@ -218,7 +218,7 @@ dt {
 	vertical-align: top;
 }
 dd {
-	margin-left: 10em;
+	margin-left: 15em;
 	margin-top: -2em;
 	vertical-align: top;
 }

code/ryzom/tools/server/www/webtt/app/webroot/css/grid.css

@@ -3,6 +3,8 @@
 	Learn more ~ http://960.gs/
 
 	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
 */
 
 /* =Containers

code/ryzom/tools/server/www/webtt/app/webroot/css/ie.css

@@ -3,6 +3,8 @@
 	Learn more ~ http://www.designinfluences.com/
 
 	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
 */
 
 /* =Grid >> Global

code/ryzom/tools/server/www/webtt/app/webroot/css/ie6.css

@@ -3,7 +3,9 @@
 	Learn more ~ http://www.designinfluences.com/
 
 	Licensed under GPL and MIT.
-*/
+
+	WebTT template based on 960 Grid System (http://960.gs/)
+4*/
 
 /* =Grid >> Global
 --------------------------------------------------------------------------------*/

code/ryzom/tools/server/www/webtt/app/webroot/css/layout.css

@@ -1,12 +1,18 @@
-/*
+/*
 WebTT template based on 960 Grid System (http://960.gs/)
+
 -----------------------------------------------
 Grey Box Method - Layout CSS
 ----------------------------------------------- */
 
 body {
-	background: #eee;
+	background: #000
;
-	border-top: 5px solid #000;
+	background-image: url("http://www.ryzom.com/data/bg.jpg");
-	color: #333;
+	background-attachment:fixed;
+	background-repeat: repeat-x;
+//	border-top: 5px solid #000;
+	margin-top: 5px;
+//	color: #333;
+	color: #ddd;
 	font-size: 11px;
 	padding: 0 0 40px;
 }
@@ -15,12 +21,16 @@ body {
 /* anchors
 ----------------------------------------------- */
 a {
-	color: #000;
+//	color: #000;
+	color: inherit;
 	font-weight:bold;
 	text-decoration: none;
 }
 a:hover {
-	color:#333;
+//	color:#333;
+//	text-decoration: underline;
+//	text-shadow: #6374AB 0px 0px 2px;
+	text-shadow: #84AFBD 0px 0px 2px;
 }
 
 
@@ -28,7 +38,10 @@ a:hover {
 ----------------------------------------------- */
 .container_12,
 .container_16 {
-	background:#fff;
+	background: rgb(71,71,71);
+	background: rgba(0,0,0, 0.6);
+	border: 1px solid rgb(110,110,110);
+	border: 1px solid rgba(255,255,255, 0.5);
 }
 
 
@@ -42,6 +55,11 @@ h6 {font-size:1em; text-transform:uppercase;}
 
 h1 a {
 	font-weight:normal;
+	color: #ddd;
+}
+h1 a:hover {
+	font-weight:normal;
+	color: #ddd;
 }
 
 
@@ -70,28 +88,70 @@ h2#page-heading {
 /* boxes
 ----------------------------------------------- */
 .box {
-	background:#ddd;
+//	background:rgb(210,210,210);
+//	background:rgba(255,255,255,0.81);
 	margin-bottom:20px;
 	padding:10px 10px 1px 10px;
+//	color: #333;
+	color: #ddd;
+	border: 1px solid rgb(71,71,71);
+	border: 1px solid rgba(255,255,255,0.4);
 }
 .box h2 {
 	font-size:1em;
 	font-weight:normal;
 	text-transform:uppercase;
 	color:#fff;
-	background:#333;
+//	background:#333;
+	background:rgb(31,31,31);
+	background:rgba(90,90,0,0.6);
 	margin:-10px -10px 0 -10px;
 	padding:6px 12px;
 }
 .box h2 a,
 .box h2 a.visible {
-	color:#fff;
+//	color:#fff;
-	background:#333 url("../img/switch_minus.gif") 97% 50% no-repeat;
+	color: #ddd;
+//	background:#333 url("../img/switch_minus.gif") 97% 50% no-repeat;
+	background:url("../img/switch_minus.gif") 97% 50% no-repeat;
+	background:url("../img/switch_minus.gif") 97% 50% no-repeat;
 	display:block;
 	padding:6px 12px;
 	margin:-6px -12px;
 	border:none;
 }
+.box h2 a.hidden,
+.box h2 a.hidden:hover {
+	background-image: url("../img/switch_plus.gif");
+}
+.box h2 a:hover {
+	background-color:#111;
+}
+
+.menubox {
+	padding:0px;
+	color: #333;
+}
+.menubox .inbox {
+	background:rgb(210,210,210);
+	background:rgba(255,255,255,0.81);
+	padding: 0px 10px 1px;
+}
+.inbox a {
+	color: #000;
+}
+.menubox h2 {
+	margin: 0px;
+}
+.menubox h2 a,
+.menubox h2 a.visible {
+	background:rgb(31,31,31) url("../img/switch_minus.gif") 97% 50% no-repeat;
+	background:rgba(90,90,0,0.6) url("../img/switch_minus.gif") 97% 50% no-repeat;
+}
+.menubox h2 a:hover {
+	background-color:#111;
+}
+
 .grid_4 .box h2 a {
 	background-position: 97% 50%;
 }
@@ -103,13 +163,6 @@ h2#page-heading {
 }
 
 
-.box h2 a.hidden,
-.box h2 a.hidden:hover {
-	background-image: url("../img/switch_plus.gif");
-}
-.box h2 a:hover {
-	background-color:#111;
-}
 .block {
 	padding-top:10px;
 }
@@ -245,7 +298,9 @@ ul.section li.current > a.active:hover {
 ----------------------------------------------- */
 table {
 	width:100%;
-	border:1px solid #bbb;
+//	border:1px solid #bbb;
+	border:1px solid #aaa;
+//	border: 1px solid rgba(0,0,0,0.55);
 	margin-bottom:10px;
 }
 col.colC {
@@ -254,10 +309,12 @@ col.colC {
 th, td {
 	padding:.2em 1em;
 	text-align:left;
+	color: #333;
 }
 thead th {
 	border-bottom:2px solid #888;
-	background:#bbb;
+	background: #eee;
+	background:rgba(212,222,255,0.65);
 	padding:.4em 1em .2em;
 }
 thead th.table-head {
@@ -273,6 +330,7 @@ tbody td {
 	border-top:1px solid #bbb;
 	border-bottom:1px solid #bbb;
 	background:#eee;
+	background:rgba(255,255,255,0.85);
 }
 tbody tr.odd th,
 tbody tr.odd td {
@@ -282,6 +340,7 @@ tfoot th,
 tfoot td {
 	border-top:2px solid #666;
 	background:#eee;
+	background:rgba(212,222,255,0.65);
 }
 tfoot tr.total th,
 tfoot tr.total td {
@@ -295,7 +354,7 @@ td.currency {
 	text-align:right;
 }
 tfoot.dark th, tfoot.dark td {
-	background: #bbbbbb;
+//	background: #bbbbbb;
 }
 
 
@@ -309,12 +368,14 @@ fieldset {
 	padding:10px;
 	position:relative;
 	background:#e9e9e9;
+	background:rgba(255,255,255,0.81);
 	margin-bottom:10px;
+	color: #333;
 }
 legend {
 	font-size:1.1em;
 	padding:.4em .8em;
-	background:#fff;
+	background:#f5f5f5;
 	border:1px solid #bbb;
 }
 fieldset.login p {
@@ -531,7 +592,7 @@ div#flashMessage {
 	padding: 10px;
 	margin: 0px 13px 10px 11px;
 	border: 1px dashed #888;
-	background: #eee;
+	background: #ffcccc;
 	font-size: 14px;
 }
 div.flash-error {
@@ -553,6 +614,11 @@ div.error-message {
 	color: #bf0000;
 	font-weight: bold;
 }
+div.form div.box {
+	padding: 10px;
+	background:#e9e9e9;
+	background: none repeat scroll 0 0 rgba(255, 255, 255, 0.81);
+}
 .input {
 	margin: 0px 0px 5px 0px;
 }
@@ -588,7 +654,35 @@ dl {
 	margin: 0em 0em;
 	width: 60%;
 }
-dl .altrow {
+div.dl {
+	border: 1px solid #aaa;
+	color: #333;
+	margin-bottom: 10px;
+}
+div.dh {
+	background: none repeat scroll 0 0 rgba(212, 222, 255, 0.65);
+	padding: 0.4em 1em 0.2em;
+	font-weight: bold;
+	border-bottom: 1px solid #888888;
+	border-top: 0px none;
+}
+.dt, .dd {
+	padding: 0.4em 1em 0.2em;
+	border-top: 1px solid #888888;
+}
+div.dt {
+	float: left;
+	width: 10em;
+	background: transparent;
+	font-weight: bold;
+}
+.dd {
+	background: none repeat scroll 0 0 rgba(255, 255, 255, 0.85);
+}
+.dd:after {
+	clear: both;
+}
+dl .altrow, div .altrow {
 	background: #f4f4f4;
 }
 dt {

code/ryzom/tools/server/www/webtt/app/webroot/css/nav.css

@@ -1,4 +1,5 @@
-/*
+/*
 WebTT template based on 960 Grid System (http://960.gs/)
+
 -----------------------------------------------
 Navigation
 ----------------------------------------------- */

code/ryzom/tools/server/www/webtt/app/webroot/css/text.css

@@ -3,6 +3,8 @@
 	Learn more ~ http://960.gs/
 
 	Licensed under GPL and MIT.
+
+	WebTT template based on 960 Grid System (http://960.gs/)
 */
 
 /* =Basic HTML
@@ -10,7 +12,7 @@
 
 body
 {
-	font: 13px/1.5 Helvetica, Arial, 'Liberation Sans', FreeSans, sans-serif;
+	font: 13px/1.5 'lucida grande',verdana,helvetica,arial,'Liberation Sans', FreeSans, sans-serif
 }
 
 a:focus

code/ryzom/tools/server/www/webtt/cake/console/libs/tasks/view.php

@@ -224,7 +224,7 @@ class ViewTask extends BakeTask {
 		$this->controllerPath = strtolower(Inflector::underscore($this->controllerName));
 
 		$prompt = sprintf(__("Would you like bake to build your views interactively?\nWarning: Choosing no will overwrite %s views if it exist.", true),  $this->controllerName);
-		$interactive = $this->in($prompt, array('y', 'n'), 'n');
+		$interactive = $this->in($prompt, array('y', 'n'), 'y');
 
 		if (strtolower($interactive) == 'n') {
 			$this->interactive = false;
@@ -233,12 +233,13 @@ class ViewTask extends BakeTask {
 		$prompt = __("Would you like to create some CRUD views\n(index, add, view, edit) for this controller?\nNOTE: Before doing so, you'll need to create your controller\nand model classes (including associated models).", true);
 		$wannaDoScaffold = $this->in($prompt, array('y','n'), 'y');
 
-		$wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?", true), array('y','n'), 'n');
+		$wannaDoAdmin = $this->in(__("Would you like to create the views for admin routing?", true), array('y','n'), 'y');
 
 		if (strtolower($wannaDoScaffold) == 'y' || strtolower($wannaDoAdmin) == 'y') {
 			$vars = $this->__loadController();
 			if (strtolower($wannaDoScaffold) == 'y') {
 				$actions = $this->scaffoldActions;
+				$vars['scaffoldPrefix'] = null;
 				$this->bakeActions($actions, $vars);
 			}
 			if (strtolower($wannaDoAdmin) == 'y') {
@@ -248,6 +249,7 @@ class ViewTask extends BakeTask {
 				foreach ($regularActions as $action) {
 					$adminActions[] = $admin . $action;
 				}
+				$vars['scaffoldPrefix'] = $admin;
 				$this->bakeActions($adminActions, $vars);
 			}
 			$this->hr();
@@ -298,17 +300,20 @@ class ViewTask extends BakeTask {
 			$schema = $modelObj->schema(true);
 			$fields = array_keys($schema);
 			$associations = $this->__associations($modelObj);
+			$scaffoldForbiddenActions = $modelObj->scaffoldForbiddenActions;
 		} else {
 			$primaryKey = $displayField = null;
 			$singularVar = Inflector::variable(Inflector::singularize($this->controllerName));
 			$singularHumanName = $this->_singularHumanName($this->controllerName);
 			$fields = $schema = $associations = array();
 		}
+		$controllerMethods = get_class_methods($controllerClassName);
+
 		$pluralVar = Inflector::variable($this->controllerName);
 		$pluralHumanName = $this->_pluralHumanName($this->controllerName);
 
 		return compact('modelClass', 'schema', 'primaryKey', 'displayField', 'singularVar', 'pluralVar',
-				'singularHumanName', 'pluralHumanName', 'fields','associations');
+				'singularHumanName', 'pluralHumanName', 'fields','associations', 'scaffoldForbiddenActions');
 	}
 
 /**
@@ -484,6 +489,8 @@ class ViewTask extends BakeTask {
 				$associations[$type][$assocKey]['foreignKey'] = $assocData['foreignKey'];
 				$associations[$type][$assocKey]['controller'] = Inflector::pluralize(Inflector::underscore($assocData['className']));
 				$associations[$type][$assocKey]['fields'] =  array_keys($model->{$assocKey}->schema(true));
+				$associations[$type][$assocKey]['scaffoldForbiddenActions'] = $model->{$assocKey}->scaffoldForbiddenActions;
+				$associations[$type][$assocKey]['scaffoldActions'] = $model->{$assocKey}->scaffoldActions;
 			}
 		}
 		return $associations;

code/ryzom/tools/server/www/webtt/plugins/debug_kit/views/elements/log_panel.ctp

@@ -27,7 +27,7 @@
 		if ($len > 0):
 			$headers = array(__d('debug_kit', 'Time', true), __d('debug_kit', 'Message', true));
 			$rows = array();
-			for ($i = 0; $i < $len; $i += 2):
+			for ($i = 0; $i < $len; $i += 1):
 				$rows[] = array(
 					$logs[$i][0], h($logs[$i][1])
 				);