[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Phpgroupware-cvs] tasks/skins/default/base.xsl, 1.1.2.6
|
From: |
nomail |
|
Subject: |
[Phpgroupware-cvs] tasks/skins/default/base.xsl, 1.1.2.6 |
|
Date: |
Sat, 15 May 2004 11:07:47 +0200 |
Update of /tasks/skins/default
Modified Files:
Branch: proposal-branch
base.xsl
date: 2004/05/15 09:07:47; author: jengo; state: Exp; lines: +129 -12
Log Message:
- Fixed error reporting not directing user to there current tab
- Added in missing field indicators (Which also work with tabs)
- Most of the add screen is working correctly now, presently the only problem
is you can't unselect a date after you pick one
=====================================================================
Index: tasks/skins/default/base.xsl
diff -u tasks/skins/default/base.xsl:1.1.2.5
tasks/skins/default/base.xsl:1.1.2.6
--- tasks/skins/default/base.xsl:1.1.2.5 Fri May 14 05:54:30 2004
+++ tasks/skins/default/base.xsl Sat May 15 09:07:47 2004
@@ -8,11 +8,25 @@
<xsl:template name="display_tab_description">
<table width="100%" border="0" class="tab_body">
<tr class="th">
- <td colspan="2">Description </td>
+ <td colspan="2">
+ <font>
+ <xsl:if
test="missing_fields/description = 1">
+ <xsl:attribute
name="class">text_missing</xsl:attribute>
+ </xsl:if>
+ Description
+ </font>
+ </td>
</tr>
<tr class="row_on" valign="top">
<td width="100"> </td>
- <td><textarea name="description" rows="15"
cols="80"><xsl:value-of select="/PHPGW/APP/task_data/description"
/></textarea></td>
+ <td>
+ <textarea name="description" rows="15"
cols="80">
+ <xsl:if
test="missing_fields/description = 1">
+ <xsl:attribute
name="class">form_object_missing</xsl:attribute>
+ </xsl:if>
+ <xsl:value-of
select="/PHPGW/APP/task_data/description" />
+ </textarea>
+ </td>
</tr>
</table>
</xsl:template>
@@ -135,34 +149,52 @@
<td colspan="2">Dates</td>
</tr>
<tr class="row_on" valign="top">
- <td align="left" width="30%">Start</td>
+ <td align="left" width="30%">
+ <font>
+ <xsl:if test="missing_fields/start = 1">
+ <xsl:attribute
name="class">text_missing</xsl:attribute>
+ </xsl:if>
+ Start
+ </font>
+ </td>
<td width="70%">
<xsl:call-template name="jscalendar">
<xsl:with-param name="var_name"
select="'start_date'" />
- <xsl:with-param name="default"
select="/PHPGW/APP/task_data/start" />
+ <xsl:with-param name="default"
select="/PHPGW/APP/task_data/start_date" />
+ <xsl:with-param name="invalid"
select="/PHPGW/APP/missing_fields/start" />
</xsl:call-template>
   
<xsl:call-template name="time_widget">
<xsl:with-param name="var_name"
select="'start_time'" />
<xsl:with-param name="hour"
select="/PHPGW/APP/task_data/start_time/hour" />
<xsl:with-param name="minute"
select="/PHPGW/APP/task_data/start_time/minute" />
- <xsl:with-param name="ap"
select="/PHPGW/APP/task_data/start_time/ap" />
+ <xsl:with-param name="ap"
select="/PHPGW/APP/task_data/start_time/ap" />
+ <xsl:with-param name="invalid"
select="/PHPGW/APP/missing_fields/start" />
</xsl:call-template>
</td>
</tr>
<tr class="row_on" valign="top">
- <td align="left" width="30%">End</td>
+ <td align="left" width="30%">
+ <font>
+ <xsl:if test="missing_fields/end = 1">
+ <xsl:attribute
name="class">text_missing</xsl:attribute>
+ </xsl:if>
+ End
+ </font>
+ </td>
<td width="70%">
<xsl:call-template name="jscalendar">
<xsl:with-param name="var_name"
select="'end_date'" />
- <xsl:with-param name="default"
select="/PHPGW/APP/task_data/end" />
+ <xsl:with-param name="default"
select="/PHPGW/APP/task_data/end_date" />
+ <xsl:with-param name="invalid"
select="/PHPGW/APP/missing_fields/end" />
</xsl:call-template>
   
