From c8fad68a4fd15857a2e3e21e7d5311dc7f87226c Mon Sep 17 00:00:00 2001
From: Marien Fressinaud <dev@marienfressinaud.fr>
Date: Sun, 5 Oct 2014 16:10:25 +0200
Subject: Use _i() whenever it is possible

Transform FreshRSS_Themes::icon\s? in _i

See https://github.com/marienfressinaud/FreshRSS/issues/655
---
 app/views/configure/archiving.phtml |  4 ++--
 app/views/configure/display.phtml   |  6 +++---
 app/views/configure/sharing.phtml   | 14 +++++++-------
 app/views/configure/users.phtml     |  8 ++++----
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'app/views/configure')

diff --git a/app/views/configure/archiving.phtml b/app/views/configure/archiving.phtml
index 3180fe933..a883571aa 100644
--- a/app/views/configure/archiving.phtml
+++ b/app/views/configure/archiving.phtml
@@ -5,7 +5,7 @@
 
 	<form method="post" action="<?php echo _url('configure', 'archiving'); ?>">
 		<legend><?php echo _t('archiving_configuration'); ?></legend>
-		<p><?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
+		<p><?php echo _i('help'); ?> <?php echo _t('archiving_configuration_help'); ?></p>
 
 		<div class="form-group">
 			<label class="group-name" for="old_entries"><?php echo _t('delete_articles_every'); ?></label>
@@ -63,7 +63,7 @@
 				<p><?php echo formatNumber($this->nb_total), ' ', _t('articles'), ', ', formatBytes($this->size_user); ?></p>
 				<input type="hidden" name="optimiseDatabase" value="1" />
 				<button type="submit" class="btn btn-important"><?php echo _t('optimize_bdd'); ?></button>
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
+				<?php echo _i('help'); ?> <?php echo _t('optimize_todo_sometimes'); ?>
 			</div>
 		</div>
 
diff --git a/app/views/configure/display.phtml b/app/views/configure/display.phtml
index f1b80ab15..34239c7b2 100644
--- a/app/views/configure/display.phtml
+++ b/app/views/configure/display.phtml
@@ -62,12 +62,12 @@
 				<thead>
 					<tr>
 						<th> </th>
-						<th title="<?php echo _t('mark_read'); ?>"><?php echo FreshRSS_Themes::icon('read'); ?></th>
-						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo FreshRSS_Themes::icon('bookmark'); ?></th>
+						<th title="<?php echo _t('mark_read'); ?>"><?php echo _i('read'); ?></th>
+						<th title="<?php echo _t('mark_favorite'); ?>"><?php echo _i('bookmark'); ?></th>
 						<th><?php echo _t('sharing'); ?></th>
 						<th><?php echo _t('related_tags'); ?></th>
 						<th><?php echo _t('publication_date'); ?></th>
-						<th><?php echo FreshRSS_Themes::icon('link'); ?></th>
+						<th><?php echo _i('link'); ?></th>
 					</tr>
 				</thead>
 				<tbody>
diff --git a/app/views/configure/sharing.phtml b/app/views/configure/sharing.phtml
index ee276a94e..5f657ca74 100644
--- a/app/views/configure/sharing.phtml
+++ b/app/views/configure/sharing.phtml
@@ -4,15 +4,15 @@
 	<a href="<?php echo _url ('index', 'index'); ?>"><?php echo _t('back_to_rss_feeds'); ?></a>
 
 	<form method="post" action="<?php echo _url ('configure', 'sharing'); ?>"
-		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+		data-simple='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls"><a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a>
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" /></div></div>'
 		data-advanced='<div class="form-group" id="group-share-##key##"><label class="group-name">##label##</label><div class="group-controls">
 			<input type="hidden" id="share_##key##_type" name="share[##key##][type]" value="##type##" />
 			<div class="stick">
 			<input type="text" id="share_##key##_name" name="share[##key##][name]" class="extend" value="" placeholder="<?php echo _t('share_name'); ?>" size="64" />
 			<input type="url" id="share_##key##_url" name="share[##key##][url]" class="extend" value="" placeholder="<?php echo _t('share_url'); ?>" size="64" />
