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

Merge branch 'develop' of projects.ceondo.com:indefero into feature.scilab

Browse Source 
Conflicts:
	NEWS.mdtext
This commit is contained in:
Thomas Keller
2012-03-22 00:51:39 +01:00
parent 562e6803c5 be2f0b3d62
commit f8a830802e
12 changed files with 120 additions and 163 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/IDF/Scm/Monotone/Stdio.php
View File

@@ -119,7 +119,7 @@ class IDF_Scm_Monotone_Stdio implements IDF_Scm_Monotone_IStdio
$remote_db_access = Pluf::f('mtn_db_access', 'remote') == 'remote';
$cmd = Pluf::f('idf_exec_cmd_prefix', '') .
Pluf::f('mtn_path', 'mtn') . ' ';
escapeshellarg(Pluf::f('mtn_path', 'mtn')) . ' ';
$opts = Pluf::f('mtn_opts', array());
foreach ($opts as $opt) {

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';});";
}
}

6
src/IDF/Views/Source.php
View File

@@ -512,12 +512,12 @@ function IDF_Views_Source_PrettySizeSimple($size)
function IDF_Views_Source_ShortenString($string, $length)
{
$ellipse = "...";
$length = max(strlen($ellipse) + 2, $length);
$length = max(mb_strlen($ellipse) + 2, $length);
$preflen = ceil($length / 10);
if (mb_strlen($string) < $length)
return $string;
return substr($string, 0, $preflen).$ellipse.
substr($string, -($length - $preflen - mb_strlen($ellipse)));
return mb_substr($string, 0, $preflen).$ellipse.
mb_substr($string, -($length - $preflen - mb_strlen($ellipse)));
}

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>

8
src/IDF/templates/idf/issues/summary.html
View File

@@ -2,6 +2,14 @@
{block docclass}yui-t2{assign $inSummaryIssues=true}{/block}
{block context}
<p><a>
<p><a href="{url 'IDF_Views_Issue::index', array($project.shortname)}">{blocktrans}View all open issues.{/blocktrans}</a></p>
{if !$user.isAnonymous()}
<p><a href="{url 'IDF_Views_Issue::create', array($project.shortname)}">{blocktrans}Create an issue.{/blocktrans}</a></p>
{/if}
{/block}
{block body}
{if $trackerEmpty}
{aurl 'create_url', 'IDF_Views_Issue::create', array($project.shortname)}