diff --git a/.about.menu_ext.php b/.about.menu_ext.php new file mode 100644 index 0000000..4eb7273 --- /dev/null +++ b/.about.menu_ext.php @@ -0,0 +1,48 @@ + +$aMenuLinks = Array( + Array( + "Новости", + "/about/news/", + Array(), + Array(), + "" + ), + Array( + "Карьера", + "/about/career/", + Array(), + Array(), + "" + ), + Array( + "Контакты", + "/about/contacts/", + Array(), + Array(), + "" + ), + Array( + "Реквизиты", + "/about/requisites/", + Array(), + Array(), + "" + ), + Array( + "Прочее", + "/general-terms/", + Array(), + Array(), + "" + ), + /* + Array( + "Отзыв доверенностей", + "/revocation/", + Array(), + Array(), + "" + ), + */ +); +?> \ No newline at end of file diff --git a/.htaccess b/.htaccess index 75cfd5e..172c2a5 100644 --- a/.htaccess +++ b/.htaccess @@ -204,7 +204,14 @@ ErrorDocument 404 /404.php RewriteCond %{QUERY_STRING} ^ID=1192$ [NC] RewriteRule ^offer-detail/$ https://evoleasing.ru/special/harley-davidson-finance/fox-trailer-lizing/? [R=301,NE,NC,L] - + +RewriteCond %{REQUEST_URI} !\? +RewriteCond %{REQUEST_URI} !\& +RewriteCond %{REQUEST_URI} !\= +RewriteCond %{REQUEST_URI} !\. +RewriteCond %{REQUEST_URI} !\/$ +RewriteRule ^(.*[^\/])$ /$1/ [R=301,L] + RewriteCond %{REQUEST_FILENAME} !-f RewriteCond %{REQUEST_FILENAME} !-l RewriteCond %{REQUEST_FILENAME} !-d diff --git a/about/.left.menu_ext.php b/about/.left.menu_ext.php index 5394a46..4eb7273 100644 --- a/about/.left.menu_ext.php +++ b/about/.left.menu_ext.php @@ -30,7 +30,7 @@ $aMenuLinks = Array( ), Array( "Прочее", - "/about/rules/", + "/general-terms/", Array(), Array(), "" @@ -43,12 +43,6 @@ $aMenuLinks = Array( Array(), "" ), - Array( - "Прочее", - "/about/additional/", - Array(), - Array(), - "" - )*/ + */ ); ?> \ No newline at end of file diff --git a/general-terms/.section.php b/general-terms/.section.php deleted file mode 100644 index 23d8c11..0000000 --- a/general-terms/.section.php +++ /dev/null @@ -1,3 +0,0 @@ - -$sSectionName="general-terms"; -?> \ No newline at end of file diff --git a/general-terms/index.php b/general-terms/index.php deleted file mode 100644 index a949927..0000000 --- a/general-terms/index.php +++ /dev/null @@ -1,17 +0,0 @@ - -require($_SERVER["DOCUMENT_ROOT"]."/bitrix/header.php"); -$APPLICATION->SetTitle("Эволюция автолизинга: Общие условия договора лизинга"); -?> - - $APPLICATION->IncludeComponent( - "evolution:about.rules", - "", - Array() -); -?> -$APPLICATION->IncludeComponent( - "evolution:form.leasing", - "", -Array() -);?> - \ No newline at end of file diff --git a/local/components/evolution/about.rules/templates/.default/template.php b/local/components/evolution/about.rules/templates/.default/template.php index 2586c91..02d3d14 100644 --- a/local/components/evolution/about.rules/templates/.default/template.php +++ b/local/components/evolution/about.rules/templates/.default/template.php @@ -22,7 +22,7 @@ $this->setFrameMode(true);