Omni

Omni 2.0.10

Нет прав для скачивания
Нажмите объединить, если конфликтов нет, то всё должно быть в норме.
 
  • Мне нравится
Реакции: Hope
Последнее редактирование модератором:
Под спойлер и в теги код шаблона сбросьте.
 
Под спойлер и в теги код шаблона сбросьте.
Вот:
Код:
<xf:macro name="user_info"
    arg-user="!"
    arg-fallbackName=""
    arg-dateHtml=""
    arg-linkHtml="">

    <section itemscope itemtype="https://schema.org/Person" class="message-user">
        <div class="message-avatar {{ ($xf.options.showMessageOnlineStatus && $user && $user.isOnline()) ? 'message-avatar--online' : '' }}">
            <div class="message-avatar-wrapper">
                <xf:avatar user="$user" size="{{ property('xbMessageAvatarSize') }}" defaultname="{$fallbackName}" itemprop="image" />
                <xf:if is="$xf.options.showMessageOnlineStatus && $user && $user.isOnline()">
                    <span class="message-avatar-online" data-xf-init="tooltip" title="{{ phrase('online_now')|for_attr }}"></span>
                </xf:if>
            </div>
        </div>
        <div class="message-userDetails">
            <h4 class="message-name"><xf:username user="$user" rich="true" defaultname="{$fallbackName}" itemprop="name" /></h4>
            <xf:usertitle user="$user" tag="h5" class="message-userTitle" banner="true" itemprop="jobTitle" />
            <xf:userbanners user="$user" tag="div" class="message-userBanner" itemprop="jobTitle" />
            <xf:if is="{$dateHtml}"><div class="message-date">{$dateHtml}</div></xf:if>
        </div>
        <xf:if is="{$linkHtml}"><div class="message-permalink">{$linkHtml}</div></xf:if>
        <xf:if is="$user.user_id">
            <xf:set var="$extras" value="{{ property('messageUserElements') }}" />
            <xf:if contentcheck="true">
                <div class="message-userExtras{{ property('xbMessageUserElementsCollapse') ? ' message-userExtras-body message-userExtras--collapsible' : '' }}">
                <xf:contentcheck>
                    <xf:if is="$extras.register_date">
                        <dl class="pairs pairs--justified">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-calendar fa-fw" data-xf-init="tooltip" title="{{ phrase('joined') }}"></i> <xf:else />{{ phrase('joined') }}</xf:if></dt>
                            <dd>{{ date($user.register_date) }}</dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.message_count">
                        <dl class="pairs pairs--justified pairs--xbBoxed">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-comments fa-fw" data-xf-init="tooltip" title="{{ phrase('messages') }}"></i> <xf:else />{{ phrase('messages') }}</xf:if></dt>
                            <dd>{$user.message_count|number}</dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.like_count">
                        <dl class="pairs pairs--justified pairs--xbBoxed">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-thumbs-up fa-fw" data-xf-init="tooltip" title="{{ phrase('likes') }}"></i> <xf:else />{{ phrase('likes') }}</xf:if></dt>
                            <dd>{$user.like_count|number}</dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.trophy_points && $xf.options.enableTrophies">
                        <dl class="pairs pairs--justified pairs--xbBoxed">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-trophy fa-fw" data-xf-init="tooltip" title="{{ phrase('points') }}"></i> <xf:else />{{ phrase('points') }}</xf:if></dt>
                            <dd>{$user.trophy_points|number}</dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.age && $user.Profile.age">
                        <dl class="pairs pairs--justified">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-birthday-cake fa-fw" data-xf-init="tooltip" title="{{ phrase('age') }}"></i> <xf:else />{{ phrase('age') }}</xf:if></dt>
                            <dd>{$user.Profile.age}</dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.location && $user.Profile.location">
                        <dl class="pairs pairs--justified">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-map fa-fw" data-xf-init="tooltip" title="{{ phrase('location') }}"></i> <xf:else />{{ phrase('location') }}</xf:if></dt>
                            <dd><a href="{{ link('misc/location-info', '', {'location': $user.Profile.location}) }}" rel="nofollow" target="_blank" class="u-concealed">{$user.Profile.location}</a></dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.website && $user.Profile.website">
                        <dl class="pairs pairs--justified">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-globe fa-fw" data-xf-init="tooltip" title="{{ phrase('website') }}"></i> <xf:else />{{ phrase('website') }}</xf:if></dt>
                            <dd><a href="{$user.Profile.website}" rel="nofollow" target="_blank">{$user.Profile.website|url('host', phrase('visit_site'))}</a></dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.custom_fields">
                        <xf:macro template="custom_fields_macros" name="custom_fields_values"
                            arg-type="users"
                            arg-group="personal"
                            arg-set="{$user.Profile.custom_fields}"
                            arg-additionalFilters="{{ ['message'] }}"
                            arg-valueClass="pairs pairs--justified" />
                        <xf:if is="$user.canViewIdentities()">
                            <xf:macro template="custom_fields_macros" name="custom_fields_view"
                                arg-type="users"
                                arg-group="contact"
                                arg-set="{$user.Profile.custom_fields}"
                                arg-additionalFilters="{{ ['message'] }}"
                                arg-valueClass="pairs pairs--justified" />
                        </xf:if>
                    </xf:if>
                </xf:contentcheck>
                </div>
            </xf:if>
        </xf:if>
        <span class="message-userArrow"></span>
    </section>
