Commit: 0be538e29eadc7b4072aa4d6cfef478294562271 Author: Peter Cowburn <[email protected]> Sun, 8 Jun 2014 15:55:37 +0100 Parents: 00f64e937bc4e1adb6de4fc9c8f4a26c061863b0 Branches: master
Link: http://git.php.net/?p=web/people.git;a=commitdiff;h=0be538e29eadc7b4072aa4d6cfef478294562271 Log: layout revamp Changed paths: M include/layout.php M user.php Diff: diff --git a/include/layout.php b/include/layout.php index d981241..25268db 100644 --- a/include/layout.php +++ b/include/layout.php @@ -11,8 +11,6 @@ function site_header($TITLE) { $CSS[] = "/styles/people.css"; $SEARCH = array("method" => "get", "action" => "user.php", "placeholder" => "Search profiles", "name" => "username"); include dirname(__FILE__) . "/../shared/templates/header.inc"; - //echo '<div><!-- dummy element to get around section.mainscreen:only-child CSS --></div>'; - echo '<section class="mainscreen">'; } function site_footer($config = array()) { @@ -21,7 +19,6 @@ function site_footer($config = array()) { "//people.php.net/js/userlisting.php", "//people.php.net/js/search.js", ); - echo '</section>'; if (isset($config["SIDEBAR"])) { $SECONDSCREEN = $config["SIDEBAR"]; } diff --git a/user.php b/user.php index 59bfad0..de069a5 100644 --- a/user.php +++ b/user.php @@ -15,72 +15,72 @@ $BUGS = findAssignedBugs($USERNAME); $email = $NFO["username"].'@php.net'; $gravatar = "//www.gravatar.com/avatar/" . md5($email) . ".jpg?s=460"; ?> +<section class="mainscreen"> + <div class="profile-main"> + <div class="profile-name"> + <h1 property="foaf:name"><?php echo $NFO["name"] ?></h1> + <h2 property="foaf:nick"><?php echo $NFO["username"]?></h2> + </div> -<div class="container"> -<div about="#me" typeof="foaf:Person" id="profile" class="columns"> -<div class="profile-side column"> - <div rel="foaf:img"> - <img rel="foaf:img" src="<?php echo $gravatar ?>" - alt="Picture of <?php echo $NFO["name"] ?>" - height="180" width="180" /> - </div> -</div> -<div class="profile-main column"> - - <div class="profile-name"> - <h1 property="foaf:name"><?php echo $NFO["name"] ?></h1> - <h2 property="foaf:nick"><?php echo $NFO["username"]?></h2> - </div> - - <h2 id="contact">Contact:</h2> - <p class="nudge"><a rel="foaf:mbox" href="mailto:<?php echo $email ?>"><?php echo $email ?></a></p> + <?php if ($PROFILE) { ?> + <h2 id="blurb">About</h2> + <div class="nudge blurb"> + <?php echo $PROFILE; ?> + </div> + <?php } ?> -<?php if ($PROFILE) { ?> - <h2 id="blurb">About:</h2> - <div class="nudge blurb"> - <?php echo $PROFILE; ?> - </div> -<?php } ?> + <?php if ($KARMA) { ?> + <?php $KARMA = formatKarma($KARMA); ?> + <h2 id="karma">Karma</h2> + <ul> + <?php if (count($KARMA) > 0) { ?> + <?php foreach ($KARMA as $path) { ?> + <li><?php echo $path ?></li> + <?php } ?> + <?php } ?> + </ul> + <?php } ?> -<?php if ($KARMA) { ?> - <?php $KARMA = formatKarma($KARMA); ?> - <h2 id="karma">Karma:</h2> - <ul> - <?php if (count($KARMA) > 0) { ?> - <?php foreach ($KARMA as $path) { ?> - <li><?php echo $path ?></li> + <?php if ($BUGS) { ?> + <h2 id="bugs">Assigned (open) bugs</h2> + <ul> + <?php foreach ($BUGS as $bug) { ?> + <li><a href="<?php echo $bug["link"]?>"><?php echo $bug["title"] ?></a></li> <?php } ?> + </ul> <?php } ?> - </ul> -<?php } ?> -<?php if ($BUGS) { ?> - <h2 id="bugs">Assigned (open) bugs:</h2> - <ul> - <?php foreach ($BUGS as $bug) { ?> - <li><a href="<?php echo $bug["link"]?>"><?php echo $bug["title"] ?></a></li> + <?php if (!empty($NFO["notes"])) { ?> + <h2 id="notes">Notes</h2> + <?php foreach($NFO["notes"] as $note) { ?> + <div class="note"> + <?php echo $note["entered"] ?>: + <?php echo htmlspecialchars($note["note"], ENT_QUOTES, 'UTF-8'); ?> + </div> + <?php } ?> <?php } ?> - </ul> -<?php } ?> + </div> +</section> -<?php if (!empty($NFO["notes"])) { ?> - <h2 id="notes">Notes:</h2> - <?php foreach($NFO["notes"] as $note) { ?> - <div class="note"> - <?php echo $note["entered"] ?>: - <?php echo htmlspecialchars($note["note"], ENT_QUOTES, 'UTF-8'); ?> +<section class="secondscreen"> + <div class="profile-side"> + <div rel="foaf:img"> + <img rel="foaf:img" src="<?php echo $gravatar ?>" + alt="Picture of <?php echo $NFO["name"] ?>" + height="230" width="230" /> + </div> + <ul class="profile-details"> + <li><span class="icon-mail"></span> <?php echo $email ?></li> + <?php if (is_array($BUGS)) { ?> + <li><span class="icon-bug"></span> <?php echo number_format(count($BUGS)) ?> open bugs assigned</li> + <?php } ?> + <li><span class="icon-edit"></span> <a href="https://master.php.net/manage/users.php?username=<?php echo urlencode($USERNAME) ?>">edit on master</a></li> + </ul> </div> - <?php } ?> -<?php } ?> -</div> -</div> +</section> + <?php -$SIDEBAR = <<< SIDEBAR - <p class="panel"> - <a href="https://master.php.net/manage/users.php?username=$USERNAME";>Edit $USERNAME on master</a> - </p> -SIDEBAR; +site_footer(); -site_footer(array("SIDEBAR" => $SIDEBAR)); // vim: set expandtab shiftwidth=4 softtabstop=4 tabstop=4 : -- PHP Webmaster List Mailing List (http://www.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php
