Skip to content

Commit

Permalink
Fix merge gone wrong by overwriting master with copy of branch 'rwd'
Browse files Browse the repository at this point in the history
  • Loading branch information
Kent Heiner committed Apr 27, 2019
1 parent 059bbfb commit f82d50f
Show file tree
Hide file tree
Showing 8 changed files with 162 additions and 137 deletions.
28 changes: 11 additions & 17 deletions elemFooter.php
View file
Original file line number Diff line number Diff line change
@@ -1,24 +1,18 @@
<?php
//A footer for consistent look and feel sitewide
?>
<!-- shift it to the right by 250 pixels when the sidebar is visible -->
<div class="w3-main" style="margin-left:250px">
<footer id="myFooter">
<div class="w3-container w3-theme-l2 w3-padding-32">
<h4>Footer</h4>
</div>

<table class="footer">
<tbody>
<tr>
<td>
<ul class="footer">
<li class="footer"><a class="footer_item" href="http://en.wikipedia.org/wiki/Main_Page">Donate here:</a></li>
<li class="footer"><a class="footer_item" href="http://en.wikipedia.org/wiki/Main_Page">Wikipedia</a></li>
</ul>
</td>
</tr>
</tbody>
</table>


<table class="crawler"><tbody><tr><td> </td><td><span style="font-weight: bold;">Help yourself:</span>
Remind yourself to take regular breaks from browsing
using a free plug-in from&nbsp;<a href="http://www.stretchclock.com/"><img src="images/stretchclock-logo-dark-cropped.png" alt="StretchClock.com"></a> </td><td></td></tr></tbody></table>
<div class="w3-container w3-theme-l1">
<p><a href="https://github.com/ke7ijo/Hydrogen" target="_blank">Hydrogen</a> powered</p>
</div>
</footer>
</div>



29 changes: 8 additions & 21 deletions elemLoginStatusbar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,40 +15,27 @@ function showLoginStatus() {
if (isset($_SESSION['username'])) {
showUsername();
} else {
echo ('<a href="' . $settings['login_page'] . '" class="statusbar_item">Log in</a>');
echo ('<a href="' . $settings['login_page'] . '" class="w3-bar-item w3-button w3-hover-white">Log in</a>');
}
}

function showUsername() {
echo ('<div class="loginStatus">Logged in as ' . $_SESSION['username'] . "</div> ");
echo ('<a href="#" class="w3-bar-item w3-button w3-medium w3-hide-small w3-hover-white">Logged in as ' . $_SESSION['username'] . "</a>");
}

function showLogoutButton() {
global $settings;
echo (' <li class="statusbar"><form class="access" id="logout" action="' . $settings['login_page'] . '" method="post">');
echo (' <span class="w3-bar-item w3-button w3-medium"><form id="logout" action="' . $settings['login_page'] . '" method="post">');
echo (' <input type="hidden" name="flow" value="logOut">');
echo (' <input type="submit" value="Log out">');
echo (' </form></li>');
echo (' </form></span>');
}

?>

<table class="statusbar">
<tbody>
<tr>
<td>
<ul class="statusbar">
<li class="statusbar">
<?php showLoginStatus() ?>
</li>

