aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-05-01 08:02:03 +1000
committerredmatrix <git@macgirvin.com>2016-05-01 08:02:03 +1000
commit9446d0cbb463af6a256efebf97e10618469f1193 (patch)
tree3704de63c7188086ea6a5399094dfde170afaa69 /include
parent8a41e2a011bd1c69c138fb75d138ed2bb4bf779f (diff)
parent3fe8fc0aa80a03fc63905e1e80999e6ccb8672e8 (diff)
downloadvolse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.tar.gz
volse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.tar.bz2
volse-hubzilla-9446d0cbb463af6a256efebf97e10618469f1193.zip
Merge pull request #362 from Treer/fontawesome
Update Font-Awesome to 4.6.1
Diffstat (limited to 'include')
-rw-r--r--include/ItemObject.php4
-rw-r--r--include/conversation.php2
-rw-r--r--include/event.php2
-rw-r--r--include/text.php52
-rw-r--r--include/widgets.php6
5 files changed, 33 insertions, 33 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php
index 9d5acd95f..019fa87ad 100644
--- a/include/ItemObject.php
+++ b/include/ItemObject.php
@@ -75,7 +75,7 @@ class Item extends BaseObject {
$buttons = '';
$dropping = false;
$star = false;
- $isstarred = "unstarred icon-star-empty";
+ $isstarred = "unstarred fa-star-o";
$indent = '';
$osparkle = '';
$total_children = $this->count_descendants();
@@ -214,7 +214,7 @@ class Item extends BaseObject {
'toggle' => t("Toggle Star Status"),
'classdo' => (intval($item['item_starred']) ? "hidden" : ""),
'classundo' => (intval($item['item_starred']) ? "" : "hidden"),
- 'isstarred' => (intval($item['item_starred']) ? "starred icon-star" : "unstarred icon-star-empty"),
+ 'isstarred' => (intval($item['item_starred']) ? "starred fa-star" : "unstarred fa-star-o"),
'starred' => t('starred'),
);
diff --git a/include/conversation.php b/include/conversation.php
index 2c1e18099..ba9d551a7 100644
--- a/include/conversation.php
+++ b/include/conversation.php
@@ -658,7 +658,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
);
$star = false;
- $isstarred = "unstarred icon-star-empty";
+ $isstarred = "unstarred fa-star-o";
$lock = (($item['item_private'] || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
? t('Private Message')
diff --git a/include/event.php b/include/event.php
index 7a99bc746..e54a172c2 100644
--- a/include/event.php
+++ b/include/event.php
@@ -25,7 +25,7 @@ function format_event_html($ev) {
$o = '<div class="vevent">' . "\r\n";
- $o .= '<div class="event-title"><h3><i class="icon-calendar"></i>&nbsp;' . bbcode($ev['summary']) . '</h3></div>' . "\r\n";
+ $o .= '<div class="event-title"><h3><i class="fa fa-calendar"></i>&nbsp;' . bbcode($ev['summary']) . '</h3></div>' . "\r\n";
$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span>&nbsp;<span class="dtstart" title="'
. datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
diff --git a/include/text.php b/include/text.php
index f1043909d..d7c91e430 100644
--- a/include/text.php
+++ b/include/text.php
@@ -2601,41 +2601,41 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) {
function getIconFromType($type) {
$iconMap = array(
//Folder
- t('Collection') => 'icon-folder-close',
- 'multipart/mixed' => 'icon-folder-close', //dirs in attach use this mime type
+ t('Collection') => 'fa-folder',
+ 'multipart/mixed' => 'fa-folder', //dirs in attach use this mime type
//Common file
- 'application/octet-stream' => 'icon-file-alt',
+ 'application/octet-stream' => 'fa-file-o',
//Text
- 'text/plain' => 'icon-file-text-alt',
- 'application/msword' => 'icon-file-text-alt',
- 'application/pdf' => 'icon-file-text-alt',
- 'application/vnd.oasis.opendocument.text' => 'icon-file-text-alt',
- 'application/epub+zip' => 'icon-book',
+ 'text/plain' => 'fa-file-text-o',
+ 'application/msword' => 'fa-file-text-o',
+ 'application/pdf' => 'fa-file-text-o',
+ 'application/vnd.oasis.opendocument.text' => 'fa-file-text-o',
+ 'application/epub+zip' => 'fa-book',
//Spreadsheet
- 'application/vnd.oasis.opendocument.spreadsheet' => 'icon-table',
- 'application/vnd.ms-excel' => 'icon-table',
+ 'application/vnd.oasis.opendocument.spreadsheet' => 'fa-table',
+ 'application/vnd.ms-excel' => 'fa-table',
//Image
- 'image/jpeg' => 'icon-picture',
- 'image/png' => 'icon-picture',
- 'image/gif' => 'icon-picture',
- 'image/svg+xml' => 'icon-picture',
+ 'image/jpeg' => 'fa-picture-o',
+ 'image/png' => 'fa-picture-o',
+ 'image/gif' => 'fa-picture-o',
+ 'image/svg+xml' => 'fa-picture-o',
//Archive
- 'application/zip' => 'icon-archive',
- 'application/x-rar-compressed' => 'icon-archive',
+ 'application/zip' => 'fa-archive',
+ 'application/x-rar-compressed' => 'fa-archive',
//Audio
- 'audio/mpeg' => 'icon-music',
- 'audio/wav' => 'icon-music',
- 'application/ogg' => 'icon-music',
- 'audio/ogg' => 'icon-music',
- 'audio/webm' => 'icon-music',
- 'audio/mp4' => 'icon-music',
+ 'audio/mpeg' => 'fa-music',
+ 'audio/wav' => 'fa-music',
+ 'application/ogg' => 'fa-music',
+ 'audio/ogg' => 'fa-music',
+ 'audio/webm' => 'fa-music',
+ 'audio/mp4' => 'fa-music',
//Video
- 'video/quicktime' => 'icon-film',
- 'video/webm' => 'icon-film',
- 'video/mp4' => 'icon-film'
+ 'video/quicktime' => 'fa-film',
+ 'video/webm' => 'fa-film',
+ 'video/mp4' => 'fa-film'
);
- $iconFromType = 'icon-file-alt';
+ $iconFromType = 'fa-file-o';
if (array_key_exists($type, $iconMap)) {
$iconFromType = $iconMap[$type];
diff --git a/include/widgets.php b/include/widgets.php
index 0355ebd8c..fa92901ae 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1203,12 +1203,12 @@ function widget_rating($arr) {
if((($remote) || (local_channel())) && (! $self)) {
if($remote)
- $o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="icon-pencil"></i> ' . t('Rate Me') . '</a>';
+ $o .= '<a class="btn btn-block btn-primary btn-sm" href="' . $url . '"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</a>';
else
- $o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="icon-pencil"></i> ' . t('Rate Me') . '</div>';
+ $o .= '<div class="btn btn-block btn-primary btn-sm" onclick="doRatings(\'' . $hash . '\'); return false;"><i class="fa fa-pencil"></i> ' . t('Rate Me') . '</div>';
}
- $o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="icon-eye-open"></i> ' . t('View Ratings') . '</a>';
+ $o .= '<a class="btn btn-block btn-default btn-sm" href="ratings/' . $hash . '"><i class="fa fa-eye"></i> ' . t('View Ratings') . '</a>';
$o .= '</div>';
return $o;