From 8f16e9ad33e17fcdf5c0b4586b384ea12eeb0716 Mon Sep 17 00:00:00 2001 From: Treer Date: Sun, 1 May 2016 04:39:57 +1000 Subject: update icon names in include/ --- view/tpl/item_attach.tpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'view') diff --git a/view/tpl/item_attach.tpl b/view/tpl/item_attach.tpl index 67accc1ec..83cc9a3cd 100644 --- a/view/tpl/item_attach.tpl +++ b/view/tpl/item_attach.tpl @@ -1,5 +1,5 @@ {{if $attaches}} {{foreach $attaches as $a}} -
  •  {{$a.label}}
    • +
  •  {{$a.label}}
    • {{/foreach}} {{/if}} -- cgit v1.2.3 From 2f74f9eb401d03b6eb8f8e12b80a7b8f4a989dd2 Mon Sep 17 00:00:00 2001 From: Treer Date: Sun, 1 May 2016 04:51:01 +1000 Subject: update icon names in view/js --- view/js/acl.js | 4 +- view/js/icon_translate.js | 106 ++++++++++++++++++++++----------------------- view/js/main.js | 10 ++--- view/js/mod_chat.js | 4 +- view/js/mod_filestorage.js | 4 +- view/js/mod_photos.js | 4 +- view/js/mod_settings.js | 4 +- 7 files changed, 68 insertions(+), 68 deletions(-) (limited to 'view') 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'); -- cgit v1.2.3 From 17dba9542ad2745025550cefc28d38aa84a69c0d Mon Sep 17 00:00:00 2001 From: Treer Date: Sun, 1 May 2016 05:59:02 +1000 Subject: update icon names in view/ --- view/css/conversation.css | 2 +- view/theme/redbasic/css/style.css | 2 +- view/theme/redbasic/js/redbasic.js | 4 +-- view/theme/redbasic/schema/bluegrid.css | 6 ++--- view/tpl/abook_edit.tpl | 2 +- view/tpl/acl_selector.tpl | 6 ++--- view/tpl/admin_channels.tpl | 6 ++--- view/tpl/admin_plugins.tpl | 4 +-- view/tpl/admin_plugins_details.tpl | 2 +- view/tpl/admin_profiles.tpl | 4 +-- view/tpl/admin_queue.tpl | 2 +- view/tpl/admin_users.tpl | 6 ++--- view/tpl/app.tpl | 8 +++--- view/tpl/attach_edit.tpl | 6 ++--- view/tpl/blocklist.tpl | 8 +++--- view/tpl/channel.tpl | 12 ++++----- view/tpl/channels.tpl | 2 +- view/tpl/chanview.tpl | 2 +- view/tpl/chat.tpl | 36 +++++++++++++------------- view/tpl/chatroom_new.tpl | 2 +- view/tpl/chatrooms.tpl | 4 +-- view/tpl/cloud_directory.tpl | 6 ++--- view/tpl/cloud_header.tpl | 6 ++--- view/tpl/comment_item.tpl | 20 +++++++------- view/tpl/connection_template.tpl | 10 +++---- view/tpl/connections.tpl | 6 ++--- view/tpl/conv_item.tpl | 42 +++++++++++++++--------------- view/tpl/conv_list.tpl | 44 +++++++++++++++---------------- view/tpl/directory_header.tpl | 2 +- view/tpl/direntry.tpl | 6 ++--- view/tpl/edpost_head.tpl | 2 +- view/tpl/event.tpl | 6 ++--- view/tpl/event_cal.tpl | 2 +- view/tpl/event_form.tpl | 36 +++++++++++++------------- view/tpl/event_item_header.tpl | 2 +- view/tpl/events-js.tpl | 10 +++---- view/tpl/events_cal-js.tpl | 10 +++---- view/tpl/events_tools_side.tpl | 4 +-- view/tpl/field_acheckbox.tpl | 6 ++--- view/tpl/follow.tpl | 2 +- view/tpl/group_drop.tpl | 2 +- view/tpl/group_side.tpl | 6 ++--- view/tpl/install_checks.tpl | 2 +- view/tpl/item_categories.tpl | 2 +- view/tpl/item_filer.tpl | 2 +- view/tpl/jot-header.tpl | 4 +-- view/tpl/jot.tpl | 46 ++++++++++++++++----------------- view/tpl/layoutlist.tpl | 10 +++---- view/tpl/like_noshare.tpl | 4 +-- view/tpl/locmanage.tpl | 6 ++--- view/tpl/mail_conv.tpl | 8 +++--- view/tpl/mail_display.tpl | 6 ++--- view/tpl/match.tpl | 2 +- view/tpl/menuedit.tpl | 4 +-- view/tpl/menulist.tpl | 10 +++---- view/tpl/mitemedit.tpl | 4 +-- view/tpl/mitemlist.tpl | 8 +++--- view/tpl/nav.tpl | 44 +++++++++++++++---------------- view/tpl/peoplefind.tpl | 2 +- view/tpl/photo_album.tpl | 10 +++---- view/tpl/photo_drop.tpl | 2 +- view/tpl/photo_view.tpl | 24 ++++++++--------- view/tpl/photos_recent.tpl | 6 ++--- view/tpl/photos_upload.tpl | 4 +-- view/tpl/posted_date_widget.tpl | 10 +++---- view/tpl/profile_advanced.tpl | 10 +++---- view/tpl/profile_edit.tpl | 14 +++++----- view/tpl/profile_listing_header.tpl | 2 +- view/tpl/profile_vcard.tpl | 10 +++---- view/tpl/profile_vcard_short.tpl | 4 +-- view/tpl/prv_message.tpl | 28 ++++++++++---------- view/tpl/saved_searches.tpl | 2 +- view/tpl/search_item.tpl | 10 +++---- view/tpl/searchbox.tpl | 4 +-- view/tpl/settings.tpl | 2 +- view/tpl/settings_account.tpl | 2 +- view/tpl/settings_oauth.tpl | 4 +-- view/tpl/sharedwithme.tpl | 4 +-- view/tpl/show_thing.tpl | 4 +-- view/tpl/suggest_friends.tpl | 4 +-- view/tpl/thing_edit.tpl | 2 +- view/tpl/thing_input.tpl | 2 +- view/tpl/usermenu.tpl | 2 +- view/tpl/webpagelist.tpl | 10 +++---- view/tpl/xchan_vcard.tpl | 2 +- 85 files changed, 349 insertions(+), 349 deletions(-) (limited to 'view') diff --git a/view/css/conversation.css b/view/css/conversation.css index e5eb575bf..9b99efba4 100644 --- a/view/css/conversation.css +++ b/view/css/conversation.css @@ -124,7 +124,7 @@ a.wall-item-name-link { text-overflow: ellipsis; } -.wall-item-ago .icon-ok { +.wall-item-ago .fa-check { cursor: pointer; } diff --git a/view/theme/redbasic/css/style.css b/view/theme/redbasic/css/style.css index 290a1a697..7ed7e0934 100644 --- a/view/theme/redbasic/css/style.css +++ b/view/theme/redbasic/css/style.css @@ -1828,7 +1828,7 @@ nav .badge.mail-update:hover { } .bootstrap-tagsinput .tag:before { - /* Copied from icon-asterisk, is there a better way to do it? */ + /* Copied from fa-asterisk, is there a better way to do it? */ font-family: FontAwesome; font-weight: normal; font-style: normal; diff --git a/view/theme/redbasic/js/redbasic.js b/view/theme/redbasic/js/redbasic.js index 877bcd840..58c2a9ceb 100644 --- a/view/theme/redbasic/js/redbasic.js +++ b/view/theme/redbasic/js/redbasic.js @@ -17,7 +17,7 @@ $(document).ready(function() { $('#css3-calc').remove(); // Remove the test element $('#expand-aside').click(function() { - $('#expand-aside-icon').toggleClass('icon-circle-arrow-right').toggleClass('icon-circle-arrow-left'); + $('#expand-aside-icon').toggleClass('fa-arrow-circle-right').toggleClass('fa-arrow-circle-left'); $('main').toggleClass('region_1-on'); }); @@ -29,7 +29,7 @@ $(document).ready(function() { if(!$('#tabs-collapse-1').hasClass('in')){ $('html, body').animate({ scrollTop: 0 }, 'slow'); } - $('#expand-tabs-icon').toggleClass('icon-circle-arrow-down').toggleClass('icon-circle-arrow-up'); + $('#expand-tabs-icon').toggleClass('fa-arrow-circle-down').toggleClass('fa-arrow-circle-up'); }); if($('#tabs-collapse-1').length === 0) { diff --git a/view/theme/redbasic/schema/bluegrid.css b/view/theme/redbasic/schema/bluegrid.css index 471bed5e4..591e820a1 100644 --- a/view/theme/redbasic/schema/bluegrid.css +++ b/view/theme/redbasic/schema/bluegrid.css @@ -433,7 +433,7 @@ input { border-color: #AC2925 !important; } -a:hover > .icon-trash { +a:hover > .fa-trash-o { color: #C9302C !important; } @@ -450,10 +450,10 @@ a:hover > .icon-trash { .navbar-inverse .navbar-toggle .icon-bar { background-color: #FFF; } - .navbar-inverse .navbar-toggle .icon-circle-arrow-down, .navbar-inverse .navbar-toggle .icon-circle-arrow-right, .navbar-inverse .navbar-toggle .icon-circle-arrow-up, .navbar-inverse .navbar-toggle .icon-circle-arrow-left { + .navbar-inverse .navbar-toggle .fa-arrow-circle-down, .navbar-inverse .navbar-toggle .fa-arrow-circle-right, .navbar-inverse .navbar-toggle .fa-arrow-circle-up, .navbar-inverse .navbar-toggle .fa-arrow-circle-left { color: #FFF; } - .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-down, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-right, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-up, .navbar-inverse .navbar-toggle:hover .icon-circle-arrow-left, .navbar-inverse .navbar-toggle:focus .icon-circle-arrow-left { + .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-down, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-right, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-up, .navbar-inverse .navbar-toggle:hover .fa-arrow-circle-left, .navbar-inverse .navbar-toggle:focus .fa-arrow-circle-left { color: #43488A; } .navbar-inverse .navbar-toggle:hover, .navbar-inverse .navbar-toggle:focus { diff --git a/view/tpl/abook_edit.tpl b/view/tpl/abook_edit.tpl index 74ba6072d..835948096 100755 --- a/view/tpl/abook_edit.tpl +++ b/view/tpl/abook_edit.tpl @@ -3,7 +3,7 @@ {{if $notself}}
    • {{$tools.view.label}}
      • diff --git a/view/tpl/acl_selector.tpl b/view/tpl/acl_selector.tpl index 88df7481a..e57fdba12 100755 --- a/view/tpl/acl_selector.tpl +++ b/view/tpl/acl_selector.tpl @@ -16,7 +16,7 @@
    {{/if}}
    - +
    @@ -26,8 +26,8 @@
    diff --git a/view/tpl/admin_channels.tpl b/view/tpl/admin_channels.tpl index 8a2f4458a..6db963304 100755 --- a/view/tpl/admin_channels.tpl +++ b/view/tpl/admin_channels.tpl @@ -34,9 +34,9 @@ {{$c.channel_address}} - - - + + + {{/foreach}} diff --git a/view/tpl/admin_plugins.tpl b/view/tpl/admin_plugins.tpl index 0da214c17..4b91f9e46 100755 --- a/view/tpl/admin_plugins.tpl +++ b/view/tpl/admin_plugins.tpl @@ -5,9 +5,9 @@ {{foreach $plugins as $p}}
  • {{if ! $p.2.disabled}} - + {{else}} - + {{/if}} {{$p.2.name}} - {{$p.2.version}}{{if $p.2.disabled}} {{$disabled}}{{/if}} {{if $p.2.experimental}} {{$experimental}} {{/if}}{{if $p.2.unsupported}} {{$unsupported}} {{/if}} diff --git a/view/tpl/admin_plugins_details.tpl b/view/tpl/admin_plugins_details.tpl index 5d9e233f9..b8cc72a04 100755 --- a/view/tpl/admin_plugins_details.tpl +++ b/view/tpl/admin_plugins_details.tpl @@ -1,7 +1,7 @@

    {{$title}} - {{$page}}

    -

    {{if ! $info.disabled}}{{else}}{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : {{$action}}{{/if}}

    +

    {{if ! $info.disabled}}{{else}}{{/if}} {{$info.name}} - {{$info.version}}{{if ! $info.disabled}} : {{$action}}{{/if}}

    {{if $info.disabled}}

    {{$disabled}}

    diff --git a/view/tpl/admin_profiles.tpl b/view/tpl/admin_profiles.tpl index dd7250df0..35685505f 100644 --- a/view/tpl/admin_profiles.tpl +++ b/view/tpl/admin_profiles.tpl @@ -1,5 +1,5 @@
    -
     {{$new}}

    {{$title}}

    +
     {{$new}}

    {{$title}}

    @@ -28,7 +28,7 @@ {{foreach $cust_fields as $field}} - + {{/foreach}}
    {{$field.field_name}}{{$field.field_desc}} {{$drop}}
    {{$field.field_name}}{{$field.field_desc}} {{$drop}}
    {{/if}} diff --git a/view/tpl/admin_queue.tpl b/view/tpl/admin_queue.tpl index 56b70bbee..35c2e644a 100644 --- a/view/tpl/admin_queue.tpl +++ b/view/tpl/admin_queue.tpl @@ -7,7 +7,7 @@ {{foreach $entries as $e}} -{{$e.total}}{{$e.outq_posturl}}{{$e.priority}}{{if $expert}}{{/if}} +{{$e.total}}{{$e.outq_posturl}}{{$e.priority}}{{if $expert}}{{/if}} {{/foreach}} diff --git a/view/tpl/admin_users.tpl b/view/tpl/admin_users.tpl index 8a4b772a8..ae77ef24c 100755 --- a/view/tpl/admin_users.tpl +++ b/view/tpl/admin_users.tpl @@ -33,8 +33,8 @@ {{$u.account_email}} - - + + {{/foreach}} @@ -73,7 +73,7 @@ {{$u.account_service_class}} - + {{/foreach}} diff --git a/view/tpl/app.tpl b/view/tpl/app.tpl index 3394cd2ae..20a1337c7 100644 --- a/view/tpl/app.tpl +++ b/view/tpl/app.tpl @@ -7,16 +7,16 @@ {{if $app.type !== 'system'}} {{if $purchase}}
    - +
    {{/if}} {{if $install || $update || $delete }}
    - {{if $install}}{{/if}} - {{if $edit}}{{/if}} - {{if $delete}}{{/if}} + {{if $install}}{{/if}} + {{if $edit}}{{/if}} + {{if $delete}}{{/if}}
    {{/if}} diff --git a/view/tpl/attach_edit.tpl b/view/tpl/attach_edit.tpl index 44d230ae0..965fb4819 100644 --- a/view/tpl/attach_edit.tpl +++ b/view/tpl/attach_edit.tpl @@ -8,16 +8,16 @@
    {{if !$isadir}} - + {{/if}}
    +
    {{/if}}

    {{$title}}

    @@ -40,17 +40,17 @@ {{if $edit}} - + {{/if}} {{if $item.bb_element}} - + {{/if}} {{if $edit}} - + {{/if}} diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl index d306f0aa0..1a84f1e66 100755 --- a/view/tpl/channel.tpl +++ b/view/tpl/channel.tpl @@ -3,11 +3,11 @@ {{if $channel.default_links}} {{if $channel.default}}
    -  {{$msg_default}} +  {{$msg_default}}
    {{else}} -  {{$msg_make_default}} +  {{$msg_make_default}} {{/if}} {{/if}} @@ -17,10 +17,10 @@

    {{if $selected == $channel.channel_id}} - + {{/if}} {{if $channel.delegate}} - + {{/if}} {{if $selected != $channel.channel_id}}{{/if}} {{$channel.channel_name}} @@ -37,11 +37,11 @@
    {{if !$channel.delegate}}
    - + {{if $channel.mail != 0}}{{/if}}{{$channel.mail|string_format:$mail_format}}{{if $channel.mail != 0}}{{/if}}
    - + {{if $channel.intros != 0}}{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}{{/if}}
    {{/if}} diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl index 1a6012926..171f833ee 100755 --- a/view/tpl/channels.tpl +++ b/view/tpl/channels.tpl @@ -1,6 +1,6 @@
    -  {{$create.2}} +  {{$create.2}}

    {{$header}}

    diff --git a/view/tpl/chanview.tpl b/view/tpl/chanview.tpl index a43ea1b5d..d5f379f74 100755 --- a/view/tpl/chanview.tpl +++ b/view/tpl/chanview.tpl @@ -1,2 +1,2 @@ - + diff --git a/view/tpl/chat.tpl b/view/tpl/chat.tpl index 9cf5968cb..afdbdeb28 100644 --- a/view/tpl/chat.tpl +++ b/view/tpl/chat.tpl @@ -1,13 +1,13 @@
    - - + + {{if $is_owner}}
    - +
    {{/if}}
    @@ -27,57 +27,57 @@
    - +
    {{if $feature_encrypt}} {{/if}}
    diff --git a/view/tpl/chatroom_new.tpl b/view/tpl/chatroom_new.tpl index 8acff2ff5..a40313934 100644 --- a/view/tpl/chatroom_new.tpl +++ b/view/tpl/chatroom_new.tpl @@ -4,7 +4,7 @@ {{include file="field_input.tpl" field=$chat_expire}} {{$acl}}
    - +
    diff --git a/view/tpl/chatrooms.tpl b/view/tpl/chatrooms.tpl index d35148f7c..04ebbcae4 100644 --- a/view/tpl/chatrooms.tpl +++ b/view/tpl/chatrooms.tpl @@ -1,7 +1,7 @@
    {{if $is_owner}} - + {{/if}}

    {{$header}}

    @@ -23,7 +23,7 @@ {{$room.cr_expire}} min {{if $room.allow_cid || $room.allow_gid || $room.deny_cid || $room.deny_gid}} - + {{/if}} diff --git a/view/tpl/cloud_directory.tpl b/view/tpl/cloud_directory.tpl index 0c7892c25..c0207c623 100644 --- a/view/tpl/cloud_directory.tpl +++ b/view/tpl/cloud_directory.tpl @@ -10,7 +10,7 @@ {{if $parentpath}} - {{*{{$parentpath.icon}}*}} + {{*{{$parentpath.icon}}*}} .. {{*[{{$parent}}]*}} @@ -25,8 +25,8 @@ {{if $item.is_owner}} {{$item.attachIcon}} - - + + {{else}} diff --git a/view/tpl/cloud_header.tpl b/view/tpl/cloud_header.tpl index 076fa16cb..d41cc9d67 100644 --- a/view/tpl/cloud_header.tpl +++ b/view/tpl/cloud_header.tpl @@ -2,10 +2,10 @@ {{if $actionspanel}}
    {{if $is_owner}} -  {{$shared}} +  {{$shared}} {{/if}} - - + +
    {{/if}}

    {{$header}}

    diff --git a/view/tpl/comment_item.tpl b/view/tpl/comment_item.tpl index 0c0cb984c..1d8bd671d 100755 --- a/view/tpl/comment_item.tpl +++ b/view/tpl/comment_item.tpl @@ -24,36 +24,36 @@
    {{if $feature_encrypt}}
    {{/if}} @@ -62,7 +62,7 @@
    {{if $preview}} {{/if}} diff --git a/view/tpl/connection_template.tpl b/view/tpl/connection_template.tpl index e2a14d9a2..a238f5bc7 100755 --- a/view/tpl/connection_template.tpl +++ b/view/tpl/connection_template.tpl @@ -3,18 +3,18 @@
    {{if $contact.approve && $contact.ignore}}
    - + - {{$contact.ignore}} + {{$contact.ignore}} {{/if}} - {{$contact.delete}} - + {{$contact.delete}} + {{if $contact.approve}}
    {{/if}}
    -

    {{if $contact.public_forum}} {{/if}}{{$contact.name}}

    +

    {{if $contact.public_forum}} {{/if}}{{$contact.name}}

    diff --git a/view/tpl/connections.tpl b/view/tpl/connections.tpl index fdd269602..1f7aa05b7 100755 --- a/view/tpl/connections.tpl +++ b/view/tpl/connections.tpl @@ -2,10 +2,10 @@
      {{foreach $tabs as $menu}} @@ -21,7 +21,7 @@
      - +
    diff --git a/view/tpl/conv_item.tpl b/view/tpl/conv_item.tpl index 553bc3146..d9c60fc3b 100755 --- a/view/tpl/conv_item.tpl +++ b/view/tpl/conv_item.tpl @@ -32,14 +32,14 @@ {{/if}} {{if $item.lock}}
    -   +  
    {{/if}}
    {{$item.name}}{{if $item.owner_url}} {{$item.via}} {{$item.owner_name}}{{/if}}
    - {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}} + {{if $item.verified}} {{elseif $item.forged}} {{/if}}{{if $item.location}}{{$item.location}}, {{/if}}{{$item.localtime}}{{if $item.editedtime}} {{$item.editedtime}}{{/if}}{{if $item.expiretime}} {{$item.expiretime}}{{/if}}{{if $item.editedtime}} {{/if}} {{if $item.app}}{{$item.str_app}}{{/if}}
    @@ -81,68 +81,68 @@
    {{if $item.like}} {{/if}} {{if $item.dislike}} {{/if}} {{if $item.isevent}} {{/if}} {{if $item.canvote}} {{/if}}
    diff --git a/view/tpl/profile_advanced.tpl b/view/tpl/profile_advanced.tpl index f928aa3ee..762c82479 100755 --- a/view/tpl/profile_advanced.tpl +++ b/view/tpl/profile_advanced.tpl @@ -9,11 +9,11 @@ {{/if}} {{if $profile.canlike}} {{/if}} {{if $editmenu.multi}} -  {{$editmenu.edit.3}} +  {{$editmenu.edit.3}} {{elseif $editmenu}} -  {{$editmenu.edit.3}} +  {{$editmenu.edit.3}} {{/if}}

    {{$title}}

    @@ -71,7 +71,7 @@ {{if $f == 'marital'}} {{if $profile.marital}}
    -
     {{$profile.marital.0}}
    +
     {{$profile.marital.0}}
    {{$profile.marital.1}}{{if in_array('with',$fields)}}{{if $profile.marital.with}} ({{$profile.marital.with}}){{/if}}{{/if}}{{if in_array('howlong',$fields)}}{{if $profile.howlong}} {{$profile.howlong}}{{/if}}{{/if}}
    {{/if}} @@ -277,7 +277,7 @@ {{$item.term}} {{if $profile.canlike}}
    {{/if}} {{if $item.like_count}} diff --git a/view/tpl/profile_edit.tpl b/view/tpl/profile_edit.tpl index 4908646b9..deabc2795 100755 --- a/view/tpl/profile_edit.tpl +++ b/view/tpl/profile_edit.tpl @@ -2,24 +2,24 @@