<?php if (isset($_SESSION['username'])) {
<?php
showLoginStatus();
if (isset($_SESSION['username'])) {
showLogoutButton() ;
}
?>

</ul>
</td>
</tr>
</tbody>
</table>
?>
28 changes: 7 additions & 21 deletions elemLogoHeadline.php
View file
Original file line number Diff line number Diff line change
@@ -1,30 +1,16 @@
<?php

//$logo_image = "/images/logo.jpg";
//$headline = "My Page"

?>
<table>
<tbody>
<tr>
<td>
<?php
<div class="w3-row w3-padding-64">

<?php
if (isset($logo_image)) {

echo '<div id="logo"><img style="width: 120px; height: 120px;" alt="mem" src="' . $logo_image .'"></div>';
echo '<div class="w3-third w3-container w3-hide-medium w3-hide-small"><p class="w3-padding-large w3-padding-32 w3-center "><img src="' . $logo_image .'"></p></div>';
}
?>

</td>
<td>

<?php
<?php
if (isset($headline)) {
echo $headline;
echo '<div class="w3-third w3-container"><p class="w3-padding-large w3-padding-32 w3-center">'. $headline .'</div>';
}
?>

</td>
</tr>
</tbody>
</table>
</div>
15 changes: 15 additions & 0 deletions elemNavbar.php
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<!-- Navbar -->
<div class="w3-top">
<div class="w3-bar w3-theme w3-top w3-left-align w3-large">
<a class="w3-bar-item w3-button w3-right w3-hide-large w3-hover-white w3-large w3-theme-l1" href="javascript:void(0)" onclick="w3_open()"><i class="fa fa-bars"></i></a>
<a href="#" class="w3-bar-item w3-button w3-theme-l1">Logo</a>
<a href="./" class="w3-bar-item w3-button w3-hide-small w3-hover-white">Home</a>
<a href="#" class="w3-bar-item w3-button w3-hide-small w3-hover-white">About</a>
<a href="#" class="w3-bar-item w3-button w3-hide-small w3-hover-white">News</a>
<a href="#" class="w3-bar-item w3-button w3-hide-small w3-hover-white">Contact</a>
<?php
include('Hydrogen/elemSearchForm.php');
include('Hydrogen/elemLoginStatusbar.php');
?>
</div>
</div>
9 changes: 3 additions & 6 deletions elemSearchForm.php
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
<td><ul class="menubar" id="searchform">
<li class="menubar">
<form action="search.php">
<span class="w3-bar-item w3-button w3-medium w3-hide-small">
<form action="search.php">
<input type="text" name="q" >
<input type="submit" value="Search">
</form>
</li>
</ul>
</td>
</span>
66 changes: 37 additions & 29 deletions elemSidebar.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,38 +3,46 @@
//$facebook_page = "https://www.facebook.com/pages/MyPageName/1234567890";
?>

<div id="sidebar">
<!-- Sidebar -->
<nav class="w3-sidebar w3-bar-block w3-collapse w3-large w3-theme-l5 w3-animate-left" id="mySidebar">
<a href="javascript:void(0)" onclick="w3_close()" class="w3-right w3-xlarge w3-padding-large w3-hover-black w3-hide-large" title="Close Menu">
<i class="fa fa-remove"></i>
</a>
<h4 class="w3-bar-item"><b>Menu</b></h4>
<a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
<a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
<a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
<a class="w3-bar-item w3-button w3-hover-black" href="#">Link</a>
<?php if (isset($facebook_page)) {
echo ('<a target="_blank" class="w3-bar-item w3-button w3-hover-black" href="' . $facebook_page . '"><img src="/images/facebook.jpg" alt="Facebook" height="90" width="90"></a>');
}
?>
</nav>

<div class="sidebar_item" id="sidebar_item0">
<div class="desc"><a href="/page1.php">Home</a>
</div>
</div>
<div class="sidebar_item" id="sidebar_item1">
<div class="desc"><a href="/page1.php">Page One</a>
</div>
</div>
<!-- Overlay effect when opening sidebar on small screens -->
<div class="w3-overlay w3-hide-large" onclick="w3_close()" style="cursor:pointer" title="close side menu" id="myOverlay"></div>

<div class="sidebar_item" id="sidebar_item2">
<div class="desc"><a href="/page2.php">Page Two</a>
</div>
</div>
<script>
// Get the Sidebar
var mySidebar = document.getElementById("mySidebar");

<div class="sidebar_item" id="sidebar_item3">
<div class="desc"><a href="/page3.php">Page Three</a>
</div>
</div>
// Get the DIV with overlay effect
var overlayBg = document.getElementById("myOverlay");

<?php
if (isset($facebook_page)) {
echo ('<div class="sidebar_item" id="Facebook">');
echo ('<a target="_blank" href="' . $facebook_page . '">');
echo ('<img src="/images/facebook.jpg" alt="Facebook" height="90" width="90"></a>');
echo ('<div class="desc">Follow us on <br>');
echo ('<a href="' . $facebook_page . '">Facebook');
echo ('</a></div>');
echo ('</div>');
// Toggle between showing and hiding the sidebar, and add overlay effect
function w3_open() {
if (mySidebar.style.display === 'block') {
mySidebar.style.display = 'none';
overlayBg.style.display = "none";
} else {
mySidebar.style.display = 'block';
overlayBg.style.display = "block";
}
}
?>

</div>

// Close the sidebar with the close button
function w3_close() {
mySidebar.style.display = "none";
overlayBg.style.display = "none";
}
</script>
35 changes: 17 additions & 18 deletions pgLogin.php
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,25 @@
EXAMPLE USAGE:
<?php
$pagetitle="Log In | MySite";
$headline = '<h1>My Site</h1><h3>Please log in</h3>' ;
include "Hydrogen/pgTemplate.php";
include "Hydrogen/pgLogin.php";
?>
<!-- Main content: shift it to the right by 250 pixels when the sidebar is visible -->
<div class="w3-main" style="margin-left:250px">
<div class="w3-row w3-padding-64">
<div class="w3-twothird w3-container">
<?php include "Hydrogen/pgLogin.php"; ?>
</div>
<div class="w3-third w3-container">
</div>
</div>
</div>
<?php include "Hydrogen/elemFooter.php"; ?>
</body></html>
******************************************************/
Expand All @@ -24,9 +39,6 @@
// as arguments and returns a "1" (one) for success. This function goes in the following file:
require_once('Hydrogen/libAuthenticate.php');

//The following file contains settings to be customized.
require_once('Hydrogen/settingsLogin.php');

session_start();

function showUsernameAndLogoutButton() {
Expand Down Expand Up @@ -54,18 +66,6 @@ function logOut() {
$_SESSION=array();
}

?>

<html>
<head>
<title>Login page</title>
<link rel="stylesheet" type="text/css" href="/style.css">
</head>
<body>


<?php

//showDebugInfo();


Expand Down Expand Up @@ -176,4 +176,3 @@ function logOut() {
}
?>

</body></html>
Loading

0 comments on commit f82d50f

Please sign in to comment.