Commit 36186b30 authored by lindonb's avatar lindonb

[FIX] iconset conversion

parent e2a0a616
......@@ -94,7 +94,9 @@
{tr}Wiki structures feature is not enabled{/tr}
{if $tiki_p_admin eq 'y'}
<blockquote>
<a href="tiki-admin.php?page=wiki&highlight=feature_wiki_structure&cookietab=2">{tr}Go to wiki structure setting{/tr} {icon _id='wrench'}</a>
<a href="tiki-admin.php?page=wiki&highlight=feature_wiki_structure&cookietab=2">
{tr}Go to wiki structure setting{/tr} {icon name='structure'}
</a>
</blockquote>
{/if}
</p>
......
......@@ -32,11 +32,11 @@
{/if}
<div class="wiki-edithelp" id='edithelpzone' >
<table width="100%">
<table class="table norml table-striped table-hover">
{if $tiki_p_tasks_receive eq 'y'}
<tr>
<td>
{icon _id='task_received' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
{icon name='login' class='tips' title=":{tr}Task received{/tr}"}
</td>
<td>
{tr}You received this task{/tr}.
......@@ -46,7 +46,7 @@
{if $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='task_submitted' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
{icon name='logout' class='tips' title=":{tr}Task sent{/tr}"}
</td>
<td>
{tr}You sent this task to another user{/tr}.
......@@ -56,7 +56,7 @@
{if $tiki_p_tasks_receive eq 'y' or $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='group' title="{tr}Task shared by a group{/tr}" alt="{tr}Task shared by a group{/tr}"}
{icon name='group' class='tips' title=":{tr}Task shared by a group{/tr}"}
</td>
<td>
{tr}Task is shared by a group{/tr}.
......@@ -65,7 +65,7 @@
{/if}
<tr>
<td>
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{icon name='ok' class='tips' title=":{tr}Accepted by task user and creator{/tr}"}
</td>
<td>
{tr}Task has been accepted by user and creator{/tr}.
......@@ -73,7 +73,7 @@
</tr>
<tr>
<td>
{icon _id='delete' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
{icon name='remove' class='tips' title=":{tr}Rejected by a user{/tr}"}
</td>
<td>
{tr}Task has been rejected by a user{/tr}.
......@@ -82,7 +82,7 @@
{if $tiki_p_tasks_receive eq 'y'}
<tr>
<td>
{icon _id='hourglass' title="{tr}Waiting for me{/tr}" alt="{tr}Waiting for me{/tr}"}
{icon name='history' class='tips' title=":{tr}Waiting for me{/tr}"}
</td>
<td>
{tr}Task has not yet been accepted or rejected by you{/tr}.
......@@ -92,7 +92,7 @@
{if $tiki_p_tasks_receive eq 'y' or $tiki_p_tasks_send eq 'y'}
<tr>
<td>
{icon _id='user_comment' title="{tr}Waiting for other user{/tr}" alt="{tr}Waiting for other user{/tr}"}
{icon name='user' class='tips' title=":{tr}Waiting for other user{/tr}"}
</td>
<td>
{tr}Task has not yet been accepted or rejected by another user{/tr}.
......
......@@ -19,24 +19,24 @@
{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='accept' title="{tr}Accept{/tr}" alt="{tr}Accept{/tr}"}
{icon name='ok' title="{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='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>
{icon name='remove' title="{tr}Reject{/tr}"}
<a href="tiki-user_tasks.php?taskId={$taskId}&amp;save=on&amp;tas_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}&amp;save=on&amp;remove_from_trash=on" class="tablink">
{icon _id='basket_remove' title="{tr}Remove from Trash{/tr}" alt="{tr}Remove from Trash{/tr}"} {tr}Remove from Trash{/tr}
{icon name='undo' title="{tr}Remove from Trash{/tr}"} {tr}Remove from Trash{/tr}
</a>
</span>
{else}
<span class="tabbut">
<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}"} {tr}Move to Trash{/tr}
{icon name='trash' title="{tr}Move to trash{/tr}"} {tr}Move to Trash{/tr}
</a>
</span>
{/if}
......@@ -73,13 +73,13 @@
&nbsp;&nbsp;
{if ($info.task_version > 0)}
<a class="link" href="tiki-user_tasks.php?taskId={$taskId}&amp;show_history={$info.task_version-1}">
{icon _id='resultset_previous' align="middle"}
{icon name='backward' align="middle"}
</a>
{/if}
{tr}Version:{/tr} <b>{$info.task_version+1}</b>
{if $info.task_version < $info.last_version}
<a class="link" href="tiki-user_tasks.php?taskId={$taskId}&amp;show_history={$info.task_version+1}">
{icon _id='resultset_next' align="middle"}
{icon name='forward' align="middle"}
</a>
{/if}
......
......@@ -43,9 +43,9 @@
<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='cross'}
{icon name='remove' class='tips' title=":{tr}Deleted{/tr}"}
{else}
{icon _id='basket' title="{tr}In the trash{/tr}" alt="{tr}In the trash{/tr}"}
{icon name='trash' class='tips' title=":{tr}In the trash{/tr}"}
{/if}
{/if}
{if (($tasklist[task_i].creator eq $tasklist[task_i].user) and ($tasklist[task_i].user eq $user))}
......@@ -53,43 +53,43 @@
{else}
{if ($tasklist[task_i].user eq $user)}
{*received task*}
{icon _id='task_received' title="{tr}Task received{/tr}" alt="{tr}Task received{/tr}"}
{icon name='login' title="{tr}Task received{/tr}"}
{if (($tasklist[task_i].accepted_creator eq 'n') or ($tasklist[task_i].accepted_user eq 'n'))}
{icon _id='delete' title="{tr}Rejected by a user{/tr}" alt="{tr}Rejected by a user{/tr}"}
{icon name='remove' class='tips' title=":{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}"}
{icon name='history' class='tips' title=":{tr}Waiting for me{/tr}"}
{else}
{if ($tasklist[task_i].accepted_creator eq 'y')}
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{icon name='ok' class='tips' title=":{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}"}
{icon name='user' class='tips' title=":{tr}Waiting for other user{/tr}"}
{/if}
{/if}
{/if}
{elseif ($tasklist[task_i].creator eq $user)}
{*submitted task*}
{icon _id='task_submitted' title="{tr}Task sent{/tr}" alt="{tr}Task sent{/tr}"}
{icon name='logout' class='tips' title=":{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}
{if ($tasklist[task_i].accepted_user eq '')}
{if ($tasklist[task_i].accepted_creator eq 'y')}
{icon _id='user_comment' title="{tr}Waiting for other user{/tr}" alt="{tr}Waiting for other user{/tr}"}
{icon name='user' class='tips' title=":{tr}Waiting for other user{/tr}"}
{else}
{icon _id='hourglass' title="{tr}Waiting for me{/tr}" alt="{tr}Waiting for me{/tr}"}
{icon name='history' class='tips' title=":{tr}Waiting for me{/tr}"}
{/if}
{else}
{if ($tasklist[task_i].accepted_creator eq 'y')}
{icon _id='accept' title="{tr}Accepted by task user and creator{/tr}" alt="{tr}Accepted by task user and creator{/tr}"}
{icon name='ok' class='tips' title=":{tr}Accepted by task user and creator{/tr}"}
{else}
{icon _id='hourglass' title="{tr}Waiting for me{/tr}" alt="{tr}Waiting for me{/tr}"}
{icon name='history' class='tips' title=":{tr}Waiting for me{/tr}" }
{/if}
{/if}
{/if}
{else}
{*shared task*}
{icon _id='group' title="{tr}Task shared by a group{/tr}" alt="{tr}Task shared by a group{/tr}"}
{icon name='group' class='tips' title=":{tr}Task shared by a group{/tr}"}
{/if}
{/if}
</td>
......@@ -127,7 +127,7 @@
{/section}
<tr>
<td colspan="3" style="text-align:left; vertical-align:bottom;">
{icon _id='arrow_turn_down_right' title="{tr}Select{/tr}" alt="{tr}Select{/tr}" style="margin-bottom:8px; margin-left:5px"}
{icon name='ok' class='tips' title=":{tr}Select{/tr}" style="margin-bottom:8px; margin-left:5px"}
<select name="action" style="vertical-align:bottom;">
<option value="" >{tr}Select One{/tr}</option>
<option value="waiting_marked" >{tr}Waiting{/tr}</option>
......@@ -140,7 +140,7 @@
</td>
<td colspan="3" style="text-align:right;">
<input type="submit" class="btn btn-primary btn-sm" name="update_percentage" value="{tr}Go{/tr}" style="vertical-align:bottom;">
{icon _id='arrow_turn_down_left' title="{tr}Go{/tr}" alt="{tr}Go{/tr}" style="margin-bottom:8px; margin-right:8px"}
{icon name='next' class='tips' title="{tr}Go{/tr}" style="margin-bottom:8px; margin-right:8px"}
</td>
</tr>
<tr>
......
......@@ -285,6 +285,12 @@ function iconset_default()
'log' => array(
'id' => 'history',
),
'login' => array(
'id' => 'sign-in',
),
'logout' => array(
'id' => 'sign-out',
),
'menu' => array(
'id' => 'bars',
),
......
......@@ -121,6 +121,15 @@ function iconset_glyphicons()
'information' => array(
'id' => 'info-sign',
),
'log' => array(
'id' => 'list-alt',
),
'login' => array(
'id' => 'log-in',
),
'logout' => array(
'id' => 'log-out',
),
'menuitem' => array(
'id' => 'chevron-right',
),
......
......@@ -354,6 +354,12 @@ function iconset_legacy()
'log' => array(
'id' => 'book',
),
'login' => array(
'id' => 'task_received',
),
'logout' => array(
'id' => 'task_submitted',
),
'menu' => array(
'id' => 'application_side_tree',
),
......
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