diff --git a/application/controllers/projects.php b/application/controllers/projects.php index 3f7e631..af91835 100644 --- a/application/controllers/projects.php +++ b/application/controllers/projects.php @@ -9,8 +9,7 @@ class Projects extends CI_Controller { $this->load->model('Project'); $path = $this->input->get_post('node'); - - + switch($path) { case '/projects/own': $projects = $this->Project->getOwn(); @@ -26,29 +25,29 @@ class Projects extends CI_Controller { array( 'id' => '/projects/own', 'cls' => 'folder', - 'text' => 'Eigene Projekte', - 'icon' => '/ScattPort/assets/images/icons/folder.png',), + 'text' => "Eigene Projekte", + 'icon' => base_url() . 'assets/images/icons/folder.png',), array( 'id' => '/projects/shared', 'cls' => 'leaf', - 'text' => 'Für mich freigegeben', - 'icon' => '/ScattPort/assets/images/icons/folder-share.png', + 'text' => "Für mich freigegeben", + 'icon' => base_url() . 'assets/images/icons/folder-share.png', ), array( 'id' => '/projects/public', 'cls' => 'folder', - 'text' => 'Öffentliche Projekte', - 'icon' => '/ScattPort/assets/images/icons/folder-network.png', + 'text' => "Öffentliche Projekte", + 'icon' => base_url() . 'assets/images/icons/folder-network.png', ), ); } - + $this->output ->set_content_type('application/json') ->set_output(json_encode($projects)); // ->set_output(json_encode(array('count' => $count, 'projects' => $projects))); } - + public function detail($projects, $area, $id) { $result = $this->db->get_where('projects', array('id' => $id))->row_array(); $this->output diff --git a/application/views/header.php b/application/views/header.php index c7578da..eb12c08 100644 --- a/application/views/header.php +++ b/application/views/header.php @@ -17,6 +17,8 @@ $(document).ready(function() { Ext.QuickTips.init(); + + }); @@ -29,4 +31,5 @@ 'padding: 5px;'));?> | 'padding: 5px;'));?> + 'assets/images/lang_de.png', 'style' => 'float: right; margin-top: 18px; margin-right: 5px;'));?> diff --git a/application/views/index.php b/application/views/index.php index 8dc3d8a..05eaaa0 100644 --- a/application/views/index.php +++ b/application/views/index.php @@ -9,6 +9,8 @@ var projectTree = new Ext.tree.TreePanel({ autoScroll: true, enableDD: false, rootVisible: false, + lines: false, + useArrows: true, id: 'treePanel', tbar: [{ icon: BASE_PATH + 'assets/images/icons/box--plus.png', @@ -31,15 +33,6 @@ var projectTree = new Ext.tree.TreePanel({ projectTree.on('click', loadProjectInfo); -var infoPanel = new Ext.Panel({ - region: 'west', - margin: '10 0 0 0', - autoScroll: true, - bodyStyle: 'padding: 10px; background: #eee;', - html: 'Test' -}); - - var tabPanel = new Ext.TabPanel({ xtype: 'tabpanel', resizeTabs: false, @@ -108,9 +101,9 @@ function loadProjectInfo(n) { url: BASE_URL + 'projects/detail' + n.id, method: 'get', success: function ( result, request ) { - + var theResponse = Ext.util.JSON.decode(result.responseText); - + tabPanel.add({ title: 'New Tab ', html: 'Lade Projekt...', @@ -122,7 +115,7 @@ function loadProjectInfo(n) { '

ID: {id}

', '

Name: {name}

' ); - + tpl.overwrite(this.html, data); } }).show(); @@ -140,7 +133,7 @@ function loadProjectInfo(n) { } } }); - + } } diff --git a/assets/css/main.css b/assets/css/main.css index 432b250..15631ae 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -28,3 +28,11 @@ a:hover { .x-viewport body { background: #ededed url('../images/back.png') repeat-x !important; } + +.x-tree-node { + padding: 2px; +} + +.x-tree-node-icon { + height: 16px !important; +} diff --git a/assets/images/lang_de.png b/assets/images/lang_de.png new file mode 100755 index 0000000..ac4a977 Binary files /dev/null and b/assets/images/lang_de.png differ diff --git a/assets/images/lang_us.png b/assets/images/lang_us.png new file mode 100755 index 0000000..10f451f Binary files /dev/null and b/assets/images/lang_us.png differ diff --git a/assets/images/logo.png b/assets/images/logo.png index b626fc4..397e5f2 100644 Binary files a/assets/images/logo.png and b/assets/images/logo.png differ