You must login to view this content.
+
+
diff --git a/equipment-displays.php b/equipment-displays.php
deleted file mode 100644
index bbd0eb2..0000000
--- a/equipment-displays.php
+++ /dev/null
@@ -1,79 +0,0 @@
-
-
-
-
-
+
+
You must login to view this content.
+
diff --git a/functions.php b/functions.php
index 2f1b2cd..a1d3d82 100644
--- a/functions.php
+++ b/functions.php
@@ -13,21 +13,21 @@
* Add IDI-specific JS files to the header
*/
function add_idi_files() {
- $baseurl = get_stylesheet_directory_uri();
-
- // The font fix for Chrome and Firefox on windows
- // Lato font is too light to read with chrome on windows, use arial/helvetica instead
- $userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
- if (strpos($userAgent, "windows") && (strpos($userAgent, "chrome") || strpos($userAgent, "firefox"))) {
- echo '
'. "\n";
- }
-
- echo '' . "\n";
- echo '' . "\n";
- echo '' . "\n";
-
+ $baseurl = get_stylesheet_directory_uri();
+
+ // The font fix for Chrome and Firefox on windows
+ // Lato font is too light to read with chrome on windows, use arial/helvetica instead
+ $userAgent = strtolower($_SERVER['HTTP_USER_AGENT']);
+ if (strpos($userAgent, "windows") && (strpos($userAgent, "chrome") || strpos($userAgent, "firefox"))) {
+ echo '
'. "\n";
+ }
+
+ echo '' . "\n";
+ echo '' . "\n";
+ echo '' . "\n";
+
}
add_action('wp_head', 'add_idi_files');
@@ -35,8 +35,8 @@ function add_idi_files() {
* Customize the 'more' link at the end of a post excerpt
*/
function idi_excerpt_more($more) {
- global $post;
- return '
read article
';
+ global $post;
+ return '
read article
';
}
add_filter('excerpt_more', 'idi_excerpt_more');
@@ -45,18 +45,18 @@ function idi_excerpt_more($more) {
* Brand the login page with IDI-specific styling
*/
function brand_login_page() {
- echo '
';
- echo '';
- echo '';
+ echo '
';
+ echo '';
+ echo '';
}
add_action('login_head', 'brand_login_page');
@@ -65,33 +65,33 @@ function loginalt() {
* Determines if the current page or post is a descendent of the given page
*/
function is_tree($pid) { // $pid = The ID of the page we're looking for pages underneath
- global $post; // load details about this page
- $anc = get_post_ancestors( $post->ID );
- foreach($anc as $ancestor) {
- if(is_page() && $ancestor == $pid) {
- return true;
- }
- }
- if(is_page()&&(is_page($pid)))
+ global $post; // load details about this page
+ $anc = get_post_ancestors( $post->ID );
+ foreach($anc as $ancestor) {
+ if(is_page() && $ancestor == $pid) {
+ return true;
+ }
+ }
+ if(is_page()&&(is_page($pid)))
return true; // we're at the page or at a sub page
- else
+ else
return false; // we're elsewhere
};
function idi_generate_top_nav() {
- $pages = get_pages( array ('parent' => '0', 'sort_column' => 'menu_order'));
- $out = "
";
- echo $out;
+ echo $out;
}
/**
@@ -100,11 +100,32 @@ function idi_generate_top_nav() {
* section.
*/
function remove_parent_contentID() {
- echo '' . "\n";
+ echo '' . "\n";
+}
+
+
+/**
+ * Stay on login panel when login errors occur, instead of redirecting to login screen
+ */
+add_action( 'wp_login_failed', 'panel_login_fail' ); // hook failed login
+
+function panel_login_fail( $username ) {
+ $referrer = $_SERVER['HTTP_REFERER'];
+
+ // if there's a valid referrer, and it's not the default log-in screen
+ if ( !empty($referrer) && !strstr($referrer,'wp-login') && !strstr($referrer,'wp-admin') ) {
+ $referrer = explode('?', $referrer);
+ parse_str($referrer[1], $referrer_args);
+ unset($referrer_args['idilogout']); //unset old idilogout arg if set
+ $referrer_args['idilogin'] = "failed"; //let theme know there are errors
+
+ wp_redirect( $referrer[0]."?".http_build_query($referrer_args) );
+ exit;
+ }
}
?>
diff --git a/idi-booking-form.pdf b/idi-booking-form.pdf
new file mode 100644
index 0000000..16ef1eb
Binary files /dev/null and b/idi-booking-form.pdf differ
diff --git a/idi.js b/idi.js
index b8fd406..e13da33 100644
--- a/idi.js
+++ b/idi.js
@@ -57,6 +57,7 @@ var idi = idi || {};
loginToggleBtn: ".idi-slidingPanel-toggleButton",
UIOToggleButton: '.flc-slidingPanel-toggleButton',
loginForm: ".idi-login-form",
+ logoutText: ".idi-logout-text",
mailingList: {
form: ".idi-mailing-list-signup",
loading: ".idi-loading",
@@ -69,27 +70,6 @@ var idi = idi || {};
}
};
- idi.setUpLoginOutPanel = function () {
- fluid.slidingPanel(idi.selectors.loginContainer, {
- selectors: {
- panel: idi.selectors.loginPanel,
- toggleButton: idi.selectors.loginToggleBtn
- },
- strings: {
- showText: "Login",
- hideText: "Login"
- },
- listeners: {
- onPanelShow: function () {
- // close UIO panel if it was open
- idi.closeOpenedPanel($(idi.selectors.UIOiFrame), $(idi.selectors.UIOToggleButton));
- }
- }
- });
- $(idi.selectors.loginPanel).hide();
- $(idi.selectors.loginForm).show();
- };
-
idi.mailingListSignup = function () {
var form = $(idi.selectors.mailingList.form);
var loading = $(idi.selectors.mailingList.loading);
@@ -137,7 +117,7 @@ var idi = idi || {};
idi.setUpLoginOutPanel();
idi.makeTopNavSticky();
idi.setUpBookingFaq();
- idi.keyboardA11y();
+ idi.keyboardA11y();
});
fluid.demands("fluid.slidingPanel", ["fluid.uiOptions", "fluid.uiEnhancer"], {
diff --git a/infrastructure.php b/infrastructure.php
index 3e8db25..ff84289 100644
--- a/infrastructure.php
+++ b/infrastructure.php
@@ -6,6 +6,8 @@
+
+
-
-
-
-
-
-
-
- preferences
-
-
-
+
+
+
+
+
+
+
+
+
You have been successfully logged out. Login .
+
+
+
+
+
+
+
Preferences
+
+
+
+
Login
+
Logged in as user_login; ?>
+
+
+
Login
+
+
+
+
\ No newline at end of file
;?>/images/people/peopleplaceholder.png "the 'Magic Touch' touch screen")
-