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

Resolve dashboard design issues #412

Merged
merged 1 commit into from
Nov 10, 2022
Merged

Resolve dashboard design issues #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion modules/dashavailability/views/css/dashavailability.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
border-radius: 5px !important;
font-weight: bold !important;
color: #00AFF0;
padding: 0 14px;
text-align: center;
width: 100%;
}

Expand Down
Binary file added modules/dashguestcycle/logo.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/dashguestcycle/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
1 change: 0 additions & 1 deletion modules/dashperformance/dashperformance.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@ public function install()
public function hookActionAdminControllerSetMedia()
{
if (get_class($this->context->controller) == 'AdminDashboardController') {
$this->context->controller->addJs($this->_path.'views/js/'.$this->name.'.js');
$this->context->controller->addCSS($this->_path.'views/css/'.$this->name.'.css');
}
}
Expand Down
Binary file added modules/dashperformance/logo.gif
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added modules/dashperformance/logo.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
23 changes: 6 additions & 17 deletions modules/dashperformance/views/templates/hook/dashboard_zone_two.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
<header class="panel-heading">
<i class="icon-bar-chart"></i> {l s="Performance" mod="dashperformance"}
<span class="panel-heading-action">
<a class="list-toolbar-btn" href="#"
onclick="refreshDashboard('dashperformance'); return false;"
title="{l s="Refresh" mod="dashperformance"}">
<a class="list-toolbar-btn" href="#" onclick="refreshDashboard('dashperformance'); return false;" title="{l s="Refresh" mod="dashperformance"}">
<i class="process-icon-refresh"></i>
</a>
</span>
Expand All @@ -34,9 +32,7 @@
<div class="col-xs-6 col-lg-3">
<div class="avg-daily-rate preformance-index-wrapper label-tooltip" data-toggle="tooltip" data-original-title="{l s="The Average Daily Rate represents the average rental income per paid occupied room over a given time period." mod="dashperformance"}" data-placement="top">
<div class="title-wrapper">
<p>
{l s="Avg. Daily Rate" mod="dashperformance"}
</p>
<p>{l s="Avg. Daily Rate" mod="dashperformance"}</p>
</div>
<div class="value-wrapper" id="dp_average_daily_rate" style="color: #0093BA">
{if isset($average_daily_rate)}{$average_daily_rate|escape:"html":"UTF-8"}{/if}
Expand All @@ -45,11 +41,8 @@
</div>
<div class="col-xs-6 col-lg-3">
<div class="circle cancellation-rate preformance-index-wrapper label-tooltip" data-toggle="tooltip" data-original-title="{l s="The Cancellation Rate is a percentage of all cancelled orders out of all orders over a given time period." mod="dashperformance"}" data-placement="top">

<div class="title-wrapper">
<p>
{l s="Cancellation Rate" mod="dashperformance"}
</p>
<p>{l s="Cancellation Rate" mod="dashperformance"}</p>
</div>
<div class="value-wrapper" id="dp_cancellation_rate" style="color: #FF4036">
{if isset($cancellation_rate)}{$cancellation_rate|escape:"html":"UTF-8"}{/if}
Expand All @@ -59,9 +52,7 @@
<div class="col-xs-6 col-lg-3">
<div class="circle revenue preformance-index-wrapper label-tooltip" data-toggle="tooltip" data-original-title="{l s="The Revenue is the total amount of income generated by the sale of rooms." mod="dashperformance"}" data-placement="top">
<div class="title-wrapper">
<p>
{l s="Revenue" mod="dashperformance"}
</p>
<p>{l s="Revenue" mod="dashperformance"}</p>
</div>
<div class="value-wrapper" id="dp_revenue" style="color: #00B200">
{if isset($revenue)}{$revenue|escape:"html":"UTF-8"}{/if}
Expand All @@ -71,9 +62,7 @@
<div class="col-xs-6 col-lg-3">
<div class="circle nights-stayed preformance-index-wrapper label-tooltip" data-toggle="tooltip" data-original-title="{l s="The Nights Stayed is the total number of nights guests occupied over a given time period." mod="dashperformance"}" data-placement="top">
<div class="title-wrapper">
<p>
{l s="Nights Stayed" mod="dashperformance"}
</p>
<p>{l s="Nights Stayed" mod="dashperformance"}</p>
</div>
<div class="value-wrapper" id="dp_nights_stayed" style="color: #E09400">
{if isset($nights_stayed)}{$nights_stayed|escape:"html":"UTF-8"}{/if}
Expand All @@ -84,4 +73,4 @@
</section>
</section>
</div>
<div class="clearfix"></div>
<div class="clearfix"></div>
2 changes: 1 addition & 1 deletion modules/dashproducts/views/templates/hook/dashboard_zone_two.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@
<ul class="nav nav-pills row">
<li class="col-xs-6 col-sm-3 nav-item active">
<a href="#dash_recent_orders" data-toggle="tab">
<span>{l s="Recent Bookings" mod="dashproducts"}</span>
<span>{l s="New Bookings" mod="dashproducts"}</span>
</a>
</li>
<li class="col-xs-6 col-sm-3 nav-item">
Expand Down
1 change: 1 addition & 0 deletions modules/dashtrends/dashtrends.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ public function hookDashboardZoneTwo($params)
'currency' => $this->context->currency,
'_PS_PRICE_DISPLAY_PRECISION_' => _PS_PRICE_DISPLAY_PRECISION_,
));

return $this->display(__FILE__, 'dashboard_zone_two.tpl');
}

Expand Down
4 changes: 2 additions & 2 deletions ...es/hotelreservationsystem/views/templates/admin/hotel_rooms_booking/helpers/view/view.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
</div>
<div class="col-sm-8">
<div class="row margin-lr-0 box-border calender-main-div">
<div class="hotel_date col-sm-7">
<div class="hotel_date col-sm-12 col-md-7">
<div class="row margin-leftrgt-0">
<div class="col-sm-12 htl_date_header">
<div class="col-sm-3">
Expand All @@ -92,7 +92,7 @@
</div>
</div>

<div class="col-sm-5 htl_room_data_cont">
<div class="col-sm-12 col-md-5 htl_room_data_cont">
<div class="row">
<div class="col-sm-6">
<div class="row">
Expand Down