aboutsummaryrefslogtreecommitdiffstats
path: root/view
diff options
context:
space:
mode:
authorSimon <simon@kisikew.org>2012-02-26 22:20:46 -0800
committerSimon <simon@kisikew.org>2012-02-26 22:20:46 -0800
commit6e76d9d3a3bf27deefb1a2c50e721d3c866df5cb (patch)
tree07fcf6ef60cb145340755590feb6be43c13253cc /view
parentfc036210fb599cff936b647689362ebacf86a16b (diff)
parent72e78046afbd1977ff7b5458005cd62471faba0e (diff)
downloadvolse-hubzilla-6e76d9d3a3bf27deefb1a2c50e721d3c866df5cb.tar.gz
volse-hubzilla-6e76d9d3a3bf27deefb1a2c50e721d3c866df5cb.tar.bz2
volse-hubzilla-6e76d9d3a3bf27deefb1a2c50e721d3c866df5cb.zip
Merge pull request #51 from simonlnu/master
RFC, request for comments: about the https for html5shiv
Diffstat (limited to 'view')
-rwxr-xr-xview/head.tpl2
-rwxr-xr-xview/jot-header.tpl3
2 files changed, 2 insertions, 3 deletions
diff --git a/view/head.tpl b/view/head.tpl
index 2a1837088..da6ec1159 100755
--- a/view/head.tpl
+++ b/view/head.tpl
@@ -11,7 +11,7 @@
<link rel="search"
href="$baseurl/opensearch"
type="application/opensearchdescription+xml"
- title="Search in Friendika" />
+ title="Search in Friendica" />
<!--[if IE]>
<script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
diff --git a/view/jot-header.tpl b/view/jot-header.tpl
index 007f639b6..d6b172b6a 100755
--- a/view/jot-header.tpl
+++ b/view/jot-header.tpl
@@ -15,7 +15,7 @@ function initEditor(cb){
$("a#jot-perms-icon").fancybox({
'transitionIn' : 'elastic',
'transitionOut' : 'elastic'
- });
+ });
$(".jothidden").show();
if (typeof cb!="undefined") cb();
return;
@@ -129,7 +129,6 @@ function enableOnUser(){
$("#profile-jot-text").focus(enableOnUser);
$("#profile-jot-text").click(enableOnUser);
-
var uploader = new window.AjaxUpload(
'wall-image-upload',
{ action: 'wall_upload/$nickname',