<xsl:call-template name="time_widget">
<xsl:with-param name="var_name"
select="'end_time'" />
<xsl:with-param name="hour"
select="/PHPGW/APP/task_data/end_time/hour" />
<xsl:with-param name="minute"
select="/PHPGW/APP/task_data/end_time/minute" />
- <xsl:with-param name="ap"
select="/PHPGW/APP/task_data/end_time/ap" />
+ <xsl:with-param name="ap"
select="/PHPGW/APP/task_data/end_time/ap" />
+ <xsl:with-param name="invalid"
select="/PHPGW/APP/missing_fields/end" />
</xsl:call-template>
</td>
</tr>
@@ -203,6 +235,9 @@
<option value=""></option>
<xsl:for-each
select="responsible_user_list/responsible_user_list_item">
<option>
+ <xsl:if
test="/PHPGW/APP/task_data/responsible = id">
+ <xsl:attribute
name="selected">selected</xsl:attribute>
+ </xsl:if>
<xsl:attribute
name="value"><xsl:value-of select="id" /></xsl:attribute>
<xsl:value-of
select="name" />
</option>
@@ -283,6 +318,66 @@
</xsl:template>
<xsl:template match="APP[action_type='task_start']">
+ <!-- This should be moved into tasks/default/default.css -->
+ <style type="text/css">
+ <!--
+ .low,
+ .low_done,
+ .normal,
+ .normal_done,
+ .high,
+ .high_done,
+ .urgent,
+ .urgent_done
+ {
+ font-weight: bold;
+ }
+
+ .low,
+ .low_done
+ {
+ color: #606060;
+ }
+
+ .normal,
+ .normal_done
+ {
+ color: black
+ }
+
+ .high
+ {
+ color: #cc0000;
+ }
+
+ .high_done
+ {
+ color: #800000;
+ }
+
+ .urgent
+ {
+ color: #ff00ff;
+ }
+
+ .urgent_done
+ {
+ color: #800080;
+ }
+
+ .overdue
+ {
+ color: #cc0000;
+ font-weight: bold;
+ }
+
+ .private
+ {
+ font-style: italic;
+ }
+ -->
+ </style>
+
<script>
<!-- This function borrowed from phpMyAdmin, needs to be rewritten
for CSS -->
@@ -346,6 +441,14 @@
</xsl:if>
<xsl:for-each
select="tasks_data/tasks_data_item">
+ <xsl:variable
name="priority_class">
+ <xsl:if
test="priority_id = ''">normal</xsl:if>
+ <xsl:if
test="priority_id = '1'">low</xsl:if>
+ <xsl:if
test="priority_id = '2'">normal</xsl:if>
+ <xsl:if
test="priority_id = '3'">high</xsl:if>
+ <xsl:if
test="priority_id = '4'">urgent</xsl:if>
+ </xsl:variable>
+
<tr class="sideboxtext">
<xsl:choose>
<!-- NOTE and
FIXME: The setPointer() function was borrowed -->
@@ -364,7 +467,7 @@
</xsl:choose>
<td width="10%"><font
color="#000000"><xsl:value-of select="status" /></font></td>
- <td width="*"><font
color="#000000"><a
href="{$baseurl}&op=tasks.base.view&task_id={id}"><xsl:value-of
select="subject" /></a></font></td>
+ <td width="*"><a
class="{$priority_class}"
href="{$baseurl}&op=tasks.base.view&task_id={id}"><xsl:value-of
select="subject" /></a></td>
<td width="10%"><font
color="#000000"><xsl:value-of select="start" /></font></td>
<td width="10%"><font
color="#000000"><xsl:value-of select="end" /></font></td>
<td width="20%"><font
color="#000000"><xsl:value-of select="responsible" /></font></td>
@@ -381,6 +484,7 @@
function submit_form()
{
document.phpgw_form.form_submit.value = 'True';
+ document.phpgw_form.select_tab.value = <xsl:value-of
select="/PHPGW/APP/current_tab_index" />;
document.phpgw_form.submit();
}
</script>
@@ -403,8 +507,21 @@
<td
width="*" align="left"><select name="category"><option
value="0">None</option></select></td>
</tr>
<tr>
- <td
width="10%" align="left">Subject:</td>
- <td
width="*" align="left"><input name="subject" size="64"
value="{task_data/subject}" /></td>
+ <td
width="10%" align="left">
+
<font>
+
<xsl:if test="missing_fields/subject = 1">
+
<xsl:attribute name="class">text_missing</xsl:attribute>
+
</xsl:if>
+
Subject:
+
</font>
+ </td>
+ <td
width="*" align="left">
+
<input name="subject" size="64" value="{task_data/subject}">
+
<xsl:if test="missing_fields/subject = 1">
+
<xsl:attribute name="class">form_object_missing</xsl:attribute>
+
</xsl:if>
+
</input>
+ </td>
</tr>
<tr>
<td
colspan="2">
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Phpgroupware-cvs] tasks/skins/default/base.xsl, 1.1.2.6,
nomail <=