From 190a765731827a2f52a58ff830470a176aabaf4d Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 17 Dec 2017 10:00:40 -0500 Subject: [PATCH] Fix Notice and formatting in frio --- view/theme/frio/php/default.php | 238 +++++++++++++++++--------------- 1 file changed, 125 insertions(+), 113 deletions(-) diff --git a/view/theme/frio/php/default.php b/view/theme/frio/php/default.php index ee71029929..768dd122f9 100644 --- a/view/theme/frio/php/default.php +++ b/view/theme/frio/php/default.php @@ -6,140 +6,152 @@ ?> - - <?php if(x($page,'title')) echo $page['title'] ?> - - - - - - - profile_uid; - if (is_null($uid)) { - $uid = get_theme_uid(); - } - $schema = PConfig::get($uid, 'frio', 'schema'); - if (($schema) && ($schema != '---')) { - if (file_exists('view/theme/frio/schema/'.$schema.'.php')) { - $schemefile = 'view/theme/frio/schema/'.$schema.'.php'; - require_once($schemefile); - } - } else { - $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); - } - if (!$nav_bg) { - $nav_bg = "#708fa0"; - } - echo ''; - ?> - - + + <?php if (x($page, 'title')) echo $page['title'] ?> + + + "; -} -else -{ - echo""; -} + $baseurl = System::baseUrl(); + $frio = "view/theme/frio"; + // Because we use minimal for modals the header and the included js stuff should be only loaded + // if the page is an standard page (so we don't have it twice for modals) + // + /// @todo Think about to move js stuff in the footer + if (!$minimal && x($page, 'htmlhead')) { + echo $page['htmlhead']; + } + // Add the theme color meta + // It makes mobile Chrome UI match Frio's top bar color. + $uid = $a->profile_uid; + if (is_null($uid)) { + $uid = get_theme_uid(); + } + $schema = PConfig::get($uid, 'frio', 'schema'); + if (($schema) && ($schema != '---')) { + if (file_exists('view/theme/frio/schema/' . $schema . '.php')) { + $schemefile = 'view/theme/frio/schema/' . $schema . '.php'; + require_once $schemefile; + } + } else { + $nav_bg = PConfig::get($uid, 'frio', 'nav_bg'); + } + if (!$nav_bg) { + $nav_bg = "#708fa0"; + } + echo ' + '; ?> -Skip to main content + + + Skip to main content -
+
+
-
-
-
- "; if(x($page,'aside')) echo $page['aside']; echo" - "; if(x($page,'right_aside')) echo $page['right_aside']; echo" + } else { + // the style for all other pages +?> +
+
+
+'; + + if (x($page, 'aside')) { + echo $page['aside']; + } + + if (x($page, 'right_aside')) { + echo $page['right_aside']; + } + + echo ' -
-
argv[0]; echo "-content-wrapper\">"; - if(x($page,'content')) echo $page['content']; echo" -
+
+
'; + if (x($page, 'content')) { + echo $page['content']; + } + echo ' +
- "; - } - else - { - echo" -
- "; if(x($page,'content')) echo $page['content']; echo" + '; + } else { + echo ' +
'; + if (x($page, 'content')) { + echo $page['content']; + } + echo '
- "; - } + '; + } ?> -
-
+
+
-
⇧
-
+
⇧
+
-
- - -
- - + + +