Skip to content

Tenzing / banners-with-skip

Go to a project
Toggle navigation
Toggle navigation pinning
d3fa69cd by Dan Rempel
Options

Merge branch 'deploy' of git.gotenzing.com:tenzing/banners-with-skip into deploy

2 parents 97712a11 eadaf6bd
Inline Side-by-side
Showing 4 changed files with 15 additions and 12 deletions
...@@ -5,7 +5,6 @@ ...@@ -5,7 +5,6 @@
5 5
6 6
7 7
8
9 ### Wordpress ### 8 ### Wordpress ###
10 9
11 wp-config.php 10 wp-config.php
......
1 <?php 1 <?php
2
3
4
2 if (!isset($_SESSION['token'])){ 5 if (!isset($_SESSION['token'])){
3 6
4 echo '<form> 7 echo '<form>
......
1 <?php 1 <?php
2 if (!isset($_SESSION) && !isset($_SESSION['username'])) { 2 // if (!isset($_SESSION) && !isset($_SESSION['username'])) {
3 return; 3 // return;
4 } 4 // }
5 5
6 6
7 $dockets = Array(); 7 $dockets = Array();
......
...@@ -38,12 +38,10 @@ ...@@ -38,12 +38,10 @@
38 list-style: none; 38 list-style: none;
39 padding-left: 0; 39 padding-left: 0;
40 } 40 }
41
42 #TzLogo { 41 #TzLogo {
43 float: right; 42 float: right;
44 width: 259px; 43 width: 259px;
45 } 44 }
46
47 #submit { margin-left: 6px; } 45 #submit { margin-left: 6px; }
48 46
49 dd { margin-left: 0; } 47 dd { margin-left: 0; }
...@@ -51,16 +49,19 @@ ...@@ -51,16 +49,19 @@
51 49
52 <script type="text/javascript" src="addEvent.js"></script> 50 <script type="text/javascript" src="addEvent.js"></script>
53 51
54
55 </head> 52 </head>
56 53
57 <body> 54 <body>
55
58 <?php 56 <?php
59 if (isset($_SESSION['username'])) { 57
60 include('includes/loggedin.php'); 58 include('includes/loggedin.php');
61 } else { 59
62 include('includes/auth.php'); 60 //if (isset($_SESSION['username'])) {
63 } 61 // include('includes/loggedin.php');
62 //} else {
63 // include('includes/auth.php');
64 //}
64 ?> 65 ?>
65 66
66 <div id="TzLogo"> 67 <div id="TzLogo">
......