Fix project tree style
This commit is contained in:
@@ -9,8 +9,7 @@ class Projects extends CI_Controller {
|
|||||||
$this->load->model('Project');
|
$this->load->model('Project');
|
||||||
|
|
||||||
$path = $this->input->get_post('node');
|
$path = $this->input->get_post('node');
|
||||||
|
|
||||||
|
|
||||||
switch($path) {
|
switch($path) {
|
||||||
case '/projects/own':
|
case '/projects/own':
|
||||||
$projects = $this->Project->getOwn();
|
$projects = $this->Project->getOwn();
|
||||||
@@ -26,29 +25,29 @@ class Projects extends CI_Controller {
|
|||||||
array(
|
array(
|
||||||
'id' => '/projects/own',
|
'id' => '/projects/own',
|
||||||
'cls' => 'folder',
|
'cls' => 'folder',
|
||||||
'text' => 'Eigene Projekte',
|
'text' => "Eigene Projekte",
|
||||||
'icon' => '/ScattPort/assets/images/icons/folder.png',),
|
'icon' => base_url() . 'assets/images/icons/folder.png',),
|
||||||
array(
|
array(
|
||||||
'id' => '/projects/shared',
|
'id' => '/projects/shared',
|
||||||
'cls' => 'leaf',
|
'cls' => 'leaf',
|
||||||
'text' => 'Für mich freigegeben',
|
'text' => "Für mich freigegeben",
|
||||||
'icon' => '/ScattPort/assets/images/icons/folder-share.png',
|
'icon' => base_url() . 'assets/images/icons/folder-share.png',
|
||||||
),
|
),
|
||||||
array(
|
array(
|
||||||
'id' => '/projects/public',
|
'id' => '/projects/public',
|
||||||
'cls' => 'folder',
|
'cls' => 'folder',
|
||||||
'text' => 'Öffentliche Projekte',
|
'text' => "Öffentliche Projekte",
|
||||||
'icon' => '/ScattPort/assets/images/icons/folder-network.png',
|
'icon' => base_url() . 'assets/images/icons/folder-network.png',
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
$this->output
|
$this->output
|
||||||
->set_content_type('application/json')
|
->set_content_type('application/json')
|
||||||
->set_output(json_encode($projects));
|
->set_output(json_encode($projects));
|
||||||
// ->set_output(json_encode(array('count' => $count, 'projects' => $projects)));
|
// ->set_output(json_encode(array('count' => $count, 'projects' => $projects)));
|
||||||
}
|
}
|
||||||
|
|
||||||
public function detail($projects, $area, $id) {
|
public function detail($projects, $area, $id) {
|
||||||
$result = $this->db->get_where('projects', array('id' => $id))->row_array();
|
$result = $this->db->get_where('projects', array('id' => $id))->row_array();
|
||||||
$this->output
|
$this->output
|
||||||
|
|||||||
@@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
$(document).ready(function() {
|
$(document).ready(function() {
|
||||||
Ext.QuickTips.init();
|
Ext.QuickTips.init();
|
||||||
|
|
||||||
|
|
||||||
});
|
});
|
||||||
</script>
|
</script>
|
||||||
</head>
|
</head>
|
||||||
@@ -29,4 +31,5 @@
|
|||||||
<?=anchor('auth/settings', "Einstellungen", array('style' => 'padding: 5px;'));?> |
|
<?=anchor('auth/settings', "Einstellungen", array('style' => 'padding: 5px;'));?> |
|
||||||
<?=anchor('auth/logout', "Logout", array('style' => 'padding: 5px;'));?>
|
<?=anchor('auth/logout', "Logout", array('style' => 'padding: 5px;'));?>
|
||||||
</div>
|
</div>
|
||||||
|
<?=img(array('src' => 'assets/images/lang_de.png', 'style' => 'float: right; margin-top: 18px; margin-right: 5px;'));?>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -9,6 +9,8 @@ var projectTree = new Ext.tree.TreePanel({
|
|||||||
autoScroll: true,
|
autoScroll: true,
|
||||||
enableDD: false,
|
enableDD: false,
|
||||||
rootVisible: false,
|
rootVisible: false,
|
||||||
|
lines: false,
|
||||||
|
useArrows: true,
|
||||||
id: 'treePanel',
|
id: 'treePanel',
|
||||||
tbar: [{
|
tbar: [{
|
||||||
icon: BASE_PATH + 'assets/images/icons/box--plus.png',
|
icon: BASE_PATH + 'assets/images/icons/box--plus.png',
|
||||||
@@ -31,15 +33,6 @@ var projectTree = new Ext.tree.TreePanel({
|
|||||||
|
|
||||||
projectTree.on('click', loadProjectInfo);
|
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({
|
var tabPanel = new Ext.TabPanel({
|
||||||
xtype: 'tabpanel',
|
xtype: 'tabpanel',
|
||||||
resizeTabs: false,
|
resizeTabs: false,
|
||||||
@@ -108,9 +101,9 @@ function loadProjectInfo(n) {
|
|||||||
url: BASE_URL + 'projects/detail' + n.id,
|
url: BASE_URL + 'projects/detail' + n.id,
|
||||||
method: 'get',
|
method: 'get',
|
||||||
success: function ( result, request ) {
|
success: function ( result, request ) {
|
||||||
|
|
||||||
var theResponse = Ext.util.JSON.decode(result.responseText);
|
var theResponse = Ext.util.JSON.decode(result.responseText);
|
||||||
|
|
||||||
tabPanel.add({
|
tabPanel.add({
|
||||||
title: 'New Tab ',
|
title: 'New Tab ',
|
||||||
html: 'Lade Projekt...',
|
html: 'Lade Projekt...',
|
||||||
@@ -122,7 +115,7 @@ function loadProjectInfo(n) {
|
|||||||
'<p>ID: {id}</p>',
|
'<p>ID: {id}</p>',
|
||||||
'<p>Name: {name}</p>'
|
'<p>Name: {name}</p>'
|
||||||
);
|
);
|
||||||
|
|
||||||
tpl.overwrite(this.html, data);
|
tpl.overwrite(this.html, data);
|
||||||
}
|
}
|
||||||
}).show();
|
}).show();
|
||||||
@@ -140,7 +133,7 @@ function loadProjectInfo(n) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -28,3 +28,11 @@ a:hover {
|
|||||||
.x-viewport body {
|
.x-viewport body {
|
||||||
background: #ededed url('../images/back.png') repeat-x !important;
|
background: #ededed url('../images/back.png') repeat-x !important;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.x-tree-node {
|
||||||
|
padding: 2px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.x-tree-node-icon {
|
||||||
|
height: 16px !important;
|
||||||
|
}
|
||||||
|
|||||||
BIN
assets/images/lang_de.png
Executable file
BIN
assets/images/lang_de.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 545 B |
BIN
assets/images/lang_us.png
Executable file
BIN
assets/images/lang_us.png
Executable file
Binary file not shown.
|
After Width: | Height: | Size: 609 B |
Binary file not shown.
|
Before Width: | Height: | Size: 1.7 KiB After Width: | Height: | Size: 2.9 KiB |
Reference in New Issue
Block a user