Commit 587e5219 authored by lindonb's avatar lindonb

[FIX] Further changes of icons and a liitle text formatting for tasks

parent 13bd191e
......@@ -3567,8 +3567,6 @@ pics/icons/disk_lock.png -text
pics/icons/disk_multiple.png -text
pics/icons/disk_multiple_gray.png -text
pics/icons/disk_refresh.png -text
pics/icons/door_in.png -text
pics/icons/door_out.png -text
pics/icons/down.png -text
pics/icons/email.png -text
pics/icons/email_cross.png -text
......
......@@ -1057,6 +1057,12 @@ textarea.tshoutbox{
font-size: 95%;
}
/***** User Tasks *****/
.taskcount {
font-style: italic;
}
/***** Messages *****/
.prio1,
......
......@@ -25,15 +25,18 @@
{if (not $show_form)}
{include file='find.tpl'}
{/if}
<span class="taskcount">{$cant}&nbsp;{tr}Tasks{/tr}</span>
{if $cant eq 1}
<span class="taskcount">{$cant}&nbsp;{tr}Task{/tr}</span>
{else}
<span class="taskcount">{$cant}&nbsp;{tr}Tasks{/tr}</span>
{/if}
<div class="wiki-edithelp" id='edithelpzone' >
<table width="100%">
{if $tiki_p_tasks_receive eq 'y'}
<tr>
<td>
{icon _id='door_in' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
{icon _id='task_received' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
</td>
<td>
{tr}You received this task{/tr}.
......@@ -43,7 +46,7 @@
{if $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='door_out' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
{icon _id='task_submitted' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
</td>
<td>
{tr}You sent this task to another user{/tr}.
......@@ -62,7 +65,7 @@
{/if}
<tr>
<td>
{icon _id='tick' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
</td>
<td>
{tr}Task has been accepted by user and creator{/tr}.
......@@ -70,10 +73,10 @@
</tr>
<tr>
<td>
{icon _id='cross' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
{icon _id='delete' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
</td>
<td>
{tr}Task has been rejected by one user{/tr}.
{tr}Task has been rejected by a user{/tr}.
</td>
</tr>
{if $tiki_p_tasks_receive eq 'y'}
......@@ -92,7 +95,7 @@
{icon _id='user_comment' title="{tr}Waiting for other user{/tr}" alt="{tr}Waiting for other user{/tr}"}
</td>
<td>
{tr}Task has not yet been accepted or rejected by other user{/tr}.
{tr}Task has not yet been accepted or rejected by another user{/tr}.
</td>
</tr>
{/if}
......
......@@ -19,11 +19,11 @@
{if ($info.creator eq $user or $info.user eq $user or $admin_mode) and ($info.task_version eq $info.last_version)}
{if ($info.taskId > 0 and $info.creator ne $info.user)}
<span class="tabbut">
{icon _id='tick' title="{tr}Accept{/tr}" alt="{tr}Accept{/tr}"}
{icon _id='accept' title="{tr}Accept{/tr}" alt="{tr}Accept{/tr}"}
<a href="tiki-user_tasks.php?taskId={$taskId}&amp;save=on&amp;task_accept=on" class="tablink">{tr}Accept{/tr}</a>
</span>
<span class="tabbut">
{icon _id='cross' title="{tr}Reject{/tr}" alt="{tr}Reject{/tr}"}
{icon _id='delete' title="{tr}Reject{/tr}" alt="{tr}Reject{/tr}"}
<a href="tiki-user_tasks.php?taskId={$taskId}&amp;save=on&amp;task_not_accept=on" class="tablink">{tr}NOT accept{/tr}</a>
</span>
{/if}
......@@ -187,7 +187,9 @@
<select name="percentage">
<option value="w" {if $info.percentage_null} selected = "selected" {/if}>{tr}Waiting{/tr}</option>
{section name=zz loop=$percs}
<option value="{$percs[zz]|escape}" {if $info.percentage eq $percs[zz] and !$info.percentage_null} selected = "selected" {/if} > {$percs[zz]}% </option>
<option value="{$percs[zz]|escape}" {if $info.percentage eq $percs[zz] and !$info.percentage_null} selected = "selected" {/if} >
{$percs[zz]}%
</option>
{/section}
</select>
</td>
......
......@@ -43,7 +43,7 @@
<input {if $tasklist[task_i].disabled} disabled = "disabled" {/if} type="checkbox" name="task[{$tasklist[task_i].taskId}]" />
{if $tasklist[task_i].deleted}
{if $tasklist[task_i].creator ne $user}
{icon _id='delete'}
{icon _id='cross'}
{else}
{icon _id='basket' title="{tr}In the trash{/tr}" alt="{tr}In the trash{/tr}"}
{/if}
......@@ -53,15 +53,15 @@
{else}
{if ($tasklist[task_i].user eq $user)}
{*received task*}
{icon _id='door_in' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
{icon _id='task_received' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
{if (($tasklist[task_i].accepted_creator eq 'n') or ($tasklist[task_i].accepted_user eq 'n'))}
{icon _id='cross' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
{icon _id='delete' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
{else}
{if ($tasklist[task_i].accepted_user eq '')}
{icon _id='hourglass' title="{tr}Waiting for me{/tr}" alt="{tr}Waiting for me{/tr}"}
{else}
{if ($tasklist[task_i].accepted_creator eq 'y')}
{icon _id='tick' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{else}
{icon _id='user_comment' title="{tr}Waiting for other user{/tr}" alt="{tr}Waiting for other user{/tr}"}
{/if}
......@@ -69,7 +69,7 @@
{/if}
{elseif ($tasklist[task_i].creator eq $user)}
{*submitted task*}
{icon _id='door_out' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
{icon _id='task_submitted' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
{if (($tasklist[task_i].accepted_creator eq 'n') or ($tasklist[task_i].accepted_user eq 'n'))}
<img src="{$img_not_accepted}" height="{$img_not_accepted_height}" width="{$img_not_accepted_width}" title="{tr}Not Accepted by One User{/tr}" alt="{tr}Not Accepted User{/tr}" />
{else}
......@@ -81,7 +81,7 @@
{/if}
{else}
{if ($tasklist[task_i].accepted_creator eq 'y')}
{icon _id='tick' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{else}
{icon _id='hourglass' title="{tr}Waiting for me{/tr}" alt="{tr}Waiting for me{/tr}"}
{/if}
......
......@@ -8,10 +8,10 @@
{icon _id='page_edit'}
</a>&nbsp;
<a href="tiki-user_tasks.php?taskId={$taskId}&amp;save=on&amp;task_accept=on" class="tablink">
{icon _id='tick' title="{tr}Accept{/tr}" alt="{tr}Accept{/tr}"}
{icon _id='accept' title="{tr}Accept{/tr}" alt="{tr}Accept{/tr}"}
</a>&nbsp;
<a href="tiki-user_tasks.php?taskId={$taskId}&amp;save=on&amp;task_not_accept=on" class="tablink">
{icon _id='cross' title="{tr}Reject{/tr}" alt="{tr}Reject{/tr}"}
{icon _id='delete' title="{tr}Reject{/tr}" alt="{tr}Reject{/tr}"}
</a>&nbsp;
<a href="tiki-user_tasks.php?taskId={$taskId}&amp;save=on&amp;move_into_trash=on" class="tablink">
{icon _id='basket_put' title="{tr}Move to trash{/tr}" alt="{tr}Move to trash{/tr}"}
......
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