natalie/indefero
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge remote branch 'origin/develop' into feature.issue-due-date

Browse Source
This commit is contained in:
Simon Holywell
2012-03-08 14:47:01 +00:00
parent 0e52a2e673 be2f0b3d62
commit 9beffaae7e
8 changed files with 106 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/IDF/Template/HotKey.php
View File

@@ -31,6 +31,6 @@ class IDF_Template_HotKey extends Pluf_Template_Tag
function start($key, $view, $params=array(), $get_params=array())
{
$url = addslashes(Pluf_HTTP_URL_urlForView($view, $params, $get_params));
echo "jQuery.hotkeys.add('$key',{disableInInput: true},function (){window.location.href='$url';});";
echo "$(document).bind('keydown','$key',function (){window.location.href='$url';});";
}
}

2
src/IDF/templates/idf/base-full.html
View File

@@ -31,7 +31,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
{appversion}
</head>
<body>

2
src/IDF/templates/idf/base-simple.html
View File

@@ -31,7 +31,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
{appversion}
</head>
<body>

2
src/IDF/templates/idf/base.html
View File

@@ -31,7 +31,7 @@
<![endif]-->
{block extraheader}{/block}
<title>{block pagetitle}{$page_title|strip_tags}{/block}{if $project} - {$project.shortdesc}{/if}</title>
<script type="text/javascript" src="{media '/idf/js/jquery-1.2.6.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.1.min.js'}"></script>
{appversion}
</head>
<body>