Skip to content
Browse files

+ Fixed flickering on cufon loading.

+ Fixed a bug with the page_model when validating slugs (string being typecast to 0 and checked with == instead of ===)
  • Loading branch information...
1 parent 3d85352 commit 735821416ac6b01c1173acccbc135bd289523836 @jonnu committed with root Mar 20, 2012
View
2 mvc/modules/page/models/page_model.php
@@ -352,7 +352,7 @@ public function validate_unique_permalink($page_slug, $reference_field = 'page_p
$this->db->group_by('pn.page_id');
// If we are at the root...
- if(($via_form_validation && $this->form_validation->value($reference_field) == 0) || $reference_field == 0) {
+ if(($via_form_validation && ($this->form_validation->value($reference_field) == 0) || $reference_field === 0)) {
$this->db->having('page_depth', 0);
$this->db->where('pn.page_slug', $page_slug);
}
View
10 skins/highclare/assets/styles/page.css
@@ -16,6 +16,7 @@
.page-content h1, .page-content h2 {
font-weight: normal;
color: #991a2e;
+ visibility: hidden;
}
.page-content h2 {
@@ -24,6 +25,15 @@
margin-top: 2.0em;
}
+.page-content h1 {
+ visibility: hidden;
+}
+
+/* Display when Cufon has finished loading */
+.cufon-ready .page-content h1, .cufon-ready .page-content h2 {
+ visibility: visible;
+}
+
.page-content h3 {
}
View
4 skins/highclare/views/common/header.include.php
@@ -26,6 +26,7 @@
background: #fff url(<?php echo $this->uri->skin('assets/images/bg.body.png'); ?>) no-repeat top center;
}
+
#highclare {
min-height: 100%;
height: auto !important;
@@ -1018,9 +1019,6 @@
.calendar-dates td.name {}
-
-
-
</style>
<meta name="robots" content="noindex, nofollow">

0 comments on commit 7358214

Please sign in to comment.
Something went wrong with that request. Please try again.