</xf:macro>

<xf:macro name="user_info_simple" arg-user="!" arg-fallbackName="">
    <header itemscope itemtype="https://schema.org/Person" class="message-user">
        <meta itemprop="name" content="{{ $user.username ?: $fallbackName }}">
        <div class="message-avatar">
            <div class="message-avatar-wrapper">
                <xf:avatar user="$user" size="s" defaultname="{$fallbackName}" itemprop="image" />
            </div>
        </div>
        <span class="message-userArrow"></span>
    </header>
</xf:macro>

<xf:macro name="attachments" arg-attachments="!" arg-message="!" arg-canView="!">
    <xf:if contentcheck="true">
        <xf:css src="attachments.less" />
        <section class="message-attachments">
            <h4 class="block-textHeader">{{ phrase('attachments') }}</h4>
            <ul class="attachmentList">
                <xf:contentcheck>
                    <xf:foreach loop="$attachments" value="$attachment" if="!$message.isAttachmentEmbedded($attachment)">
                        <xf:macro template="attachment_macros" name="attachment_list_item"
                            arg-attachment="{$attachment}"
                            arg-canView="{$canView}" />
                    </xf:foreach>
                </xf:contentcheck>
            </ul>
        </section>
    </xf:if>
</xf:macro>

<xf:macro name="signature" arg-user="!">
    <xf:if is="$xf.visitor.Option.content_show_signature AND $user.Profile.signature">
        <xf:if contentcheck="true">
            <aside class="message-signature">
            <xf:contentcheck>
                {{ bb_code($user.Profile.signature, 'user:signature', $user) }}
            </xf:contentcheck>
            </aside>
        </xf:if>
    </xf:if>
</xf:macro>
 
