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

Merge branch 'develop' into feature.issue-due-date

Browse Source 
Conflicts:
	src/IDF/templates/idf/base-full.html
	src/IDF/templates/idf/base-simple.html
	src/IDF/templates/idf/base.html
This commit is contained in:
Simon Holywell
2012-03-30 12:20:07 +01:00
parent 3a71d71ef8 74d06b0c31
commit 315e06da1b
15 changed files with 14962 additions and 7698 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -32,7 +32,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.7.1.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-ui-1.8.18.custom.min.js'}"></script>
{appversion}
</head>

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

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

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

@@ -32,7 +32,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.7.1.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-1.7.2.min.js'}"></script>
<script type="text/javascript" src="{media '/idf/js/jquery-ui-1.8.18.custom.min.js'}"></script>
{appversion}
</head>

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

@@ -30,7 +30,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.2.min.js'}"></script>
{appversion}
</head>
<body>