Skip to content

Добавил ссылку на список товаров в лого #2

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

Open
Ruslan-Aleev wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Добавил ссылку на список товаров в лого #2

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
31ce5c1
Added a link to the logo
Ruslan-Aleev Feb 14, 2021
37a1dd7
Code cleanup
Ruslan-Aleev Feb 14, 2021
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
38 changes: 19 additions & 19 deletions backend/design/html/index.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,16 +63,16 @@
{/literal}

<link href="https://fonts.googleapis.com/css?family=Open+Sans+Condensed:300,300i,700|Open+Sans:300,300i,400,400i,600,600i,700,700i,800,800i&subset=cyrillic,cyrillic-ext,latin-ext" rel="stylesheet" type="text/css">

{$ok_head}

<link rel="icon" href="design/images/favicon.png" type="image/x-icon" />

{if in_array($smarty.get.controller, array("OrdersAdmin", "PostAdmin", "ReportStatsAdmin", "CouponsAdmin", "CategoryStatsAdmin"))}
{js file="jquery/datepicker/jquery.ui.datepicker-{$manager->lang}.js" admin=true}
{js file="jquery/datepicker/jquery.datepicker.extension.range.min.js" admin=true}
{/if}

<!-- Google Tag Manager -->
{if $settings->gather_enabled}
{literal}
Expand Down Expand Up @@ -117,7 +117,7 @@
<span class="fn_switch_quickview menu_switch">
<span class="menu_hamburger"></span>
</span>
<a class="logo_box">
<a href="index.php?controller=ProductsAdmin" class="logo_box">
Copy link
Owner

@OkayCMS OkayCMS Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

PR принял, но ссылку сделал не на ProductsAdmin, а на контроллер, который для менеджера является первым (главным). По сути контроллер, который в меню стоит первым (мы же пункты меню можем перетягивать для сортировки).

Copy link
Author

@Ruslan-Aleev Ruslan-Aleev Feb 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Вашу логику понял, хотя я привязывался именно к магазину, т.е. удобнее, как мне кажется, именно "товары" открывать, даже если пункт "Товары" и не первый в меню.

<img src="design/images/logo_title.png" alt="OkayCMS"/>
</a>
</div>
Expand Down Expand Up @@ -229,7 +229,7 @@
<div class="sidebar_header">
<a href="javascript:;" id="fix_logo" class="hidden-lg-down"></a>

<a class="logo_box">
<a href="index.php?controller=ProductsAdmin" class="logo_box">
<img src="design/images/logo_title.png" alt="OkayCMS"/>
</a>
{if $is_mobile === false && $is_tablet === false}
Expand Down Expand Up @@ -461,7 +461,7 @@
}

{/if}

/* Initializing the scrollbar */
if($('.scrollbar-inner').size()>0){
$('.scrollbar-inner').scrollbar({
Expand Down Expand Up @@ -497,7 +497,7 @@

if($('form.fn_fast_button').size()>0){
{literal}

// Связка селектов массовых действий
$(document).on('change', '.fn_action_block:not(.fn_fast_action_block) select', function(e, trigger) {
if (!trigger) {
Expand All @@ -506,7 +506,7 @@
$('.fn_fast_save select[name="' + name + '"]').val(selected).trigger('change', {trigger: true});
}
});

$(document).on('change', '.fn_fast_save select', function(e, trigger) {
if (!trigger) {
var name = $(this).attr('name'),
Expand All @@ -515,7 +515,7 @@
}
});
{/literal}

if ($('.fn_action_block').size()>0) {
var action_block = $('.okay_list_option').clone(true);
$('.fn_fast_action_block .action').html(action_block);
Expand All @@ -524,7 +524,7 @@
$('.fn_fast_action_block .additional_params').html(additional_params);
}
}

$('input,textarea,select, .dropdown-toggle, .fn_sort_item, .fn_category_item').bind('keyup change dragover',function(){
$('.fn_fast_save').show();
});
Expand Down Expand Up @@ -639,7 +639,7 @@
save_menu();
}
});

if($(".fn_sort_menu_item").size()>0) {
$(".fn_sort_menu_item").each(function() {
Sortable.create(this, {
Expand All @@ -655,7 +655,7 @@
});
});
}

function save_menu() {
$.ajax({
type: "POST",
Expand All @@ -680,7 +680,7 @@
dragClass: "sortable-drag", // Class name for the dragging item
scrollSensitivity: 100, // px, how near the mouse must be to an edge to start scrolling.
scrollSpeed: 10, // px

// Changed sorting within list
onUpdate: function (evt) {
if ($(".product_images_list").size() > 0) {
Expand All @@ -697,10 +697,10 @@
}

if($(".sort_extended").size()>0) {

/*Явно указываем высоту списка, иначе когда скрипт удаляет элемент и ставит на его место заглушку, страница подпрыгивает*/
$(".fn_sort_list").css('min-height', $(".fn_sort_list").outerHeight());

$(".sort_extended").sortable({
items: ".fn_sort_item",
tolerance: "pointer",
Expand Down Expand Up @@ -744,7 +744,7 @@
}
});
}

$(".fn_pagination a.droppable").droppable({
activeClass: "drop_active",
hoverClass: "drop_hover",
Expand All @@ -757,7 +757,7 @@
return false;
}
});

/* Call an ajax entity update */
if($(".fn_ajax_action").size()>0){
$(document).on("click",".fn_ajax_action",function () {
Expand Down Expand Up @@ -979,7 +979,7 @@

function generate_meta_keywords() {
let result = $('input[name="name"]').val();

if ($(".fn_meta_brand").size() > 0) {
let brand = $('select[name="brand_id"] option:selected').data('brand_name');
if (typeof(brand) == 'string' && brand != '')
Expand Down Expand Up @@ -1065,7 +1065,7 @@
cur_nav.children().removeClass('selected');
cur_nav.children('[href="#{$smarty.get.active_tab|escape}"]').addClass('selected');
{/if}

if (cur_nav.children('.selected').size() > 0) {
cur_tab = $(cur_nav.children('.selected').attr("href"));
} else {
Expand Down