Small fixes

This commit is contained in:
Luc Didry
2014-06-01 18:40:51 +02:00
parent 846d8a1bfe
commit d8498b89fd
2 changed files with 14 additions and 7 deletions
+8 -1
View File
@@ -130,7 +130,7 @@
<div class="form-group">
<span class="col-sm-3"><span class="hidden-spin" style="font-size:200%; display:none;" > <i class="icon-spinner animate-spin pull-right"></i></span><label for="lutim-file-url" class="control-label pull-right"><%=l 'upload_image_url' %></label></span>
<div class="col-sm-9">
<input type="url" name="file-url" class="form-control" id="lutim-file-url" placeholder="<%=l 'image_url' %>">
<input type="url" name="lutim-file-url" class="form-control" id="lutim-file-url" placeholder="<%=l 'image_url' %>">
</div>
</div>
<a href="#" class="btn btn-default btn-primary pull-right" id="file-url-button"><%=l 'go' %></a>
@@ -243,5 +243,12 @@
bindddz(firstview, deleteday);
$("#file-url-button").on("click", upload_url);
$('#lutim-file-url').keydown( function(e) {
var key = e.charCode ? e.charCode : e.keyCode ? e.keyCode : 0;
if(key == 13) {
e.preventDefault();
upload_url();
}
});
});
% end
+6 -6
View File
@@ -12,12 +12,12 @@
<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">
% if (current_route 'index') {
%= asset 'index.css'
% } elsif (current_route 'stats') {
% if (current_route 'stats') {
%= asset 'stats.css'
% } elsif (current_route 'about') {
%= asset 'about.css'
% } else {
%= asset 'index.css'
% }
</head>
<body>
@@ -54,10 +54,10 @@
<strong><%= stash('stop_upload') %></strong>
</div>
% }
% if (current_route 'index') {
%= asset 'index.js'
% } elsif (current_route 'stats') {
% if (current_route 'stats') {
%= asset 'stats.js'
% } elsif (!(current_route 'about')) {
%= asset 'index.js'
% }
<%= content %>
</div>