mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-12 16:14:28 +02:00
Code Issues Releases Wiki Activity

upd

Browse Source
This commit is contained in:
Awilum
2013-01-20 17:33:55 +02:00
parent 5315020c1e
commit 878aa46457
3 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/box/themes/themes.plugin.php
View File

@@ -179,7 +179,7 @@ class Chunk
if ( ! file_exists(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $name . '.chunk.php') or if ( ! file_exists(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $name . '.chunk.php') or
filemtime(THEMES_SITE . DS . $current_theme . DS . $name .'.chunk.php') > filemtime(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $name . '.chunk.php')) { filemtime(THEMES_SITE . DS . $current_theme . DS . $name .'.chunk.php') > filemtime(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $name . '.chunk.php')) {
file_put_contents(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $name . '.chunk.php', file_put_contents(MINIFY . DS . 'theme.' . $current_theme . '.minify.' . $name . '.chunk.php',
Minify::html(file_get_contents(THEMES_SITE. DS . $current_theme . DS . $name .'.chunk.php'))); MinifyHTML::process(file_get_contents(THEMES_SITE. DS . $current_theme . DS . $name .'.chunk.php')));
} }
// Include chunk // Include chunk

1
plugins/box/users/users.plugin.php
View File

@@ -303,7 +303,6 @@ class Users extends Frontend
->render()); ->render());
$mail->Send(); $mail->Send();
// Set notification // Set notification
Notification::set('success', __('New password has been sent', 'users')); Notification::set('success', __('New password has been sent', 'users'));

19
plugins/box/users/views/emails/layout_email.view.php
View File

@@ -48,7 +48,7 @@
Remember: Hotmail does not support "margin" nor the "margin-top" properties. Remember: Hotmail does not support "margin" nor the "margin-top" properties.
Stick to "margin-bottom", "margin-left", "margin-right" in order to control spacing. Stick to "margin-bottom", "margin-left", "margin-right" in order to control spacing.
It also wise to set the inline top-margin to "0" for consistancy in Gmail for every inline instance It also wise to set the inline top-margin to "0" for consistancy in Gmail for every inline instance
of a paragraph tag. */ of a paragraph tag. */
p {margin:0; padding:0; margin-bottom:0;} p {margin:0; padding:0; margin-bottom:0;}
/* This CSS will overwrite Hotmails default CSS and make your headings appear consistant with Gmail. /* This CSS will overwrite Hotmails default CSS and make your headings appear consistant with Gmail.
@@ -87,10 +87,9 @@
a[href^="tel"], a[href^="sms"] {text-decoration:none; color:#333333; pointer-events:none; cursor:default;} a[href^="tel"], a[href^="sms"] {text-decoration:none; color:#333333; pointer-events:none; cursor:default;}
.mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {text-decoration:default; color:#6e5c4f !important; pointer-events:auto; cursor:default;} .mobile_link a[href^="tel"], .mobile_link a[href^="sms"] {text-decoration:default; color:#6e5c4f !important; pointer-events:auto; cursor:default;}
/****** MEDIA QUERIES ********/ /****** MEDIA QUERIES ********/
/* You must use attribute selectors in your media queries to prevent Yahoo from rendering these styles. /* You must use attribute selectors in your media queries to prevent Yahoo from rendering these styles.
We added a yahoo attribute in the body tag to complete this fix. We added a yahoo attribute in the body tag to complete this fix.
More info: http://www.emailonacid.com/blog/details/C13/stop_yahoo_mail_from_rendering_your_media_queries */ More info: http://www.emailonacid.com/blog/details/C13/stop_yahoo_mail_from_rendering_your_media_queries */
/* Target mobile devices. */ /* Target mobile devices. */
@@ -123,10 +122,8 @@
} }
/*** END EDITABLE STYLES ***/ /*** END EDITABLE STYLES ***/
/****** TEMPORARY - THESE SHOULD BE MOVED INLINE AT END OF YOUR DEVELOPMENT PROCESS ********/ /****** TEMPORARY - THESE SHOULD BE MOVED INLINE AT END OF YOUR DEVELOPMENT PROCESS ********/
h1 {font-size:26px; line-height:1.2; font-weight:normal; margin-top:0; margin-bottom:0;} h1 {font-size:26px; line-height:1.2; font-weight:normal; margin-top:0; margin-bottom:0;}
@@ -141,10 +138,8 @@
/*** END TEMPORARY ***/ /*** END TEMPORARY ***/
</style> </style>
</head> </head>
<body style="width:100% !important; color:#333333; background:#FBFBFB; font-family:Arial,Helvetica,sans-serif; font-size:13px; line-height:1.4;" <body style="width:100% !important; color:#333333; background:#FBFBFB; font-family:Arial,Helvetica,sans-serif; font-size:13px; line-height:1.4;"
alink="#9d470a" link="#9d470a" bgcolor="#FBFBFB" text="#333333" yahoo="fix"> alink="#9d470a" link="#9d470a" bgcolor="#FBFBFB" text="#333333" yahoo="fix">
<!-- You may adjust each of the values above for your template as needed. <!-- You may adjust each of the values above for your template as needed.
@@ -153,15 +148,15 @@ We've included the style attribute for Gmail because it does not support embedde
a div. Since it gets converted to a div, the other body attributes like bgcolor are ignored. a div. Since it gets converted to a div, the other body attributes like bgcolor are ignored.
We included body attributes (alink, link, bgcolor and text) for Lotus Notes 6.5 and 7, as these clients do not offer much We included body attributes (alink, link, bgcolor and text) for Lotus Notes 6.5 and 7, as these clients do not offer much
support for embedded nor inline CSS. support for embedded nor inline CSS.
The "min-height" attribute is set for Gmail and AOL since they will be converting this body tag to a div and we want our The "min-height" attribute is set for Gmail and AOL since they will be converting this body tag to a div and we want our
background color to reach the bottom of the page. background color to reach the bottom of the page.
The yahoo attribute is added if you are using media queries for mobile devices (see media queries above) --> The yahoo attribute is added if you are using media queries for mobile devices (see media queries above) -->
<!-- PAGE WRAPPER --> <!-- PAGE WRAPPER -->
<div id="body_style"> <div id="body_style">
<!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. --> <!-- Wrapper/Container Table: Use a wrapper table to control the width and the background color consistently of your email. Use this approach instead of setting attributes on the body tag. -->
@@ -223,4 +218,4 @@ The yahoo attribute is added if you are using media queries for mobile devices (
<!-- End of wrapper table --> <!-- End of wrapper table -->
</div> </div>
</body> </body>
</html> </html>