Заменить и сохранить кодом ниже.
HTML:
<xf:macro name="user_info"
          arg-user="!"
          arg-fallbackName=""
          arg-dateHtml=""
          arg-linkHtml="">

    <section itemscope itemtype="https://schema.org/Person" class="message-user">
        <div class="message-avatar {{ ($xf.options.showMessageOnlineStatus && $user && $user.isOnline()) ? 'message-avatar--online' : '' }}">
            <div class="message-avatar-wrapper">
                <xf:avatar user="$user" size="{{ property('xbMessageAvatarSize') }}" defaultname="{$fallbackName}" itemprop="image" />
                <xf:if is="$xf.options.showMessageOnlineStatus && $user && $user.isOnline()">
                    <span class="message-avatar-online" data-xf-init="tooltip" title="{{ phrase('online_now')|for_attr }}"></span>
                </xf:if>
            </div>
        </div>
        <div class="message-userDetails">
            <h4 class="message-name"><xf:username user="$user" rich="true" defaultname="{$fallbackName}" itemprop="name" /></h4>
            <xf:usertitle user="$user" tag="h5" class="message-userTitle" banner="true" itemprop="jobTitle" />
            <xf:userbanners user="$user" tag="div" class="message-userBanner" itemprop="jobTitle" />
            <xf:if is="{$dateHtml}"><div class="message-date">{$dateHtml}</div></xf:if>
        </div>
        <xf:if is="{$linkHtml}"><div class="message-permalink">{$linkHtml}</div></xf:if>
        <xf:if is="$user.user_id">
            <xf:set var="$extras" value="{{ property('messageUserElements') }}" />
            <xf:if contentcheck="true">
                <div class="message-userExtras{{ property('xbMessageUserElementsCollapse') ? ' message-userExtras-body message-userExtras--collapsible' : '' }}">
                    <xf:contentcheck>
                        <xf:if is="$extras.register_date">
                            <dl class="pairs pairs--justified">
                                <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-calendar fa-fw" data-xf-init="tooltip" title="{{ phrase('joined') }}"></i> <xf:else />{{ phrase('joined') }}</xf:if></dt>
                                <dd>{{ date($user.register_date) }}</dd>
                            </dl>
                        </xf:if>
                        <xf:if is="$extras.message_count">
                            <dl class="pairs pairs--justified pairs--xbBoxed">
                                <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-comments fa-fw" data-xf-init="tooltip" title="{{ phrase('messages') }}"></i> <xf:else />{{ phrase('messages') }}</xf:if></dt>
                                <dd>{$user.message_count|number}</dd>
                            </dl>
                        </xf:if>
                        <xf:if is="$extras.like_count">
                            <dl class="pairs pairs--justified pairs--xbBoxed">
                                <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-thumbs-up fa-fw" data-xf-init="tooltip" title="{{ phrase('likes') }}"></i> <xf:else />{{ phrase('likes') }}</xf:if></dt>
                                <dd>{$user.like_count|number}</dd>
                            </dl>
                        </xf:if>
                        <xf:if is="$extras.trophy_points && $xf.options.enableTrophies">
                            <dl class="pairs pairs--justified pairs--xbBoxed">
                                <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-trophy fa-fw" data-xf-init="tooltip" title="{{ phrase('points') }}"></i> <xf:else />{{ phrase('points') }}</xf:if></dt>
                                <dd>{$user.trophy_points|number}</dd>
                            </dl>
                        </xf:if>
                        <xf:if is="$extras.age && $user.Profile.age">
                            <dl class="pairs pairs--justified">
                                <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-birthday-cake fa-fw" data-xf-init="tooltip" title="{{ phrase('age') }}"></i> <xf:else />{{ phrase('age') }}</xf:if></dt>
                                <dd>{$user.Profile.age}</dd>
                            </dl>
                        </xf:if>
                        <xf:if is="$extras.location && $user.Profile.location">
                            <dl class="pairs pairs--justified">
                                <dt><dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-map fa-fw" data-xf-init="tooltip" title="{{ phrase('location') }}"></i> <xf:else />{{ phrase('location') }}</xf:if></dt></dt>
                            <dd>
                                <xf:if is="$xf.options.geoLocationUrl">
                                    <a href="{{ link('misc/location-info', '', {'location': $user.Profile.location}) }}" rel="nofollow noreferrer" target="_blank" class="u-concealed">{$user.Profile.location}</a>
                                    <xf:else />
                                    {$user.Profile.location}
                                </xf:if>
                            </dd>
                            </dl>
                        </xf:if>
                    <xf:if is="$extras.website && $user.Profile.website">
                        <dl class="pairs pairs--justified">
                            <dt><xf:if is="property('xbMessageUserIcons')"><i class="fa fa-globe fa-fw" data-xf-init="tooltip" title="{{ phrase('website') }}"></i> <xf:else />{{ phrase('website') }}</xf:if></dt>
                            <dd><a href="{$user.Profile.website}" rel="nofollow" target="_blank">{$user.Profile.website|url('host', phrase('visit_site'))}</a></dd>
                        </dl>
                    </xf:if>
                    <xf:if is="$extras.custom_fields">
                        <xf:macro template="custom_fields_macros" name="custom_fields_values"
                                  arg-type="users"
                                  arg-group="personal"
                                  arg-set="{$user.Profile.custom_fields}"
                                  arg-additionalFilters="{{ ['message'] }}"
                                  arg-valueClass="pairs pairs--justified" />
                        <xf:if is="$user.canViewIdentities()">
                            <xf:macro template="custom_fields_macros" name="custom_fields_view"
                                      arg-type="users"
                                      arg-group="contact"
                                      arg-set="{$user.Profile.custom_fields}"
                                      arg-additionalFilters="{{ ['message'] }}"
                                      arg-valueClass="pairs pairs--justified" />
                        </xf:if>
                    </xf:if>
                    </xf:contentcheck>
                </div>
        </xf:if>
        </xf:if>
    <span class="message-userArrow"></span>
    </section>
