update icon names in include/
This commit is contained in:
parent
7d380570df
commit
8f16e9ad33
@ -75,7 +75,7 @@ class Item extends BaseObject {
|
|||||||
$buttons = '';
|
$buttons = '';
|
||||||
$dropping = false;
|
$dropping = false;
|
||||||
$star = false;
|
$star = false;
|
||||||
$isstarred = "unstarred icon-star-empty";
|
$isstarred = "unstarred fa-star-o";
|
||||||
$indent = '';
|
$indent = '';
|
||||||
$osparkle = '';
|
$osparkle = '';
|
||||||
$total_children = $this->count_descendants();
|
$total_children = $this->count_descendants();
|
||||||
@ -214,7 +214,7 @@ class Item extends BaseObject {
|
|||||||
'toggle' => t("Toggle Star Status"),
|
'toggle' => t("Toggle Star Status"),
|
||||||
'classdo' => (intval($item['item_starred']) ? "hidden" : ""),
|
'classdo' => (intval($item['item_starred']) ? "hidden" : ""),
|
||||||
'classundo' => (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'),
|
'starred' => t('starred'),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -658,7 +658,7 @@ function conversation(&$a, $items, $mode, $update, $page_mode = 'traditional', $
|
|||||||
);
|
);
|
||||||
|
|
||||||
$star = false;
|
$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']))
|
$lock = (($item['item_private'] || strlen($item['allow_cid']) || strlen($item['allow_gid']) || strlen($item['deny_cid']) || strlen($item['deny_gid']))
|
||||||
? t('Private Message')
|
? t('Private Message')
|
||||||
|
@ -25,7 +25,7 @@ function format_event_html($ev) {
|
|||||||
|
|
||||||
$o = '<div class="vevent">' . "\r\n";
|
$o = '<div class="vevent">' . "\r\n";
|
||||||
|
|
||||||
$o .= '<div class="event-title"><h3><i class="icon-calendar"></i> ' . bbcode($ev['summary']) . '</h3></div>' . "\r\n";
|
$o .= '<div class="event-title"><h3><i class="fa fa-calendar"></i> ' . bbcode($ev['summary']) . '</h3></div>' . "\r\n";
|
||||||
|
|
||||||
$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span> <span class="dtstart" title="'
|
$o .= '<div class="event-start"><span class="event-label">' . t('Starts:') . '</span> <span class="dtstart" title="'
|
||||||
. datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
|
. datetime_convert('UTC', 'UTC', $ev['start'], (($ev['adjust']) ? ATOM_TIME : 'Y-m-d\TH:i:s' ))
|
||||||
|
@ -2601,41 +2601,41 @@ function linkify_tags($a, &$body, $uid, $diaspora = false) {
|
|||||||
function getIconFromType($type) {
|
function getIconFromType($type) {
|
||||||
$iconMap = array(
|
$iconMap = array(
|
||||||
//Folder
|
//Folder
|
||||||
t('Collection') => 'icon-folder-close',
|
t('Collection') => 'fa-folder',
|
||||||
'multipart/mixed' => 'icon-folder-close', //dirs in attach use this mime type
|
'multipart/mixed' => 'fa-folder', //dirs in attach use this mime type
|
||||||
//Common file
|
//Common file
|
||||||
'application/octet-stream' => 'icon-file-alt',
|
'application/octet-stream' => 'fa-file-o',
|
||||||
//Text
|
//Text
|
||||||
'text/plain' => 'icon-file-text-alt',
|
'text/plain' => 'fa-file-text-o',
|
||||||
'application/msword' => 'icon-file-text-alt',
|
'application/msword' => 'fa-file-text-o',
|
||||||
'application/pdf' => 'icon-file-text-alt',
|
'application/pdf' => 'fa-file-text-o',
|
||||||
'application/vnd.oasis.opendocument.text' => 'icon-file-text-alt',
|
'application/vnd.oasis.opendocument.text' => 'fa-file-text-o',
|
||||||
'application/epub+zip' => 'icon-book',
|
'application/epub+zip' => 'fa-book',
|
||||||
//Spreadsheet
|
//Spreadsheet
|
||||||
'application/vnd.oasis.opendocument.spreadsheet' => 'icon-table',
|
'application/vnd.oasis.opendocument.spreadsheet' => 'fa-table',
|
||||||
'application/vnd.ms-excel' => 'icon-table',
|
'application/vnd.ms-excel' => 'fa-table',
|
||||||
//Image
|
//Image
|
||||||
'image/jpeg' => 'icon-picture',
|
'image/jpeg' => 'fa-picture-o',
|
||||||
'image/png' => 'icon-picture',
|
'image/png' => 'fa-picture-o',
|
||||||
'image/gif' => 'icon-picture',
|
'image/gif' => 'fa-picture-o',
|
||||||
'image/svg+xml' => 'icon-picture',
|
'image/svg+xml' => 'fa-picture-o',
|
||||||
//Archive
|
//Archive
|
||||||
'application/zip' => 'icon-archive',
|
'application/zip' => 'fa-archive',
|
||||||
'application/x-rar-compressed' => 'icon-archive',
|
'application/x-rar-compressed' => 'fa-archive',
|
||||||
//Audio
|
//Audio
|
||||||
'audio/mpeg' => 'icon-music',
|
'audio/mpeg' => 'fa-music',
|
||||||
'audio/wav' => 'icon-music',
|
'audio/wav' => 'fa-music',
|
||||||
'application/ogg' => 'icon-music',
|
'application/ogg' => 'fa-music',
|
||||||
'audio/ogg' => 'icon-music',
|
'audio/ogg' => 'fa-music',
|
||||||
'audio/webm' => 'icon-music',
|
'audio/webm' => 'fa-music',
|
||||||
'audio/mp4' => 'icon-music',
|
'audio/mp4' => 'fa-music',
|
||||||
//Video
|
//Video
|
||||||
'video/quicktime' => 'icon-film',
|
'video/quicktime' => 'fa-film',
|
||||||
'video/webm' => 'icon-film',
|
'video/webm' => 'fa-film',
|
||||||
'video/mp4' => 'icon-film'
|
'video/mp4' => 'fa-film'
|
||||||
);
|
);
|
||||||
|
|
||||||
$iconFromType = 'icon-file-alt';
|
$iconFromType = 'fa-file-o';
|
||||||
|
|
||||||
if (array_key_exists($type, $iconMap)) {
|
if (array_key_exists($type, $iconMap)) {
|
||||||
$iconFromType = $iconMap[$type];
|
$iconFromType = $iconMap[$type];
|
||||||
|
@ -1203,12 +1203,12 @@ function widget_rating($arr) {
|
|||||||
|
|
||||||
if((($remote) || (local_channel())) && (! $self)) {
|
if((($remote) || (local_channel())) && (! $self)) {
|
||||||
if($remote)
|
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
|
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>';
|
$o .= '</div>';
|
||||||
|
|
||||||
return $o;
|
return $o;
|
||||||
|
@ -1,5 +1,5 @@
|
|||||||
{{if $attaches}}
|
{{if $attaches}}
|
||||||
{{foreach $attaches as $a}}
|
{{foreach $attaches as $a}}
|
||||||
<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="{{$a.icon}} attach-icons"></i> {{$a.label}}</a></li>
|
<li><a href="{{$a.url}}" title="{{$a.title}}"><i class="fa {{$a.icon}} attach-icons"></i> {{$a.label}}</a></li>
|
||||||
{{/foreach}}
|
{{/foreach}}
|
||||||
{{/if}}
|
{{/if}}
|
||||||
|
Reference in New Issue
Block a user