WordPress.org
Get WordPress

Plugin Directory

Changeset 440694


Ignore:
Timestamp:
09/20/2011 09:19:12 AM (15 years ago)
Author:
zingiri
Message:

0.9.1

Location:
bookings/trunk
Files:
3 added
2 deleted
3 edited

Legend:

Unmodified
Added
Removed

  • bookings/trunk/controlpanel.php

    r439859 r440694  
    4747    }
    4848
    49     //add_options_page($bookings_name, $bookings_name, 'administrator', 'cc-ce-bridge-cp','bookings_admin');
    5049    add_menu_page($bookings_name, $bookings_name, 'administrator', 'bookings','bookings_main');
    5150    add_submenu_page('bookings', $bookings_name.' - Setup', 'Setup', 'administrator', 'bookings', 'bookings_main');
    52     add_submenu_page('bookings', $bookings_name.'- 20', 'Control Panel', 'administrator', 'bookings&zb=ctrlpnl', 'bookings_main');
    53     //add_submenu_page('bookings', $bookings_name.'- Main', 'Schedules', 'administrator', 'bookings&zb=admin&tool=schedules', 'bookings_main');
     51    add_submenu_page('bookings', $bookings_name.' - Schedules', 'Schedules', 'administrator', 'bookings&zb=admin&tool=schedules', 'bookings_main');
    5452    add_submenu_page('bookings', $bookings_name.' - Resources', 'Resources', 'administrator', 'bookings&zb=admin&tool=resources', 'bookings_main');
    5553    add_submenu_page('bookings', $bookings_name.' - Blackouts', 'Blackouts', 'administrator', 'bookings&zb=blackouts', 'bookings_main');
    5654    add_submenu_page('bookings', $bookings_name.' - List', 'Bookings List', 'administrator', 'bookings&zb=admin&tool=reservations', 'bookings_main');
    57     //add_submenu_page('bookings', $bookings_name.'- Main', 'Approve reservations', 'administrator', 'bookings&zb=admin&tool=approval', 'bookings_main');
    5855    add_submenu_page('bookings', $bookings_name.' - Calendar', 'Bookings Calendar', 'administrator', 'bookings&zb=schedule', 'bookings_main');
    5956    add_submenu_page('bookings', $bookings_name.' - Search Bookings', 'Search Bookings', 'administrator', 'bookings&zb=usage', 'bookings_main');
    … …  
    6461   
    6562    if (!isset($_GET['zb'])) return bookings_admin();
    66 //  elseif (isset($_GET['ajax'])) return bookings_ajax();
    67    
    68     //bookings_home($home,$pid);
    69    
     63
    7064    echo '<div class="wrap">';
    7165    echo '<div id="bookings" style="position:relative;float:left;width:75%">';
    … …  
    8377    echo '</div>';
    8478}
     79
    8580function bookings_admin() {
    8681
    … …  
    8984    $controlpanelOptions=bookings_options();
    9085
    91     if ( isset($_REQUEST['installed']) ) echo '<div id="message" class="updated fade"><p><strong>'.$bookings_name.' installed.</strong></p></div>';
     86    if ( isset($_REQUEST['install']) ) echo '<div id="message" class="updated fade"><p><strong>'.$bookings_name.' settings updated.</strong></p></div>';
    9287    if ( isset($_REQUEST['error']) ) echo '<div id="message" class="updated fade"><p>The following error occured: <strong>'.$_REQUEST['error'].'</strong></p></div>';
    9388   
    … …  
    129124<?php
    130125    require(dirname(__FILE__).'/includes/support-us.inc.php');
    131     zing_support_us('bookings','bookings','cc-ce-bridge-cp',BOOKINGS_VERSION);
     126    zing_support_us('bookings','bookings','bookings',BOOKINGS_VERSION);
    132127}
    133128add_action('admin_menu', 'bookings_add_admin'); ?>

  • bookings/trunk/includes/support-us.inc.php

    r439859 r440694  
    3838            $url='http://www.zingiri.net/index.php?zlistpro=register&e='.urlencode($current_user->data->user_email).'&f='.urlencode(isset($current_user->data->first_name) ? $current_user->data->first_name : '').'&l='.urlencode(isset($current_user->data->last_name) ? $current_user->data->last_name : '').'&w='.urlencode(get_option('home')).'&p='.$wpPluginName.'&v='.urlencode($version);         
    3939            $news = new zHttpRequest($url);
    40             if ($news->live() && !$_SESSION[$wpPluginName]['news']) {
     40            if ($news->live() && (!isset($_SESSION[$wpPluginName]['news']) || !$_SESSION[$wpPluginName]['news'])) {
    4141                update_option($wpPluginName.'_news',$news->DownloadToString());
    4242                $_SESSION[$wpPluginName]['news']=true;

  • bookings/trunk/js/functions.js

    r439859 r440694  
    593593}
    594594
    595 function changeResCalendar(m, d, y, view, id) {
     595function changeResCalendar(m, d, y, view, id, page) {
    596596    var url = document.URL.split('?')[0];
    597597    var type_id = id.split("|");
    … …  
    599599    var p = (type == "s") ? "scheduleid" : "machid";
    600600    var id = type_id[1];
    601     document.location.href = url + "?page=bookings&zb=rescalendar&date=" + m + "-" + d + "-" + y + "&view=" + view + "&" + p + "=" + id;
     601    if (page == null) page='rescalendar';
     602    //document.location.href = url + "?page=bookings&zb=rescalendar&date=" + m + "-" + d + "-" + y + "&view=" + view + "&" + p + "=" + id;
     603    document.location.href = bookingsPageurl + "zb=" + page + "&date=" + m + "-" + d + "-" + y + "&view=" + view + "&" + p + "=" + id;
    602604}
    603605
Note: See TracChangeset for help on using the changeset viewer.