</xf:macro>

<xf:macro name="user_info_simple" arg-user="!" arg-fallbackName="">
    <header itemscope itemtype="https://schema.org/Person" class="message-user">
        <meta itemprop="name" content="{{ $user.username ?: $fallbackName }}">
        <div class="message-avatar">
            <div class="message-avatar-wrapper">
                <xf:avatar user="$user" size="s" defaultname="{$fallbackName}" itemprop="image" />
            </div>
        </div>
        <span class="message-userArrow"></span>
    </header>
</xf:macro>

<xf:macro name="attachments" arg-attachments="!" arg-message="!" arg-canView="!">
    <xf:if contentcheck="true">
        <xf:css src="attachments.less" />
        <section class="message-attachments">
            <h4 class="block-textHeader">{{ phrase('attachments') }}</h4>
            <ul class="attachmentList">
                <xf:contentcheck>
                    <xf:foreach loop="$attachments" value="$attachment" if="!$message.isAttachmentEmbedded($attachment)">
                        <xf:macro template="attachment_macros" name="attachment_list_item"
                                  arg-attachment="{$attachment}"
                                  arg-canView="{$canView}" />
                    </xf:foreach>
                </xf:contentcheck>
            </ul>
        </section>
    </xf:if>
</xf:macro>

<xf:macro name="signature" arg-user="!">
    <xf:if is="$xf.visitor.Option.content_show_signature AND $user.Profile.signature">
        <xf:if contentcheck="true">
            <aside class="message-signature">
                <xf:contentcheck>
                    {{ bb_code($user.Profile.signature, 'user:signature', $user) }}
                </xf:contentcheck>
            </aside>
        </xf:if>
    </xf:if>
</xf:macro>
 
  • Мне нравится
Реакции: Hope
В связи с политикой конфиденциальности были некоторые изменения в показе своих данных, в данном шаблоне местоположения.
 
В связи с политикой конфиденциальности были некоторые изменения в показе своих данных, в данном шаблоне местоположения.
Я понял,спасибо.Но я просто хотел узнать номер строк в Notepad++ ))
 
Я понял, лучше воспользуйтесь софтом для сравнения или онлайн сервисом, так будет для Вас нагляднее.
 
  • Мне нравится
Реакции: Hope
Screenshot_1dfg.png
Автообьединение не работает ... :(
 
Значит руками, вариантов нет.
 
Долго и нудно... Смотрите исходный шаблон, сравниваете с текущим и вносите необходимые изменения...
 
Добрый вечер. После обновления до XF 2.1.1 "вылезли" вот такие проблемки
101661
Это как-то самостоятельно исправимо или нужно обращаться к специалистам?
 
Современный облачный хостинг провайдер | Aéza
Назад
Сверху Снизу