Make links https if access by https

This commit is contained in:
Luc Didry
2014-02-16 18:57:01 +01:00
parent 3388577790
commit dbd68796e8
3 changed files with 17 additions and 17 deletions
+10 -10
View File
@@ -5,9 +5,9 @@
<button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button>
<strong><%= flash('filename') %></strong>
<ul>
<li><%=l 'view-link'%><%= link_to url_for('/')->to_abs.flash('short') => begin %><%= url_for('/')->to_abs.flash('short') %><%= end %></li>
<li><%=l 'download-link' %> <%= link_to url_for('/')->to_abs.flash('short').'?dl' => begin %><%= url_for('/')->to_abs.flash('short').'?dl' %><%= end %></li>
<li><%=l 'twitter-link' %> <%= link_to url_for('/')->to_abs.flash('short').'?t' => begin %><%= url_for('/')->to_abs.flash('short').'?t' %><%= end %></li>
<li><%=l 'view-link'%> <%= link_to url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short') => begin %><%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short') %><%= end %></li>
<li><%=l 'download-link' %> <%= link_to url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?dl' => begin %><%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?dl' %><%= end %></li>
<li><%=l 'twitter-link' %> <%= link_to url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?t' => begin %><%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs.'/'.flash('short').'?t' %><%= end %></li>
</ul>
</div>
% }
@@ -21,7 +21,7 @@
</div>
<noscript>
<form class="form" role="form" method="POST" action="<%== url_for 'add' %>" enctype="multipart/form-data">
<form class="form" role="form" method="POST" action="<%== url_for('add')->base->scheme($self->req->url->base->scheme()) %>/" enctype="multipart/form-data">
<div class="form-group form-inline">
<span>
<label>
@@ -75,7 +75,7 @@
<div class="browser">
<label>
<span><%=l 'file-browser' %></span>
<input type="file" name="files[]" multiple="multiple" title='Click to add Files'>
<input type="file" name="files[]" multiple="multiple" title='<%=l 'file-browser' %>'>
</label>
</div>
</div>
@@ -87,17 +87,17 @@
if (dl !== '') {
url = url+'?'+dl;
}
return '<a href="<%== url_for('index')->to_abs() %>'+url+'"><%== url_for('index')->to_abs() %>'+url+'</a>';
return '<a href="<%== url_for('index')->base->scheme($self->req->url->base->scheme())->to_abs() %>/'+url+'"><%== url_for('index')->base->scheme($self->req->url->base->scheme())->to_abs() %>/'+url+'</a>';
}
function message(success, msg) {
if(success) {
return '<div class="alert alert-success"><button type="button" class="close" data-dismiss="alert" aria-hidden="true">&times;</button><strong>'
+msg.filename
+'</strong><ul><li><%=l 'view-link'%>'
+'</strong><ul><li><%=l 'view-link'%> '
+link(msg.short, '')
+'</a></li><li><%=l 'download-link' %>'
+'</a></li><li><%=l 'download-link' %> '
+link(msg.short, 'dl')
+'</a></li><li><%=l 'twitter-link' %>'
+'</a></li><li><%=l 'twitter-link' %> '
+link(msg.short, 't')
+'</li></div>';
} else {
@@ -110,7 +110,7 @@
}
function bindddz(firstview, deleteday) {
$('#drag-and-drop-zone').dmUploader({
url: '<%== url_for('add') %>',
url: '<%== url_for('add')->base->scheme($self->req->url->base->scheme()) %>/',
dataType: 'json',
allowedTypes: 'image/*',
maxFileSize: <%= $max_file_size %>,
+5 -5
View File
@@ -1,7 +1,7 @@
% # vim:set sw=4 ts=4 sts=4 ft=html.epl expandtab:
% use Mojo::Util qw(url_escape);
% my $twitter_url = 'https://twitter.com/share';
% my $url = url_for('/')->to_abs();
% my $url = url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/';
% $twitter_url .= '?url='.url_escape("$url")
% .'&via=framasky'
% .'&text=Check out this %23LUTIm instance! ';
@@ -11,7 +11,7 @@
<title>LUTIm</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8" />
<link rel="icon" type="image/png" href="<%= url_for('/') %>img/favicon.png">
<link rel="icon" type="image/png" href="<%= url_for('/')->base->scheme($self->req->url->base->scheme()) %>/img/favicon.png">
%= stylesheet 'css/bootstrap.min.css', media => 'screen'
%= stylesheet 'css/fontello.css'
%= stylesheet 'css/uploader.css'
@@ -45,7 +45,7 @@
% }
<div>
<div class="pull-left hidden-xs">
<img src="<%= url_for('/') %>img/LUTIm_small.png">
<img src="<%= url_for('/')->base->scheme($self->req->url->base->scheme()) %>/img/LUTIm_small.png">
</div>
<h1>Let's Upload That Image!</h1>
<p>
@@ -68,7 +68,7 @@
<h3 class="modal-title">LUTIm</h3>
</div>
<div class="modal-body">
<%==l 'informations-body', url_for('index')->to_abs(), config('contact') %>
<%==l 'informations-body', url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/', config('contact') %>
</div>
<div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Close</button>
@@ -81,7 +81,7 @@
<h3 class="modal-title">LUTIm</h3>
</div>
<div class="modal-body">
<%==l 'informations-body', url_for('index')->to_abs(), config('contact') %>
<%==l 'informations-body', url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/', config('contact') %>
</div>
</noscript>
</div>
+2 -2
View File
@@ -5,12 +5,12 @@
<title>LUTIm</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta charset="utf-8" />
<link rel="icon" type="image/png" href="<%= url_for('/') %>img/favicon.png">
<link rel="icon" type="image/png" href="<%= url_for('/')->base->scheme($self->req->url->base->scheme()) %>/img/favicon.png">
<meta name="twitter:card" content="photo">
% if (defined(config('tweet_card_via'))) {
<meta name="twitter:site" content="<%= config('tweet_card_via') %>">
% }
<meta name="twitter:image:src" content="<%= url_for('/')->to_abs().$short %>">
<meta name="twitter:image:src" content="<%= url_for('/')->base->scheme($self->req->url->base->scheme())->to_abs().'/'.$short %>">
</head>
<body>
<img src="<%= url_for('/').$short %>" alt="<%= $filename %>">