replace icons with font awesome

src/email.php

@@ -379,6 +379,8 @@ if($_REQUEST['action'] == 'folder')
 	$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 					? $_REQUEST['order']
 					: 'desc';
+	$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
+	
 
 	// get mail list
 	$mailList = $mailbox->GetMailList($folderID,
@@ -409,7 +411,7 @@ if($_REQUEST['action'] == 'folder')
 											$folderID, $sortColumn, $sortOrder, $pageNo));
 	$tpl->assign('mailList', $mailList);
 	$tpl->assign('sortColumn', $sortColumn);
-	$tpl->assign('sortOrder', $sortOrder);
+	$tpl->assign('sortOrder', $sortOrderFA);
 	$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 	if(isset($folderList[$folderID]))
 	{

src/organizer.calendar.php

@@ -311,6 +311,7 @@ else if($_REQUEST['action'] == 'groups')
 		$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 						? $_REQUEST['order']
 						: 'asc';
+		$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 		// group list
 		$groups = $calendar->GetGroups($sortColumn, $sortOrder);
@@ -319,7 +320,7 @@ else if($_REQUEST['action'] == 'groups')
 		$tpl->assign('haveGroups', count($groups) > 1);
 		$tpl->assign('groups', $groups);
 		$tpl->assign('sortColumn', $sortColumn);
-		$tpl->assign('sortOrder', $sortOrder);
+		$tpl->assign('sortOrder', $sortOrderFA);
 		$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 		$tpl->assign('pageContent', 'li/organizer.calendar.groups.tpl');
 		$tpl->display('li/index.tpl');

src/organizer.notes.php

@@ -70,6 +70,7 @@ if($_REQUEST['action'] == 'start')
 	$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 					? $_REQUEST['order']
 					: 'desc';
+	$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 	// note list
 	$noteList = $notes->GetNoteList($sortColumn, $sortOrder);
@@ -79,7 +80,7 @@ if($_REQUEST['action'] == 'start')
 		$tpl->assign('showID', (int)$_REQUEST['show']);
 	$tpl->assign('noteList', $noteList);
 	$tpl->assign('sortColumn', $sortColumn);
-	$tpl->assign('sortOrder', $sortOrder);
+	$tpl->assign('sortOrder', $sortOrderFA);
 	$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 	$tpl->assign('pageContent', 'li/organizer.notes.tpl');
 	$tpl->display('li/index.tpl');

src/prefs.php

@@ -1195,6 +1195,7 @@ else if($_REQUEST['action'] == 'aliases'
 		$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 						? $_REQUEST['order']
 						: 'asc';
+		$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 		// alias list
 		$aliasList = $thisUser->GetAliases($sortColumn, $sortOrder);
@@ -1204,7 +1205,7 @@ else if($_REQUEST['action'] == 'aliases'
 		$tpl->assign('aliasUsage', sprintf($lang_user['aliasusage'], count($aliasList), $groupRow['aliase']));
 		$tpl->assign('aliasList', $aliasList);
 		$tpl->assign('sortColumn', $sortColumn);
-		$tpl->assign('sortOrder', $sortOrder);
+		$tpl->assign('sortOrder', $sortOrderFA);
 		$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 		$tpl->assign('pageContent', 'li/prefs.aliases.tpl');
 		$tpl->display('li/index.tpl');
@@ -1385,6 +1386,7 @@ else if($_REQUEST['action'] == 'extpop3')
 		$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 						? $_REQUEST['order']
 						: 'asc';
+		$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 		// account list
 		$accountList = $thisUser->GetPOP3Accounts($sortColumn, $sortOrder);
@@ -1394,7 +1396,7 @@ else if($_REQUEST['action'] == 'extpop3')
 		$tpl->assign('accountUsage', sprintf($lang_user['pop3usage'], count($accountList), $groupRow['ownpop3']));
 		$tpl->assign('accountList', $accountList);
 		$tpl->assign('sortColumn', $sortColumn);
-		$tpl->assign('sortOrder', $sortOrder);
+		$tpl->assign('sortOrder', $sortOrderFA);
 		$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 		$tpl->assign('pageContent', 'li/prefs.extpop3.tpl');
 		$tpl->display('li/index.tpl');
@@ -1808,6 +1810,7 @@ else if($_REQUEST['action'] == 'keyring'
 		$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 						? $_REQUEST['order']
 						: 'asc';
+		$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 		// get key ring
 		$ownCerts 		= $thisUser->GetKeyRing($sortColumn, $sortOrder, CERTIFICATE_TYPE_PRIVATE);
@@ -1817,7 +1820,7 @@ else if($_REQUEST['action'] == 'keyring'
 		$tpl->assign('uploadCerts', $groupRow['upload_certificates'] == 'yes');
 		$tpl->assign('issueCerts', $groupRow['issue_certificates'] == 'yes');
 		$tpl->assign('sortColumn', $sortColumn);
-		$tpl->assign('sortOrder', $sortOrder);
+		$tpl->assign('sortOrder', $sortOrderFA);
 		$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 		$tpl->assign('now', time());
 		$tpl->assign('ownCerts', $ownCerts);

src/search.php

@@ -147,6 +147,7 @@ if($_REQUEST['action'] == 'search')
 	$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 					? $_REQUEST['order']
 					: 'desc';
+	$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 	// perform search
 	if(strlen($q) >= 3)
@@ -204,7 +205,7 @@ if($_REQUEST['action'] == 'search')
 
 		// show results
 		$tpl->assign('sortColumn', $sortColumn);
-		$tpl->assign('sortOrder', $sortOrder);
+		$tpl->assign('sortOrder', $sortOrderFA);
 		$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 		$tpl->assign('pageNo', $pageNo);
 		$tpl->assign('pageCount', $pageCount);

src/sms.php

@@ -225,12 +225,13 @@ else if($_REQUEST['action'] == 'outbox')
 	$sortOrder = (isset($_REQUEST['order']) && in_array($_REQUEST['order'], array('asc', 'desc')))
 					? $_REQUEST['order']
 					: 'desc';
+	$sortOrderFA = ($sortOrder=="desc")?'fa-arrow-down': 'fa-arrow-up';
 
 	// page output
 	$tpl->assign('pageTitle', $lang_user['smsoutbox']);
 	$tpl->assign('outbox', $sms->GetOutbox($sortColumn, $sortOrder));
 	$tpl->assign('sortColumn', $sortColumn);
-	$tpl->assign('sortOrder', $sortOrder);
+	$tpl->assign('sortOrder', $sortOrderFA);
 	$tpl->assign('sortOrderInv', $sortOrder == 'asc' ? 'desc' : 'asc');
 	$tpl->assign('pageContent', 'li/sms.outbox.tpl');
 	$tpl->display('li/index.tpl');

src/templates/modern/li/email.folder.contents.tpl

@@ -38,22 +38,22 @@
 		<th width="20%">
 		{if $folderID!=-2}
 			<a href="email.php?folder={$folderID}&sid={$sid}&sort=von&order={$sortOrderInv}">{lng p="from"}</a>
-			{if $sortColumn=='von'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='von'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		{else}
 			<a href="email.php?folder={$folderID}&sid={$sid}&sort=an&order={$sortOrderInv}">{lng p="to"}</a>
-			{if $sortColumn=='an'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='an'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		{/if}</th>
 		<th>
 			<a href="email.php?folder={$folderID}&sid={$sid}&sort=betreff&order={$sortOrderInv}">{lng p="subject"}</a>
-			{if $sortColumn=='betreff'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='betreff'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="130">
 			<a href="email.php?folder={$folderID}&sid={$sid}&sort=fetched&order={$sortOrderInv}">{lng p="date"}</a>
-			{if $sortColumn=='fetched'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='fetched'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="65">
 			<a href="email.php?folder={$folderID}&sid={$sid}&sort=size&order={$sortOrderInv}">{lng p="size"}</a>
-			{if $sortColumn=='size'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='size'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="70">&nbsp;</th>
 	</tr>

src/templates/modern/li/organizer.calendar.groups.tpl

@@ -13,11 +13,11 @@
 		<th class="listTableHead" width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f1, 'group');" /></th>
 		<th class="listTableHead">
 			<a href="organizer.calendar.php?action=groups&sid={$sid}&sort=title&order={$sortOrderInv}">{lng p="title"}</a>
-			{if $sortColumn=='title'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='title'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th class="listTableHead" width="120">
 			<a href="organizer.calendar.php?action=groups&sid={$sid}&sort=color&order={$sortOrderInv}">{lng p="color"}</a>
-			{if $sortColumn=='color'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='color'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th class="listTableHead" width="55">&nbsp;</th>
 	</tr>

src/templates/modern/li/organizer.notes.tpl

@@ -15,15 +15,15 @@
 					<th width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f1);" /></th>
 					<th width="80">
 						<a href="organizer.notes.php?sid={$sid}&sort=priority&order={$sortOrderInv}">{lng p="priority"}</a>
-						{if $sortColumn=='priority'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+						{if $sortColumn=='priority'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 					</th>
 					<th width="150">
 						<a href="organizer.notes.php?sid={$sid}&sort=date&order={$sortOrderInv}">{lng p="date"}</a>
-						{if $sortColumn=='date'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+						{if $sortColumn=='date'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 					</th>
 					<th>
 						<a href="organizer.notes.php?sid={$sid}&sort=text&order={$sortOrderInv}">{lng p="text"}</a>
-						{if $sortColumn=='text'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}					
+						{if $sortColumn=='text'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}					
 					</th>
 					<th width="55">&nbsp;</th>
 				</tr>

src/templates/modern/li/prefs.aliases.tpl

@@ -16,11 +16,11 @@
 		<th width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f1, 'alias');" /></th>
 		<th>
 			<a href="prefs.php?sid={$sid}&action=aliases&sort=email&order={$sortOrderInv}">{lng p="alias"}</a>
-			{if $sortColumn=='email'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='email'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="220">
 			<a href="prefs.php?sid={$sid}&action=aliases&sort=type&order={$sortOrderInv}">{lng p="type"}</a>
-			{if $sortColumn=='type'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='type'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="55">&nbsp;</th>
 	</tr>

src/templates/modern/li/prefs.extpop3.tpl

@@ -16,18 +16,18 @@
 		<th width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f1, 'pop3');" /></th>
 		<th>
 			<a href="prefs.php?sid={$sid}&action=extpop3&sort=p_user&order={$sortOrderInv}">{lng p="username"}</a>
-			{if $sortColumn=='p_user'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='p_user'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th>
 			<a href="prefs.php?sid={$sid}&action=extpop3&sort=p_host&order={$sortOrderInv}">{lng p="host"}</a>
-			{if $sortColumn=='p_host'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='p_host'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="60">
 			{lng p="paused"}?
 		</th>
 		<th width="220">
 			<a href="prefs.php?sid={$sid}&action=extpop3&sort=last_fetch&order={$sortOrderInv}">{lng p="lastfetch"}</a>
-			{if $sortColumn=='last_fetch'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='last_fetch'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="55">&nbsp;</th>
 	</tr>

src/templates/modern/li/prefs.keyring.tpl

@@ -13,15 +13,15 @@
 				<th width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f1, 'cert');" /></th>
 				<th>
 					<a href="prefs.php?sid={$sid}&action=keyring&sort=cn&order={$sortOrderInv}">{lng p="name"}</a>
-					{if $sortColumn=='cn'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+					{if $sortColumn=='cn'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 				</th>
 				<th>
 					<a href="prefs.php?sid={$sid}&action=keyring&sort=email&order={$sortOrderInv}">{lng p="email"}</a>
-					{if $sortColumn=='email'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+					{if $sortColumn=='email'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 				</th>
 				<th>
 					<a href="prefs.php?sid={$sid}&action=keyring&sort=validto&order={$sortOrderInv}">{lng p="validto"}</a>
-					{if $sortColumn=='validto'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+					{if $sortColumn=='validto'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 				</th>
 				<th width="70">&nbsp;</th>
 			</tr>
@@ -102,15 +102,15 @@
 				<th width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f2, 'cert');" /></th>
 				<th>
 					<a href="prefs.php?sid={$sid}&action=keyring&sort=cn&order={$sortOrderInv}">{lng p="name"}</a>
-					{if $sortColumn=='cn'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+					{if $sortColumn=='cn'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 				</th>
 				<th>
 					<a href="prefs.php?sid={$sid}&action=keyring&sort=email&order={$sortOrderInv}">{lng p="email"}</a>
-					{if $sortColumn=='email'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+					{if $sortColumn=='email'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 				</th>
 				<th>
 					<a href="prefs.php?sid={$sid}&action=keyring&sort=validto&order={$sortOrderInv}">{lng p="validto"}</a>
-					{if $sortColumn=='validto'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+					{if $sortColumn=='validto'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 				</th>
 				<th width="70">&nbsp;</th>
 			</tr>

src/templates/modern/li/search.details.tpl

@@ -22,13 +22,13 @@
 	<tr>
 		<th colspan="2">&nbsp;</th>
 		<th><a href="#" onclick="changeSearchSort('title','{$sortOrderInv}');">{lng p="title"}</a>
-			{if $sortColumn=='title'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}</th>
+			{if $sortColumn=='title'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}</th>
 		<th><a href="#" onclick="changeSearchSort('date','{$sortOrderInv}');">{lng p="date"}</a>
-			{if $sortColumn=='date'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}</th>
+			{if $sortColumn=='date'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}</th>
 		<th><a href="#" onclick="changeSearchSort('size','{$sortOrderInv}');">{lng p="size"}</a>
-			{if $sortColumn=='size'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}</th>
+			{if $sortColumn=='size'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}</th>
 		<th><a href="#" onclick="changeSearchSort('score','{$sortOrderInv}');">{lng p="relevance"}</a>
-			{if $sortColumn=='score'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}</th>
+			{if $sortColumn=='score'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}</th>
 	</tr>
 	
 	{if $results}

src/templates/modern/li/sms.outbox.tpl

@@ -13,15 +13,15 @@
 		<th width="20"><input type="checkbox" id="allChecker" onclick="checkAll(this.checked, document.forms.f1, 'sms');" /></th>
 		<th>
 			<a href="sms.php?action=outbox&sid={$sid}&sort=from&order={$sortOrderInv}">{lng p="from"}</a>
-			{if $sortColumn=='from'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='from'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th>
 			<a href="sms.php?action=outbox&sid={$sid}&sort=to&order={$sortOrderInv}">{lng p="to"}</a>
-			{if $sortColumn=='to'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='to'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="160">
 			<a href="sms.php?action=outbox&sid={$sid}&sort=date&order={$sortOrderInv}">{lng p="date"}</a>
-			{if $sortColumn=='date'}<img src="{$tpldir}images/li/{$sortOrder}.gif" border="0" alt="" align="absmiddle" />{/if}
+			{if $sortColumn=='date'}<i class="fa {$sortOrder}" aria-hidden="true"></i>{/if}
 		</th>
 		<th width="35">&nbsp;</th>
 	</tr>