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

Jump to bottom

TPROD-196: Updated the image references to pick from the right place. #2

Closed
wants to merge 2 commits into from
Closed

TPROD-196: Updated the image references to pick from the right place. #2

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf0d4f6
TPROD-196: Updated the images refereces to pick from the right place.
shinde-rahul Apr 4, 2021
ef9eb9c
Reverting to the original media/images* ignore setup.
shinde-rahul Apr 13, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
16 changes: 8 additions & 8 deletions assets/scaffold/files/example.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,14 +69,14 @@
/media/files/*
!/media/files/.htaccess
/media/assets/*
/media/images/*
!/media/images/flags
!/media/images/mejs
!/media/images/apple-touch-icon.png
!/media/images/avatar.png
!/media/images/favicon.ico
!/media/images/mautic_logo*
!/media/images/.htaccess
/app/assets/images/*
!/app/assets/images/flags
!/app/assets/images/mejs
!/app/assets/images/apple-touch-icon.png
!/app/assets/images/avatar.png
!/app/assets/images/favicon.ico
!/app/assets/images/mautic_logo*
!/app/assets/images/.htaccess
Copy link
Collaborator

Choose a reason for hiding this comment

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

If we're not deleting those files yet - for sake of testing I would leave the media/images in the example gitignore. Also, the assets from app/assets are totally fine to commit, as those won't change by the user.So I think this entire gitignore change is not needed.


/plugins/*
!/plugins/index.html
Expand Down
2 changes: 1 addition & 1 deletion bundles/CoreBundle/Controller/CommonController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -680,7 +680,7 @@ public function addBrowserNotification($message, $messageVars = [], $domain = 'f
}

if (null == $icon) {
$icon = 'media/images/favicon.ico';
$icon = 'app/assets/images/favicon.ico';
}

if (0 !== strpos($icon, 'http')) {
Expand Down
6 changes: 3 additions & 3 deletions bundles/CoreBundle/Views/Default/head.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<?php echo $view['slots']->get('pageTitle', 'Mautic'); ?>
</title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="icon" type="image/x-icon" href="<?php echo $view['assets']->getUrl('media/images/favicon.ico'); ?>" />
<link rel="icon" sizes="192x192" href="<?php echo $view['assets']->getUrl('media/images/favicon.ico'); ?>">
<link rel="apple-touch-icon" href="<?php echo $view['assets']->getUrl('media/images/apple-touch-icon.png'); ?>" />
<link rel="icon" type="image/x-icon" href="<?php echo $view['assets']->getUrl('app/assets/images/favicon.ico'); ?>" />
<link rel="icon" sizes="192x192" href="<?php echo $view['assets']->getUrl('app/assets/images/favicon.ico'); ?>">
<link rel="apple-touch-icon" href="<?php echo $view['assets']->getUrl('app/assets/images/apple-touch-icon.png'); ?>" />

<?php echo $view['assets']->outputSystemStylesheets(); ?>

Expand Down
8 changes: 4 additions & 4 deletions bundles/NotificationBundle/Views/Popup/index.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<meta charset="UTF-8" />
<title><?php echo $view['slots']->get('pageTitle', 'Mautic'); ?></title>
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="icon" type="image/x-icon" href="<?php echo $view['assets']->getUrl('media/images/favicon.ico'); ?>" />
<link rel="icon" sizes="192x192" href="<?php echo $view['assets']->getUrl('media/images/favicon.ico'); ?>">
<link rel="apple-touch-icon" href="<?php echo $view['assets']->getUrl('media/images/apple-touch-icon.png'); ?>" />
<link rel="icon" type="image/x-icon" href="<?php echo $view['assets']->getUrl('app/assets/images/favicon.ico'); ?>" />
<link rel="icon" sizes="192x192" href="<?php echo $view['assets']->getUrl('app/assets/images/favicon.ico'); ?>">
<link rel="apple-touch-icon" href="<?php echo $view['assets']->getUrl('app/assets/images/apple-touch-icon.png'); ?>" />

<?php echo $view['assets']->outputStyles(); ?>
<script src="/app/bundles/NotificationBundle/Assets/js/popup/usparser.min.js" type="text/javascript"></script>
Expand Down Expand Up @@ -211,4 +211,4 @@ function showError(error) {
document.getElementById(error).style.display = "block";
}
</script>
</body></html>
</body></html>
Copy link
Collaborator

Choose a reason for hiding this comment

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

This change seems unnecessary

Copy link
Contributor Author

Choose a reason for hiding this comment

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

The new line character added at the end of the file.

4 changes: 2 additions & 2 deletions bundles/PageBundle/Controller/PublicController.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,12 +551,12 @@ private function processSlots($slots, $entity)
$options['slides'] = [
[
'order' => 0,
'background-image' => $assetsHelper->getUrl('media/images/mautic_logo_lb200.png'),
'background-image' => $assetsHelper->getUrl('app/assets/images/mautic_logo_lb200.png'),
'captionheader' => 'Caption 1',
],
[
'order' => 1,
'background-image' => $assetsHelper->getUrl('media/images/mautic_logo_db200.png'),
'background-image' => $assetsHelper->getUrl('app/assets/images/mautic_logo_db200.png'),
'captionheader' => 'Caption 2',
],
];
Expand Down
4 changes: 2 additions & 2 deletions bundles/UserBundle/Views/Security/base.html.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<title><?php echo $view['slots']->get('pageTitle', 'Mautic'); ?></title>
<meta name="robots" content="noindex, nofollow" />
<meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
<link rel="icon" type="image/x-icon" href="<?php echo $view['assets']->getUrl('media/images/favicon.ico'); ?>" />
<link rel="apple-touch-icon" href="<?php echo $view['assets']->getUrl('media/images/apple-touch-icon.png'); ?>" />
<link rel="icon" type="image/x-icon" href="<?php echo $view['assets']->getUrl('app/assets/images/favicon.ico'); ?>" />
<link rel="apple-touch-icon" href="<?php echo $view['assets']->getUrl('app/assets/images/apple-touch-icon.png'); ?>" />
<?php $view['assets']->outputSystemStylesheets(); ?>
<?php echo $view->render('MauticCoreBundle:Default:script.html.php'); ?>
<?php $view['assets']->outputHeadDeclarations(); ?>
Expand Down