Commit 7e86208c authored by Bas Lijnse's avatar Bas Lijnse

Fixed small style issues

git-svn-id: https://svn.cs.ru.nl/repos/iTask-system/branches/fancyTasks@322 63da3aa8-80fd-4f01-9db8-e6ea747a3da2
parent 7c6247c4
.error {
font-weight: bold;
color: red;
......@@ -46,16 +45,14 @@ button.icon-task-tree {
background-image: url('../img/icons/tick.png');
}
.debug-button td.x-btn-center {
text-align: left;
}
div.loginWindow {
padding: 5px;
}
div.header {
#northpanel .x-panel-body {
background: #3a81ad url('../img/body.png') top repeat-x;
}
div.header #logo {
#northpanel #logo {
position: absolute;
top: 0px;
left: 0px;
......@@ -63,7 +60,7 @@ div.header #logo {
height: 40px;
background: url('../img/itasks.png');
}
div.header #user {
#northpanel #user {
position: absolute;
top: 15px;
left: 100%;
......@@ -72,15 +69,14 @@ div.header #user {
color: #fff;
text-align: right;
}
div.header #user a {
#northpanel #user a {
color: #fff;
text-decoration: none;s
text-decoration: none;
}
div.header #user a:hover {
#northpanel #user a:hover {
text-decoration: underline;
}
div.leftpanel {
#leftpanel {
background-color: #ccc;
background-image: url('../img/tab.png');
background-position: top;
......@@ -90,7 +86,6 @@ div.leftpanel {
/* WORK LIST PANEL STYLES */
div.treegrid {
position: absolute;
top: 0px;
width: 16px;
height: 18px;
}
......@@ -112,7 +107,7 @@ div.treegrid-icon {
div.treegrid-label {
position: absolute;
height: 16px;
padding: 0px 0px 0px 5px;
padding: 2px 0px 0px 5px;
}
......@@ -190,6 +185,19 @@ div.worktab .Trace {
font-weight: bold;
}
/* DEBUG STYLES */
.debug-button button.x-btn-text {
width: 150px;
overflow: visible;
text-align: left;
background-position: 0 2px;
background-repeat: no-repeat;
padding-left:20px;
padding-top:3px;
padding-bottom:2px;
padding-right:0;
}
div.trace {
border: #ccc 2px solid;
padding: 5px;
......
......@@ -15,9 +15,9 @@ itasks.ApplicationPanel = Ext.extend(Ext.Panel, {
layout: 'border',
hidden: true,
items: [{
id: 'northpanel',
xtype: 'panel',
region: 'north',
baseCls: 'header',
height: 40,
html: '<div id="logo" ></div><div id="user">Welcome ' + this.displayName + ' | <a id="logout" href="#">Log out &raquo;</a></div>'
},{
......@@ -31,7 +31,6 @@ itasks.ApplicationPanel = Ext.extend(Ext.Panel, {
width: 200,
minWidth: 200,
maxWidth: 400,
baseCls: 'leftpanel',
items: [
{xtype: 'itasks.cwpanel' },
{xtype: 'itasks.nwpanel' },
......@@ -58,7 +57,7 @@ itasks.ApplicationPanel = Ext.extend(Ext.Panel, {
tbar: [
{ id: 'refreshbutton'
, text: 'Refresh worklist'
, iconCls: 'x-tbar-loading'
, iconCls: 'icon-refresh'//'x-tbar-loading'
, listeners: {
click : { scope: this, fn: function (btn) {
this.getComponent('centerpanel').getComponent('worklist').refresh();
......@@ -72,13 +71,14 @@ itasks.ApplicationPanel = Ext.extend(Ext.Panel, {
itasks.ApplicationPanel.superclass.initComponent.apply(this, arguments);
},
init: function () {
//Initializing the gui...
var apppanel = this;
var worklist = this.getComponent('centerpanel').getComponent('worklist');
var worktabs = this.getComponent('centerpanel').getComponent('worktabs');
var debugpanel = this.getComponent('leftpanel').getComponent('debugpanel');
//Set worklist applicationPanel reference and refresh
worklist.setApplicationPanel(apppanel);
worklist.refresh();
......
......@@ -5,7 +5,7 @@
Ext.namespace('itasks');
itasks.DebugPanel = Ext.extend(Ext.form.FormPanel, {
itasks.DebugPanel = Ext.extend(Ext.Panel, {
initComponent: function () {
Ext.apply(this, {
......@@ -20,22 +20,17 @@ itasks.DebugPanel = Ext.extend(Ext.form.FormPanel, {
items: [{
xtype: 'button',
text: 'Show task forest...',
minWidth: '160',
ctCls: 'debug-button',
iconCls: 'icon-task-tree',
style: 'margin-bottom: 2px'
cls: 'debug-button',
iconCls: 'icon-task-tree'
},{
xtype: 'button',
text: 'Show thread table...',
minWidth: '160',
ctCls: 'debug-button',
iconCls: 'icon-thread-table',
style: 'margin-bottom: 2px'
cls: 'debug-button',
iconCls: 'icon-thread-table'
},{
xtype: 'button',
text: 'Show process table...',
minWidth: '160',
ctCls: 'debug-button',
cls: 'debug-button',
iconCls: 'icon-process-table'
}]
},{
......
......@@ -44,7 +44,7 @@ itasks.WorkListPanel = Ext.extend(Ext.ux.grid.livegrid.GridPanel, {
var level = record.data.tree_path.length;
//Disable margins
meta['attr'] = 'style="margin: 0px;"';
meta['attr'] = 'style="margin: 0px; padding: 0px"';
//Create path
for(var i = 0; i < level; i++) {
......
......@@ -98,7 +98,7 @@ itasks.WorkTabPanel = Ext.extend(Ext.Panel, {
return "<div class=\"worktab-header-table\"><table>"
+ "<tr><th>Subject:</th><td>" + this.taskinfo.subject + "</td><th>Date:</th><td>" + itasks.util.formatDate(this.taskinfo.timestamp) + "</td></tr>"
+ "<tr><th>TaskID:</th><td>" + this.taskinfo.taskid + "</td><th>Process:</th><td>" + this.taskinfo.processname + "</td></tr>"
+ "<tr><th>For:</th><td>" + this.taskinfo.delegator + "</td><th>Priority:</th><td>" + itasks.util.formatPriority(this.taskinfo.priority) + "</td></tr>"
+ "<tr><th>From:</th><td>" + this.taskinfo.delegator + "</td><th>Priority:</th><td>" + itasks.util.formatPriority(this.taskinfo.priority) + "</td></tr>"
+ "</table></div><div class=\"worktab-header-indicator\"></div>";
},
makeFinishedMessage: function() {
......
......@@ -10,4 +10,13 @@
</style>
<div id="welcome-content">
<h1>Welcome to iTasks!</h1>
<p>
Thanks for trying out the new and improved iTask system.
</p>
<h2>Learn more</h2>
<p>
Our research on dynamic functionally specified workflow and development of the iTask system is
very much alive and kicking. To keep up with the latest developments, more information can be found on the Clean Wiki website:<br />
<a href="http://wiki.clean.cs.ru.nl/ITasks">http://wiki.cs.ru.nl/ITasks</a>
</p>
</div>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment