aboutsummaryrefslogtreecommitdiffstats
path: root/view/js
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 /view/js
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 'view/js')
-rw-r--r--view/js/acl.js4
-rw-r--r--view/js/icon_translate.js106
-rw-r--r--view/js/main.js10
-rw-r--r--view/js/mod_chat.js4
-rw-r--r--view/js/mod_filestorage.js4
-rw-r--r--view/js/mod_photos.js4
-rw-r--r--view/js/mod_settings.js4
7 files changed, 68 insertions, 68 deletions
diff --git a/view/js/acl.js b/view/js/acl.js
index 7940a9bdc..be215fc91 100644
--- a/view/js/acl.js
+++ b/view/js/acl.js
@@ -193,13 +193,13 @@ ACL.prototype.update_view = function() {
that.deny_gid.length === 0 && that.deny_cid.length === 0) {
that.showall.removeClass("btn-default").addClass("btn-warning");
/* jot acl */
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
$('.profile-jot-net input').attr('disabled', false);
} else {
that.showall.removeClass("btn-warning").addClass("btn-default");
/* jot acl */
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
$('.profile-jot-net input').attr('disabled', 'disabled');
diff --git a/view/js/icon_translate.js b/view/js/icon_translate.js
index fcbc26a3f..41776b096 100644
--- a/view/js/icon_translate.js
+++ b/view/js/icon_translate.js
@@ -2,57 +2,57 @@
$(document).ready(function() {
- $('.icon-smile').addClass('');
- $('.icon-star-empty').addClass('');
- $('.icon-star-full').addClass('');
- $('.icon-star').addClass('');
- $('.icon-remove').addClass('');
- $('.icon-search').addClass('');
- $('.icon-facetime-video').addClass('');
- $('.icon-volume-up').addClass('');
- $('.icon-picture').addClass('');
- $('.icon-align-justify').addClass('');
- $('.icon-question').addClass('');
- $('.icon-ok').addClass('');
- $('.icon-lock').addClass('');
- $('.icon-unlock').addClass('');
- $('.icon-th').addClass('');
- $('.icon-home').addClass('');
- $('.icon-envelope').addClass('');
- $('.icon-calendar').addClass('');
- $('.icon-user').addClass('');
- $('.icon-exclamation').addClass('');
- $('.icon-sitemap').addClass('');
- $('.icon-cogs').addClass('');
- $('.icon-paper-clip').addClass('');
- $('.icon-pencil').addClass('');
- $('.icon-remove').addClass('');
- $('.icon-ok').addClass('');
- $('.icon-folder-close').addClass('');
- $('.icon-camera').addClass('');
- $('.icon-paper-clip').addClass('');
- $('.icon-link').addClass('');
- $('.icon-eraser').addClass('');
- $('.icon-key').addClass('');
- $('.icon-asterisk').addClass('');
- $('.icon-backward').addClass('');
- $('.icon-forward').addClass('');
- $('.icon-external-link').addClass('');
- $('.icon-eye-open').addClass('');
- $('.icon-bold').addClass('');
- $('.icon-italic').addClass('');
- $('.icon-underline').addClass('');
- $('.icon-quote-left').addClass('');
- $('.icon-terminal').addClass('');
- $('.icon-camera').addClass('');
- $('.icon-link').addClass('');
- $('.icon-check-empty').addClass('');
- $('.icon-check').addClass('');
- $('.icon-globe').addClass('');
- $('.icon-circle-blank').addClass('');
- $('.icon-circle').addClass('');
- $('.icon-bookmark').addClass('');
- $('.icon-fullscreen').addClass('');
- $('.icon-share').addClass('');
- $('.icon-plus').addClass('');
+ $('.fa-smile-o').addClass('');
+ $('.fa-star-o').addClass('');
+ $('.fa-star-full').addClass('');
+ $('.fa-star').addClass('');
+ $('.fa-times').addClass('');
+ $('.fa-search').addClass('');
+ $('.fa-video-camera').addClass('');
+ $('.fa-volume-up').addClass('');
+ $('.fa-picture-o').addClass('');
+ $('.fa-align-justify').addClass('');
+ $('.fa-question').addClass('');
+ $('.fa-check').addClass('');
+ $('.fa-lock').addClass('');
+ $('.fa-unlock').addClass('');
+ $('.fa-th').addClass('');
+ $('.fa-home').addClass('');
+ $('.fa-envelope').addClass('');
+ $('.fa-calendar').addClass('');
+ $('.fa-user').addClass('');
+ $('.fa-exclamation').addClass('');
+ $('.fa-sitemap').addClass('');
+ $('.fa-cogs').addClass('');
+ $('.fa-paperclip').addClass('');
+ $('.fa-pencil').addClass('');
+ $('.fa-times').addClass('');
+ $('.fa-check').addClass('');
+ $('.fa-folder').addClass('');
+ $('.fa-camera').addClass('');
+ $('.fa-paperclip').addClass('');
+ $('.fa-link').addClass('');
+ $('.fa-eraser').addClass('');
+ $('.fa-key').addClass('');
+ $('.fa-asterisk').addClass('');
+ $('.fa-backward').addClass('');
+ $('.fa-forward').addClass('');
+ $('.fa-external-link').addClass('');
+ $('.fa-eye').addClass('');
+ $('.fa-bold').addClass('');
+ $('.fa-italic').addClass('');
+ $('.fa-underline').addClass('');
+ $('.fa-quote-left').addClass('');
+ $('.fa-terminal').addClass('');
+ $('.fa-camera').addClass('');
+ $('.fa-link').addClass('');
+ $('.fa-square-o').addClass('');
+ $('.fa-check-square-o').addClass('');
+ $('.fa-globe').addClass('');
+ $('.fa-circle-o').addClass('');
+ $('.fa-circle').addClass('');
+ $('.fa-bookmark').addClass('');
+ $('.fa-arrows-alt').addClass('');
+ $('.fa-share-square-o').addClass('');
+ $('.fa-plus').addClass('');
}); \ No newline at end of file
diff --git a/view/js/main.js b/view/js/main.js
index 748853939..15a6b4b8d 100644
--- a/view/js/main.js
+++ b/view/js/main.js
@@ -984,16 +984,16 @@ function dostar(ident) {
if(data.result == 1) {
$('#starred-' + ident).addClass('starred');
$('#starred-' + ident).removeClass('unstarred');
- $('#starred-' + ident).addClass('icon-star-full');
- $('#starred-' + ident).removeClass('icon-star-empty');
+ $('#starred-' + ident).addClass('fa-star-full');
+ $('#starred-' + ident).removeClass('fa-star-o');
$('#star-' + ident).addClass('hidden');
$('#unstar-' + ident).removeClass('hidden');
}
else {
$('#starred-' + ident).addClass('unstarred');
$('#starred-' + ident).removeClass('starred');
- $('#starred-' + ident).addClass('icon-star-empty');
- $('#starred-' + ident).removeClass('icon-star-full');
+ $('#starred-' + ident).addClass('fa-star-o');
+ $('#starred-' + ident).removeClass('fa-star-full');
$('#star-' + ident).removeClass('hidden');
$('#unstar-' + ident).addClass('hidden');
}
@@ -1179,7 +1179,7 @@ function contactgroupChangeMember(gid, cid) {
$('body').css('cursor', 'wait');
$.get('contactgroup/' + gid + '/' + cid, function(data) {
$('body').css('cursor', 'auto');
- $('#group-' + gid).toggleClass('icon-check icon-check-empty');
+ $('#group-' + gid).toggleClass('fa-check-square-o fa-square-o');
});
}
diff --git a/view/js/mod_chat.js b/view/js/mod_chat.js
index f9d2a599c..00becc2fa 100644
--- a/view/js/mod_chat.js
+++ b/view/js/mod_chat.js
@@ -7,11 +7,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
diff --git a/view/js/mod_filestorage.js b/view/js/mod_filestorage.js
index df04b4a83..c0620c928 100644
--- a/view/js/mod_filestorage.js
+++ b/view/js/mod_filestorage.js
@@ -6,11 +6,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
diff --git a/view/js/mod_photos.js b/view/js/mod_photos.js
index 8af75b4eb..006be5f23 100644
--- a/view/js/mod_photos.js
+++ b/view/js/mod_photos.js
@@ -13,11 +13,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');
diff --git a/view/js/mod_settings.js b/view/js/mod_settings.js
index 9a7550ac1..640c154dd 100644
--- a/view/js/mod_settings.js
+++ b/view/js/mod_settings.js
@@ -17,11 +17,11 @@ $(document).ready(function() {
var selstr;
$('#contact_allow option:selected, #contact_deny option:selected, #group_allow option:selected, #group_deny option:selected').each( function() {
selstr = $(this).text();
- $('#jot-perms-icon').removeClass('icon-unlock').addClass('icon-lock');
+ $('#jot-perms-icon').removeClass('fa-unlock').addClass('fa-lock');
$('#jot-public').hide();
});
if(selstr === null) {
- $('#jot-perms-icon').removeClass('icon-lock').addClass('icon-unlock');
+ $('#jot-perms-icon').removeClass('fa-lock').addClass('fa-unlock');
$('#jot-public').show();
}
}).trigger('change');