Commit 91eaf758 authored by lindonb's avatar lindonb

[REF] iconset conversions

parent 1f45bb65
......@@ -67,9 +67,9 @@
{/strip}
{/capture}
<a class="tips"
title="{tr}Actions{/tr}"
href="#" {popup trigger="click" fullhtml="1" center=true text=$smarty.capture.poll_actions|escape:"javascript"|escape:"html"}
style="padding:0; margin:0; border:0"
title="{tr}Actions{/tr}"
href="#" {popup trigger="click" fullhtml="1" center=true text=$smarty.capture.poll_actions|escape:"javascript"|escape:"html"}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
</a>
......
......@@ -235,7 +235,9 @@
</ul>
</td>
<td>
{self_link transitionId=$selected_transition.transitionId action=removeguard guard=$key cookietab=4}{icon _id=cross}{/self_link}
{self_link transitionId=$selected_transition.transitionId action=removeguard guard=$key cookietab=4}
{icon name='remove'}
{/self_link}
</td>
</tr>
{foreachelse}
......
......@@ -31,7 +31,9 @@
{foreach from=$user_info.groups item=what key=grp name=groups}
{if $what eq 'included'}<i>{/if}{$grp|escape}{if $what eq 'included'}</i>{/if}
{if $grp != "Anonymous" && $grp != "Registered" and $what neq 'included'}
<a class="link" href="tiki-assignuser.php?{if $offset}offset={$offset}&amp;{/if}maxRecords={$prefs.maxRecords}&amp;sort_mode={$sort_mode}{if $assign_user}&amp;assign_user={$assign_user|escape:url}{/if}&amp;action=removegroup&amp;group={$grp|escape:url}" title="Remove">{icon _id='cross' alt="{tr}Remove{/tr}" style="vertical-align:middle"}</a>
<a class="tips" href="tiki-assignuser.php?{if $offset}offset={$offset}&amp;{/if}maxRecords={$prefs.maxRecords}&amp;sort_mode={$sort_mode}{if $assign_user}&amp;assign_user={$assign_user|escape:url}{/if}&amp;action=removegroup&amp;group={$grp|escape:url}" title=":{tr}Remove{/tr}">
{icon name='remove' style="vertical-align:middle"}
</a>
{/if}{if !$smarty.foreach.groups.last},{/if}&nbsp;&nbsp;
{/foreach}
</td>
......@@ -62,12 +64,12 @@
<form method="post" action="tiki-assignuser.php{if $assign_user}?assign_user={$assign_user|escape:'url'}{/if}">
<div class="table-responsive">
<table class="table normal">
<table class="table normal table-striped table-hover">
<tr>
<th><a href="tiki-assignuser.php?{if $assign_user}assign_user={$assign_user|escape:url}&amp;{/if}offset={$offset}&amp;maxRecords={$prefs.maxRecords}&amp;sort_mode={if $sort_mode eq 'groupName_desc'}groupName_asc{else}groupName_desc{/if}">{tr}Name{/tr}</a></th>
<th><a href="tiki-assignuser.php?{if $assign_user}assign_user={$assign_user|escape:url}&amp;{/if}offset={$offset}&amp;maxRecords={$prefs.maxRecords}&amp;sort_mode={if $sort_mode eq 'groupDesc_desc'}groupDesc_asc{else}groupDesc_desc{/if}">{tr}Description{/tr}</a></th>
<th>{tr}Expiration{/tr}</th>
<th>{tr}Action{/tr}</th>
<th></th>
</tr>
{section name=user loop=$users}
......@@ -89,11 +91,26 @@
{/if}</td>
<td class="action">
{if $users[user].what ne 'real'}
<a class="link" href="tiki-assignuser.php?{if $offset}offset={$offset}&amp;{/if}maxRecords={$prefs.maxRecords}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;group={$users[user].groupName|escape:url}{if $assign_user}&amp;assign_user={$assign_user|escape:url}{/if}" title="{tr}Assign User to Group{/tr}">{icon _id='add' alt="{tr}Assign{/tr}"}</a>
{elseif $users[user].groupName ne "Registered"}
<a class="link" href="tiki-assignuser.php?{if $offset}offset={$offset}&amp;{/if}maxRecords={$prefs.maxRecords}&amp;sort_mode={$sort_mode}{if $assign_user}&amp;assign_user={$assign_user|escape:url}{/if}&amp;action=removegroup&amp;group={$users[user].groupName|escape:url}" title="unassign">{icon _id='cross' alt="{tr}Unassign{/tr}"}</a>
{/if}
{capture name=assign_user_actions}
{strip}
{if $users[user].what ne 'real'}
<a href="tiki-assignuser.php?{if $offset}offset={$offset}&amp;{/if}maxRecords={$prefs.maxRecords}&amp;sort_mode={$sort_mode}&amp;action=assign&amp;group={$users[user].groupName|escape:url}{if $assign_user}&amp;assign_user={$assign_user|escape:url}{/if}">
{icon name='add' _menu_text='y' _menu_icon='y' alt="{tr}Assign{/tr}"}
</a>
{elseif $users[user].groupName ne "Registered"}
<a href="tiki-assignuser.php?{if $offset}offset={$offset}&amp;{/if}maxRecords={$prefs.maxRecords}&amp;sort_mode={$sort_mode}{if $assign_user}&amp;assign_user={$assign_user|escape:url}{/if}&amp;action=removegroup&amp;group={$users[user].groupName|escape:url}">
{icon name='remove' _menu_text='y' _menu_icon='y' alt="{tr}Unassign{/tr}"}
</a>
{/if}
{/strip}
{/capture}
<a class="tips"
title="{tr}Actions{/tr}"
href="#" {popup trigger="click" fullhtml="1" center=true text=$smarty.capture.assign_user_actions|escape:"javascript"|escape:"html"}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
</a>
</td>
</tr>
{/if}
......
......@@ -17,7 +17,7 @@
<br>
<span style="float:right;height:16px;width:16px;color:#{$infocals.$calendarId.customfgcolor};background-color:#{$infocals.$calendarId.custombgcolor};border-color:#{$infocals.$calendarId.customfgcolor};border-width:1px;border-style:solid;opacity:0.7;">&nbsp;</span>
<a href="tiki-calendar_edit_item.php?viewcalitemId={$evt.calitemId}" title="{tr}Details{/tr}"{if $evt.status eq '2'} style="text-decoration:line-through"{/if}>{$evt.name}</a><br>
<!-- {if $cellmodif eq "y"}<a href="tiki-calendar_edit_item.php?calitemId={$cellid}" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a><br>{/if} -->
<!-- {if $cellmodif eq "y"}<a href="tiki-calendar_edit_item.php?calitemId={$cellid}" title="{tr}Edit{/tr}">{icon name='edit'}</a><br>{/if} -->
{if $show_category eq 'y' and $infocals.$cellcalendarId.customcategories eq 'y' and $cellcategory}<span class='box-title'>{tr}Classification:{/tr}</span> {$evt.category}<br>{/if}
{if $show_location eq 'y' and $infocals.$cellcalendarId.customlocations eq 'y' and $celllocation}<span class='box-title'>{tr}Location:{/tr}</span> {$evt.location}<br>{/if}
{if $show_url eq 'y' and $infocals.$cellcalendarId.customurl eq 'y' and $evt.url}<span class='box-title'><a href="{$cellurl|escape:'url'}" title="{$evt.url|escape:'url'}">{$url|truncate:32:'...'}</a></span><br>{/if}
......
......@@ -741,7 +741,7 @@ $(".end.time select, #end").change(function () {
<div class="col-md-9">
{if $edit}
<a href="#" onclick="flip('calparthelp');return false;">
{icon _id='help'}
{icon name='help'}
</a>
{/if}
{if isset($calitem.participants)}
......
......@@ -25,7 +25,7 @@
<td>
{tr}CSV File{/tr}
{capture name=help}{tr}Column names on the first line:{/tr}<br>name,description,start&nbsp;date,start&nbsp;time,end&nbsp;date,end&nbsp;time,status,lang,categoryId,locationId,priority,url,categoryId<br><i>{tr _0=subject _1=name}%0 column name can be used instead of %1{/tr}</i><br>{tr}Date format:{/tr} {tr}See:{/tr} http://php.net/strtotime{/capture}
<a title="{tr}Help{/tr}" {popup text=$smarty.capture.help|escape}>{icon _id='help'}</a>
<a title="{tr}Help{/tr}" {popup text=$smarty.capture.help|escape}>{icon name='help'}</a>
</td>
<td>
<input type="file" name="fileCSV" size="50">
......
<table cellpadding="0" cellspacing="0" border="0" class="table normal">
<table cellpadding="0" cellspacing="0" border="0" class="table normal table-striped table-hover">
<tr>
<th style="width:20%"><a href="{$myurl}?sort_mode={if $sort_mode eq 'start_desc'}start_asc{else}start_desc{/if}">{tr}Start{/tr}</a></th>
<th style="width:20%"><a href="{$myurl}?sort_mode={if $sort_mode eq 'end_desc'}end_asc{else}end_desc{/if}">{tr}End{/tr}</a></th>
<th><a href="{$myurl}?sort_mode={if $sort_mode eq 'name_desc'}name_asc{else}name_desc{/if}">{tr}Name{/tr}</a></th>
<th>{tr}Action{/tr}</th>
<th></th>
</tr>
{if $listevents|@count eq 0}{norecords _colspan=4}{/if}
......@@ -32,8 +32,23 @@
</td>
<td class="action">
{if $event.modifiable eq "y"}
<a class="link" href="tiki-calendar_edit_item.php?calitemId={$event.calitemId}" title="{tr}Edit{/tr}">{icon _id='page_edit'}</a>
<a class="link" href="tiki-calendar_edit_item.php?calitemId={$event.calitemId}&amp;delete=1" title="{tr}Remove{/tr}">{icon _id='cross' alt="{tr}Remove{/tr}"}</a>
{capture name=calendar_actions}
{strip}
<a href="tiki-calendar_edit_item.php?calitemId={$event.calitemId}">
{icon name='edit' _menu_text='y' _menu_icon='y' alt="{tr}Edit{/tr}"}
</a>
<a href="tiki-calendar_edit_item.php?calitemId={$event.calitemId}&amp;delete=1">
{icon name='remove' _menu_text='y' _menu_icon='y' alt="{tr}Remove{/tr}"}
</a>
{/strip}
{/capture}
<a class="tips"
title="{tr}Actions{/tr}"
href="#" {popup trigger="click" fullhtml="1" center=true text=$smarty.capture.calendar_actions|escape:"javascript"|escape:"html"}
style="padding:0; margin:0; border:0"
>
{icon name='wrench'}
</a>
{/if}
</td>
</tr>
......
......@@ -30,7 +30,7 @@
<tr>
<td style="border:0;padding-top:2px;vertical-align:middle">
{if $prefs.feature_jscalendar neq 'y' or $prefs.javascript_enabled neq 'y'}
<a href="#" onclick="document.f.tstart.selectedIndex=(document.f.tstart.selectedIndex+1);">{icon _id='plus_small' align='left' width='11' height='8'}</a>
<a href="#" onclick="document.f.tstart.selectedIndex=(document.f.tstart.selectedIndex+1);">{icon name='add' align='left'}</a>
{/if}
</td>
<td style="border:0;padding-top:2px;vertical-align:middle">
......@@ -51,7 +51,7 @@
<tr>
<td style="border:0;padding-top:2px;vertical-align:middle">
{if $prefs.feature_jscalendar neq 'y' or $prefs.javascript_enabled neq 'y'}
<a href="#" onclick="document.f.tstop.selectedIndex=(document.f.tstop.selectedIndex+1);">{icon _id='plus_small' align='left' width='11' height='8'}</a>
<a href="#" onclick="document.f.tstop.selectedIndex=(document.f.tstop.selectedIndex+1);">{icon name='add' align='left'}</a>
{/if}
</td>
<td style="border:0;padding-top:2px;vertical-align:middle">
......
......@@ -30,8 +30,8 @@
{/if}
{* add additional check to NOT show add event icon if no calendar displayed *}
{if $tiki_p_add_events eq 'y' and count($listcals) > 0 and $displayedcals|@count > 0}
<a href="tiki-calendar_edit_item.php?todate={$viewWeekDays[dn]}{if $displayedcals|@count eq 1}&amp;calendarId={$displayedcals[0]}{/if}">
{icon _id='calendar_add' alt="{tr}Add Event{/tr}"}
<a class="tips" title=":{tr}Add Event{/tr}" href="tiki-calendar_edit_item.php?todate={$viewWeekDays[dn]}{if $displayedcals|@count eq 1}&amp;calendarId={$displayedcals[0]}{/if}">
{icon name='add'}
</a>
{/if}
</td>
......
......@@ -46,7 +46,7 @@
<input type="hidden" name="actpass" value="{$smarty.request.actpass|escape}">
{/if}
<fieldset>{if $new_user_validation neq 'y'}<legend>{tr}Change your password{/tr}</legend>{/if}
<div class="alert alert-warning" id="divRegCapson" style="visibility:hidden">{icon _id=error style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
<div class="alert alert-warning" id="divRegCapson" style="visibility:hidden">{icon name='error' style="vertical-align:middle"} {tr}CapsLock is on.{/tr}</div>
</fieldset>
<div class="form-group">
<label class="col-sm-3 col-md-2 control-label" for="user">{tr}Username{/tr}</label>
......
......@@ -3,14 +3,14 @@
{include file='tiki-directory_bar.tpl'}
{if $categs[0] eq ''}
{icon _id=exclamation style="vertical-align:middle" alt="{tr}Error{/tr}"} {tr}You cannot add sites until Directory Categories are setup.{/tr} <br>
{icon name='error' style="vertical-align:middle" alt="{tr}Error{/tr}"} {tr}You cannot add sites until Directory Categories are setup.{/tr} <br>
{if $tiki_p_admin_directory_cats ne 'y'}
{tr}Please contact the Site Administrator{/tr}{else}{tr}<a href="tiki-directory_admin_categories.php">Add a directory category now</a>.{/tr}
{/if}
{else}
{if $save eq 'y'}
<h2>{tr}Site added{/tr}</h2>
{icon _id=accept alt="{tr}OK{/tr}" style="vertical-align:middle" align="left"} {tr}The following site was added, but may require validation by the admin before appearing on the lists.{/tr}
{icon name='ok' alt="{tr}OK{/tr}" style="vertical-align:middle" align="left"} {tr}The following site was added, but may require validation by the admin before appearing on the lists.{/tr}
<table class="formcolor">
<tr>
<td>{tr}Name:{/tr}</td>
......@@ -33,7 +33,7 @@
</table>
{else}
{if $msg}
<div class="alert alert-warning">{icon _id=exclamation alt="{tr}Error{/tr}" style="vertical-align:middle"} {tr}{$msg}{/tr}</div>
<div class="alert alert-warning">{icon name='warning' alt="{tr}Error{/tr}" style="vertical-align:middle"} {tr}{$msg}{/tr}</div>
{/if}
{* Display a form to add or edit a site *}
......
<div class="t_navbar margin-bottom-md">
{self_link print='y'}{icon _id='printer' hspace='1' align='right' alt="{tr}Print{/tr}"}{/self_link}
{self_link print='y'}{icon name='print' hspace='1' align='right' alt="{tr}Print{/tr}"}{/self_link}
{if $mid ne "tiki-directory_browse.tpl"}
{button href="tiki-directory_browse.php" class="btn btn-default" _text="{tr}Browse{/tr}"}
{button href="tiki-directory_browse.php" class="btn btn-default" _icon_name="view" _text="{tr}Browse{/tr}"}
{/if}
{if $tiki_p_admin_directory_cats eq 'y' or $tiki_p_admin_directory_sites eq 'y' or $tiki_p_validate_links eq 'y'}
{button href="tiki-directory_admin.php" class="btn btn-default" _text="{tr}Admin{/tr}"}
{button href="tiki-directory_admin.php" class="btn btn-default" _icon_name="cog" _text="{tr}Admin{/tr}"}
{/if}
{button href="tiki-directory_ranking.php?sort_mode=created_desc" class="btn btn-default" _text="{tr}New Sites{/tr}"}
{button href="tiki-directory_ranking.php?sort_mode=created_desc" class="btn btn-default" _icon_name="star" _text="{tr}New Sites{/tr}"}
{if $prefs.directory_cool_sites eq "y"}
{button href="tiki-directory_ranking.php?sort_mode=hits_desc" class="btn btn-default" _text="{tr}Cool Sites{/tr}"}
{button href="tiki-directory_ranking.php?sort_mode=hits_desc" class="btn btn-default" _icon_name="ok" _text="{tr}Cool Sites{/tr}"}
{/if}
{if $tiki_p_submit_link eq 'y' or $tiki_p_autosubmit_link eq 'y'}
{if isset($addtocat)}
{button href="tiki-directory_add_site.php?addtocat=$addtocat" class="btn btn-default" _text="{tr}Add a Site{/tr}"}
{button href="tiki-directory_add_site.php?addtocat=$addtocat" class="btn btn-default" _icon_name="add" _text="{tr}Add a Site{/tr}"}
{else}
{button href="tiki-directory_add_site.php" class="btn btn-default" _text="{tr}Add a Site{/tr}"}
{button href="tiki-directory_add_site.php" class="btn btn-default" _icon_name="add" _text="{tr}Add a Site{/tr}"}
{/if}
{if $tiki_p_admin_directory_cats eq 'y'}
{button href="tiki-directory_admin_categories.php" class="btn btn-default" _text="{tr}Add a Directory Category{/tr}"}
{button href="tiki-directory_admin_categories.php" class="btn btn-default" _icon_name="add" _text="{tr}Add a Directory Category{/tr}"}
{/if}
{/if}
</div>
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