Update of /cvsroot/tikiwiki/tiki/templates In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7719/tikiwiki/templates Modified Files: Tag: BRANCH-1-9 tiki-user_tasks.tpl tiki-user_tasks_list.tpl tiki-user_tasks_view.tpl tiki-user_tasks_edit.tpl Log Message: Bugfix on task complieted Index: tiki-user_tasks.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/tiki-user_tasks.tpl,v retrieving revision 1.14.2.36 retrieving revision 1.14.2.37 diff -u -d -r1.14.2.36 -r1.14.2.37 --- tiki-user_tasks.tpl 2 Feb 2005 10:56:50 -0000 1.14.2.36 +++ tiki-user_tasks.tpl 2 Feb 2005 14:25:43 -0000 1.14.2.37 @@ -20,8 +20,17 @@ <a class="link" href="tiki-user_tasks.php?show_form=y">{tr}New task{/tr}</a> | <a class="link" href="tiki-user_tasks.php">{tr}Task list{/tr}</a> +{ if $task_admin } + | +{if $admin_mode} +<a class="link" href="tiki-user_tasks.php?taskId={$taskId}&admin_mode_off=on">{tr}Admin mode off{/tr}</a> +{else} +<a class="link" href="tiki-user_tasks.php?taskId={$taskId}&admin_mode=on">{tr}Admin mode on{/tr}</a> +{/if} +{/if} ] <br /><br /> +{if $admin_mode}<div align="center"><a class="highlight" >admin mode</a></div><br />{/if} {* start ************ Edit Form ***************} {if ($tiki_view_mode eq 'view')} {include file=tiki-user_tasks_view.tpl} Index: tiki-user_tasks_list.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/Attic/tiki-user_tasks_list.tpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- tiki-user_tasks_list.tpl 2 Feb 2005 10:56:50 -0000 1.1.2.3 +++ tiki-user_tasks_list.tpl 2 Feb 2005 14:25:43 -0000 1.1.2.4 @@ -50,12 +50,12 @@ {*recived task*} >> {if (($tasklist[task_i].accepted_creator eq 'y') and ($tasklist[task_i].accepted_user eq 'y')) } - <img title="{tr}accepted by task user and creator{/tr}" src="img/icons/star_green.gif" width="11" height="11" border="0" alt="accepted user and creator" /> + <img title="{tr}accepted by task user and creator{/tr}" src="img/icons2/tick.gif" width="15" height="15" border="0" alt="accepted user and creator" /> {else} {if (($tasklist[task_i].accepted_creator eq 'n') or ($tasklist[task_i].accepted_user eq 'n')) } - <img title="{tr}not accepted by one user{/tr}" src="img/icons/star_red.gif" width="11" height="11" border="0" alt="not accepted u" /> + <img title="{tr}not accepted by one user{/tr}" src="img/icons2/error.gif" width="14" height="14" border="0" alt="not accepted u" /> {else} - <img title="{tr}accepted accepted by all parties{/tr}" src="img/icons/star_yellow.gif" width="11" height="11" border="0" alt="accepted" /> + <img title="{tr}accepted NOT accepted by all parties{/tr}" src="img/icons2/icn_forum.gif" width="16" height="16" border="0" alt="accepted" /> {/if} {/if} {else} @@ -63,12 +63,12 @@ {*submitted task*} << {if (($tasklist[task_i].accepted_creator eq 'y') and ($tasklist[task_i].accepted_user eq 'y')) } - <img title="{tr}accepted by task user and creator{/tr}" src="img/icons/star_green.gif" width="11" height="11" border="0" alt="accepted user and creator" /> + <img title="{tr}accepted by task user and creator{/tr}" src="img/icons2/tick.gif" width="15" height="15" border="0" alt="accepted user and creator" /> {else} {if (($tasklist[task_i].accepted_creator eq 'n') or ($tasklist[task_i].accepted_user eq 'n')) } - <img title="{tr}not accepted by one user{/tr}" src="img/icons/star_red.gif" width="11" height="11" border="0" alt="not accepted u" /> + <img title="{tr}not accepted by one user{/tr}" src="img/icons2/error.gif" width="14" height="14" border="0" alt="not accepted u" /> {else} - <img title="{tr}accepted accepted by all parties{/tr}" src="img/icons/star_yellow.gif" width="11" height="11" border="0" alt="accepted" /> + <img title="{tr}accepted NOT accepted by all parties{/tr}" src="img/icons2/icn_forum.gif" width="16" height="16" border="0" alt="accepted" /> {/if} {/if} {else} @@ -99,15 +99,17 @@ <img src="img/icons2/arrow.gif" width="16" height="24" style="border:0" alt="arrow" /> <select name="action"> <option value="" >{tr}select one{/tr}</option> - <option value="open_marked" >{tr}open task{/tr}</option> - <option value="move_marked_to_trash">{tr}move marked to trash{/tr}</option> - <option value="remove_marked_from_trash">{tr}remove marked from trash{/tr}</option> - <option value="complete_marked" >{tr}complete marked{/tr}</option> + <option value="waiting_marked" >{tr}waiting{/tr}</option> + <option value="open_marked" >{tr}open{/tr}</option> + <option value="complete_marked" >{tr}completed{/tr}</option> + <option value="move_marked_to_trash">{tr}trash{/tr}</option> + <option value="remove_marked_from_trash">{tr}undo trash{/tr}</option> </select> <input type="submit" name="update_tasks" value="{tr}go{/tr}" /> </td> <td class="formcolor" colspan="3" style="text-align:right;"> - <input type="submit" name="update_percentage" value="{tr}change percentage{/tr}" /> + <input type="submit" name="update_percentage" value="{tr}go{/tr}" /> + <img src="img/icons2/arrow_fliped.gif" width="16" height="24" style="border:0" alt="arrow" /> </td> </tr> <tr> @@ -117,12 +119,14 @@ <input name="show_received" {if $show_received} checked="checked" {/if} type="checkbox" />>> {tr}received{/tr} <input name="show_submitted" {if $show_submitted} checked="checked" {/if} type="checkbox" /><< {tr}submitted{/tr} <input name="show_shared" {if $show_shared} checked="checked" {/if} type="checkbox" />>< {tr}shared{/tr} - {if ($task_admin)} - <input name="show_admin" {if $show_admin} checked="checked" {/if} type="checkbox" />{tr}admin{/tr} - {/if} <input name="show_trash" {if $show_trash} checked="checked" {/if} type="checkbox" />{tr}trash{/tr} <input name="show_completed" {if $show_completed} checked="checked" {/if} type="checkbox" />{tr}completed{/tr} + {if ($admin_mode)} + + <a class="highlight" > + <input name="show_admin" {if $show_admin} checked="checked" {/if} type="checkbox" />{tr}all shared tasks{/tr}</a> + {/if} </td> </tr> <tr> Index: tiki-user_tasks_view.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/Attic/tiki-user_tasks_view.tpl,v retrieving revision 1.1.2.4 retrieving revision 1.1.2.5 diff -u -d -r1.1.2.4 -r1.1.2.5 --- tiki-user_tasks_view.tpl 2 Feb 2005 10:56:50 -0000 1.1.2.4 +++ tiki-user_tasks_view.tpl 2 Feb 2005 14:25:43 -0000 1.1.2.5 @@ -3,9 +3,19 @@ <span class="titlea">{$info.title|escape}</span> -{if ($info.user eq $user or $info.creator eq $user or $task_admin)} +{if ($info.user eq $user) or ($info.creator eq $user) or ($admin_mode)} + <a href="tiki-user_tasks.php?taskId={$taskId}&tiki_view_mode=edit" class="tablink"> - <img src="img/icons/config.gif" alt="Edit" title="Edit" width="16" height="16" border="0" /> + <img src="img/icons/edit.gif" alt="Edit" title="Edit" width="20" height="16" border="0" /> + </a> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&task_accept=on" class="tablink"> + <img src="img/icons2/tick.gif" width="15" height="15" border="0" alt="accept" /> + </a> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&task_not_accept=on" class="tablink"> + <img src="img/icons2/error.gif" width="14" height="14" border="0" alt="red" /> + </a> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&move_into_trash=on" class="tablink"> + <img src="img/icons/trash.gif" width="16" height="16" border="0" alt="trash" /> </a> {/if} <br /><br /> Index: tiki-user_tasks_edit.tpl =================================================================== RCS file: /cvsroot/tikiwiki/tiki/templates/Attic/tiki-user_tasks_edit.tpl,v retrieving revision 1.1.2.3 retrieving revision 1.1.2.4 diff -u -d -r1.1.2.3 -r1.1.2.4 --- tiki-user_tasks_edit.tpl 1 Feb 2005 14:43:12 -0000 1.1.2.3 +++ tiki-user_tasks_edit.tpl 2 Feb 2005 14:25:43 -0000 1.1.2.4 @@ -10,7 +10,35 @@ <input type="hidden" name="date_Hour" value="{$date_Hour|escape}" /> <input type="hidden" name="date_Minute" value="{$date_Minute|escape}" /> <input type="hidden" name="creator" value="{$info.creator|escape}" /> +{if ($tiki_view_mode eq 'view')} + <span class="tabbut"> + <a href="tiki-user_tasks.php?taskId={$taskId}&tiki_view_mode=edit" class="tablink">{tr}Edit task{/tr}</a> + </span> + +{/if} +{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"> + <img src="img/icons2/tick.gif" width="15" height="15" border="0" alt="accept" /> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&task_accept=on" class="tablink">{tr}accept{/tr}</a> + </span> + <span class="tabbut"> + <img src="img/icons2/error.gif" width="14" height="14" border="0" alt="red" /> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&task_not_accept=on" class="tablink">{tr}NOT accept{/tr}</a> + </span> +{/if} +{ if $info.deleted } + <span class="tabbut"> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&remove_from_trash=on" class="tablink">{tr}remove from trash{/tr}</a> + </span> +{else} + <span class="tabbut"> + <img src="img/icons/trash.gif" width="16" height="16" border="0" alt="trash" /> + <a href="tiki-user_tasks.php?taskId={$taskId}&save=on&move_into_trash=on" class="tablink">{tr}move into trash{/tr}</a> + </span> +{/if} +{/if} <table class="normal"> <colgroup><col width="25%" span="4" /></colgroup> <tr> @@ -118,11 +146,11 @@ </tr> <tr><td class="formcolor">{tr}Status{/tr}</td> <td colspan="3" class="formcolor"> - <select name="status"> - <option value="w" selected="selected">{tr}waiting / not started{/tr}</option> - <option value="o" {if $info.status eq 'o'} selected="selected"{/if}>{tr}open / in process{/tr}</option> - <option value="c" {if $info.status eq 'c'} selected="selected"{/if}>{tr}completed (100%){/tr}</option> - </select> + {if $info.status eq 'o'}{tr}open / in process{/tr} + {else} {if $info.status eq 'o'}{tr}open / in process{/tr} + {else} {tr}waiting / not started{/tr} + {/if} + {/if} <b>{$info.completed|date_format:"%d/%m/%Y -- %H:%M"}</b> </td> |