-			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo FreshRSS_Themes::icon('close'); ?></a></div>
-			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+			<a href="#" class="remove btn btn-attention" data-remove="group-share-##key##"><?php echo _i('close'); ?></a></div>
+			<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="##help##"><?php echo _i('help'); ?></a>
 			</div></div>'>
 		<legend><?php echo _t('sharing'); ?></legend>
 		<?php foreach ($this->conf->sharing as $key => $sharing): ?>
@@ -27,12 +27,12 @@
 						<div class="stick">
 							<input type="text" id="share_<?php echo $key;?>_name" name="share[<?php echo $key;?>][name]" class="extend" value="<?php echo $sharing['name']?>" placeholder="<?php echo _t('share_name'); ?>" size="64" />
 							<input type="url" id="share_<?php echo $key;?>_url" name="share[<?php echo $key;?>][url]" class="extend" value="<?php echo $sharing['url']?>" placeholder="<?php echo _t('share_url'); ?>" size="64" />
-							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+							<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 						</div>
 
-						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo FreshRSS_Themes::icon('help'); ?></a>
+						<a target="_blank" class="btn" title="<?php echo _t('more_information'); ?>" href="<?php echo $share['help']?>"><?php echo _i('help'); ?></a>
 					<?php } else { ?>
-					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo FreshRSS_Themes::icon('close'); ?></a>
+					<a href='#' class='remove btn btn-attention' data-remove="group-share-<?php echo $key; ?>"><?php echo _i('close'); ?></a>
 					<?php } ?>
 				</div>
 			</div>
@@ -45,7 +45,7 @@
 						<option value='<?php echo $key?>' data-form='<?php echo $params['form']?>' data-help='<?php if (!empty($params['help'])) {echo $params['help'];}?>'><?php echo _t($key) ?></option>
 					<?php endforeach; ?>
 				</select>
-				<a href='#' class='share add btn'><?php echo FreshRSS_Themes::icon('add'); ?></a>
+				<a href='#' class='share add btn'><?php echo _i('add'); ?></a>
 			</div>
 		</div>
 
diff --git a/app/views/configure/users.phtml b/app/views/configure/users.phtml
index 04e662fa3..517e302e5 100644
--- a/app/views/configure/users.phtml
+++ b/app/views/configure/users.phtml
@@ -22,7 +22,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="passwordPlain" name="passwordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
@@ -34,7 +34,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="apiPasswordPlain" name="apiPasswordPlain" autocomplete="off" pattern=".{7,}" <?php echo cryptAvailable() ? '' : 'disabled="disabled" '; ?>/>
-					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
 			</div>
 		</div>
@@ -113,7 +113,7 @@
 			<div class="group-controls">
 				<input type="text" id="token" name="token" value="<?php echo $token; ?>" placeholder="<?php echo _t('blank_to_disable'); ?>"<?php
 					echo Minz_Configuration::canLogIn() ? '' : ' disabled="disabled"'; ?> />
-				<?php echo FreshRSS_Themes::icon('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
+				<?php echo _i('help'); ?> <?php echo _t('explain_token', Minz_Url::display(null, 'html', true), $token); ?>
 			</div>
 		</div>
 		<?php } ?>
@@ -184,7 +184,7 @@
 			<div class="group-controls">
 				<div class="stick">
 					<input type="password" id="new_user_passwordPlain" name="new_user_passwordPlain" autocomplete="off" pattern=".{7,}" />
-					<a class="btn toggle-password"><?php echo FreshRSS_Themes::icon('key'); ?></a>
+					<a class="btn toggle-password"><?php echo _i('key'); ?></a>
 				</div>
 				<noscript><b><?php echo _t('javascript_should_be_activated'); ?></b></noscript>
 			</div>
-- 
cgit v1.2.3