Revision: 2023
http://mrbs.svn.sourceforge.net/mrbs/?rev=2023&view=rev
Author: cimorrison
Date: 2011-09-28 13:20:39 +0000 (Wed, 28 Sep 2011)
Log Message:
-----------
Merged in latest changes from the trunk
Modified Paths:
--------------
mrbs/branches/datatables/web/Themes/default/header.inc
Property Changed:
----------------
mrbs/branches/datatables/
mrbs/branches/datatables/web/upgrade/5/pgsql.sql
Property changes on: mrbs/branches/datatables
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-2019
+ /mrbs/branches/custom_entry_fields:1374-1396
/mrbs/branches/datepicker:1409-1416
/mrbs/branches/disabled_rooms:1601-1634
/mrbs/branches/from_to_bookings:1491-1587
/mrbs/branches/ics_attachments:1652-1741
/mrbs/branches/improve_css_2008_06:804-872
/mrbs/branches/only_unicode:1747-1749
/mrbs/branches/provisional_bookings:1242-1280
/mrbs/branches/provisional_bookings_new_style:1407-1570
/mrbs/trunk:1863-2022
Modified: mrbs/branches/datatables/web/Themes/default/header.inc
===================================================================
--- mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-28
13:17:18 UTC (rev 2022)
+++ mrbs/branches/datatables/web/Themes/default/header.inc 2011-09-28
13:20:39 UTC (rev 2023)
@@ -1252,6 +1252,8 @@
$('#conflict_check, #policy_check').click(function() {
var tabId;
+ var checkResults = $('#check_results');
+ var checkTabs = $('#check_tabs');
<?php
// Work out which tab should be selected
// (Slightly long-winded using a switch, but there may be more tabs in
future)
@@ -1268,11 +1270,16 @@
}
<?php
// If we've already created the dialog and tabs, then all we have
- // to do is select the tab corresponding to the div that was clicked
+ // to do is re-open the dialog if it has previously been closed and
+ // select the tab corresponding to the div that was clicked
?>
if (arguments.callee.alreadyExists)
{
- $('#check_tabs').tabs("select", tabId);
+ if (!checkResults.dialog("isOpen"))
+ {
+ checkResults.dialog("open");
+ }
+ checkTabs.tabs("select", tabId);
return;
}
<?php
@@ -1280,8 +1287,9 @@
// with the whole structure being draggable. Thanks to dbroox at
// http://forum.jquery.com/topic/combining-ui-dialog-and-tabs for the
solution.
?>
- $('#check_tabs').tabs();
- $('#check_results').dialog({'width':400, 'height':200,
+ checkTabs.tabs();
+ checkTabs.tabs("select", tabId);
+ checkResults.dialog({'width':400, 'height':200,
'minWidth':300, 'minHeight':150,
'draggable':true });
<?php //steal the close button ?>
Property changes on: mrbs/branches/datatables/web/upgrade/5/pgsql.sql
___________________________________________________________________
Modified: svn:mergeinfo
- /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-2019
+ /mrbs/branches/custom_entry_fields/web/upgrade/5/pgsql.sql:1374-1396
/mrbs/branches/datepicker/web/upgrade/5/pgsql.sql:1409-1416
/mrbs/branches/disabled_rooms/web/upgrade/5/pgsql.sql:1601-1634
/mrbs/branches/from_to_bookings/web/upgrade/5/pgsql.sql:1491-1587
/mrbs/branches/ics_attachments/web/upgrade/5/pgsql.sql:1652-1741
/mrbs/branches/only_unicode/web/upgrade/5/pgsql.sql:1747-1749
/mrbs/branches/provisional_bookings/web/upgrade/5/pgsql.sql:1242-1280
/mrbs/branches/provisional_bookings_new_style/web/upgrade/5/pgsql.sql:1407-1570
/mrbs/trunk/web/upgrade/5/pgsql.sql:1863-2022
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
All the data continuously generated in your IT infrastructure contains a
definitive record of customers, application performance, security
threats, fraudulent activity and more. Splunk takes this data and makes
sense of it. Business sense. IT sense. Common sense.
http://p.sf.net/sfu/splunk-d2dcopy1
_______________________________________________
Mrbs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/mrbs-commits
