Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update webasystBackendHeader.action.php #302

Open
wants to merge 3 commits into
base: dev
Choose a base branch
from
Open

Update webasystBackendHeader.action.php #302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
df01b31
Update webasystBackendHeader.action.php
Alexkurd Jan 11, 2019
a10ed89
Update BackendHeader.html
Alexkurd Jan 11, 2019
a3b1e2f
Update BackendHeader.html
Alexkurd Jan 11, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions wa-system/webasyst/lib/actions/backend/webasystBackendHeader.action.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ public function execute()
'date' => $date,
'user' => $user,
'header_items' => $this->getHeaderItems(),
'reuqest_uri' => waRequest::server('REQUEST_URI'),
'request_uri' => waRequest::server('REQUEST_URI'),
'current_app' => $current_app,
'counts' => $counts,
'wa_version' => wa()->getVersion('webasyst'),
Expand Down Expand Up @@ -155,4 +155,4 @@ protected function getHeaderItems()

return $sorted_header_items;
}
}
}
8 changes: 4 additions & 4 deletions wa-system/webasyst/templates/actions/backend/BackendHeader.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
{$_version = null}
{/if}

<li id="wa-app-{str_replace('.', '-', $_id)}" data-app="{$_id}" {if $_id == $current_app || stristr($reuqest_uri, $_item_url) !== false} class="selected"{/if}>
<li id="wa-app-{str_replace('.', '-', $_id)}" data-app="{$_id}" {if $_id == $current_app || stristr($request_uri, $_item_url) !== false} class="selected"{/if}>
{* Build app icon count *}
{$_count = null}
{if $counts && isset($counts[$_id])}
Expand Down Expand Up @@ -64,7 +64,7 @@
<div id="wa-header">
{* Account name *}
<div id="wa-account">
{if $reuqest_uri == $backend_url || $reuqest_uri == "`$backend_url`/"}
{if $request_uri == $backend_url || $request_uri == "`$backend_url`/"}
<h3 title="{$company_name}">
{$company_name|truncate:18:'...'}
<a href="{$company_url}" class="wa-frontend-link" target="_blank">
Expand Down Expand Up @@ -109,7 +109,7 @@ <h3 title="{$company_name}">{$company_name|truncate:18:'...'}</h3>
<a href="#" id="wa-moreapps"></a>
</li>
</ul>
{if $reuqest_uri == $backend_url || $reuqest_uri == "`$backend_url`/"}
{if $request_uri == $backend_url || $request_uri == "`$backend_url`/"}
<div class="d-dashboard-header-content">
<div class="d-dashboards-list-wrapper" id="d-dashboards-list-wrapper"></div>
<div class="d-dashboard-link-wrapper" id="d-dashboard-link-wrapper">
Expand All @@ -126,4 +126,4 @@ <h3 title="{$company_name}">{$company_name|truncate:18:'...'}</h3>
{* @event backend_header *}
{* $return[%app_id%]['header_bottom'] *}
{if !empty($header_bottom)}{foreach $header_bottom as $_}{$_}{/foreach}{/if}
{/strip}
{/strip}