From: Owen Leonard Date: Thu, 28 Oct 2010 15:42:33 +0000 (-0600) Subject: Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into ht_sandbox X-Git-Tag: release_1_1_0^2 X-Git-Url: http://git.pippins.net/embedvideo/.git/?a=commitdiff_plain;h=refs%2Fheads%2Fowenleonard%2Fht_sandbox;hp=ea8cefec49ed49ffb2f9d08885368daca684abec;p=eq%2F.git Merge branch 'owenleonard/ht_sandbox' of git@github.com:apippin/tc into ht_sandbox --- diff --git a/images/tablesorter_asc.gif b/images/tablesorter_asc.gif new file mode 100644 index 0000000..7415786 Binary files /dev/null and b/images/tablesorter_asc.gif differ diff --git a/images/tablesorter_bg.gif b/images/tablesorter_bg.gif new file mode 100644 index 0000000..fac668f Binary files /dev/null and b/images/tablesorter_bg.gif differ diff --git a/images/tablesorter_desc.gif b/images/tablesorter_desc.gif new file mode 100644 index 0000000..3b30b3c Binary files /dev/null and b/images/tablesorter_desc.gif differ diff --git a/inc/class.tc.inc.php b/inc/class.tc.inc.php index 630fe14..8b435da 100644 --- a/inc/class.tc.inc.php +++ b/inc/class.tc.inc.php @@ -79,6 +79,9 @@ class tc include("setup/tc_config"); } + $this->jquery_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.js'); + $this->jquery_tablesorter_url = $GLOBALS['phpgw']->link('inc/jquery/jquery.tablesorter.js'); + $this->script_path = "$this->application_path"."/bin"; $this->max_presidency_members = 99; $this->max_appointments = 32768; @@ -92,6 +95,11 @@ class tc $this->grants = $GLOBALS['phpgw']->acl->get_grants('tc'); $this->grants[$this->account] = PHPGW_ACL_READ + PHPGW_ACL_ADD + PHPGW_ACL_EDIT + PHPGW_ACL_DELETE; + $GLOBALS['phpgw_info']['flags']['css'] .= "-->\n\n" + . '' + . "\n