mirror of
https://github.com/neocities/neocities.git
synced 2025-04-29 11:37:59 +02:00
Merge 105b34e5bb
into bb03385a28
This commit is contained in:
commit
b03d915213
3 changed files with 36 additions and 5 deletions
|
@ -30,6 +30,28 @@ function hideUploadProgress() {
|
||||||
$('#uploadingOverlay').css('display', 'none')
|
$('#uploadingOverlay').css('display', 'none')
|
||||||
}
|
}
|
||||||
|
|
||||||
|
function showMovingProgress() {
|
||||||
|
$('#movingOverlay').css('display', 'block');
|
||||||
|
}
|
||||||
|
|
||||||
|
function hideMovingProgress() {
|
||||||
|
$('#movingOverlay').css('display', 'none');
|
||||||
|
}
|
||||||
|
|
||||||
|
function moveFileToFolder(event, folderName) {
|
||||||
|
event.preventDefault();
|
||||||
|
event.stopPropagation();
|
||||||
|
|
||||||
|
const fullUrl = event.dataTransfer.getData('text/uri-list');
|
||||||
|
const url = new URL(fullUrl);
|
||||||
|
let fileName = url.pathname;
|
||||||
|
|
||||||
|
$('#moveCurrentPath').val(fileName.slice(1));
|
||||||
|
fileName = fileName.split('/').pop();
|
||||||
|
$('#moveNewPath').val(folderName + '/' + fileName);
|
||||||
|
$('#moveFileForm').submit();
|
||||||
|
}
|
||||||
|
|
||||||
$('#createDir').on('shown', function () {
|
$('#createDir').on('shown', function () {
|
||||||
$('#newDirInput').focus();
|
$('#newDirInput').focus();
|
||||||
})
|
})
|
||||||
|
|
|
@ -19,14 +19,16 @@
|
||||||
<% if params[:dir].nil? || params[:dir].empty? || params[:dir] == '/' %>
|
<% if params[:dir].nil? || params[:dir].empty? || params[:dir] == '/' %>
|
||||||
Home
|
Home
|
||||||
<% else %>
|
<% else %>
|
||||||
<a href="/dashboard">Home</a>
|
<a href="/dashboard" ondrop="moveFileToFolder(event, '')" ondragover="event.preventDefault()">Home</a>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
|
||||||
<% if @dir %>
|
<% if @dir %>
|
||||||
<% dir_array = @dir.split '/' %>
|
<% dir_array = @dir.split '/' %>
|
||||||
<% dir_array.each_with_index do |dir,i| %>
|
<% dir_array.each_with_index do |dir,i| %>
|
||||||
<% if i+1 < dir_array.length %>
|
<% if i+1 < dir_array.length %>
|
||||||
<a href="/dashboard?dir=<%= Rack::Utils.escape dir_array[1..i].join('/') %>"><%= dir %></a> <i class="fa fa-angle-right"></i>
|
<a href="/dashboard?dir=<%= Rack::Utils.escape dir_array[1..i].join('/') %>"
|
||||||
|
ondrop="moveFileToFolder(event, '<%= dir_array[1..i].join('/') %>')"
|
||||||
|
ondragover="event.preventDefault()"><%= dir %></a> <i class="fa fa-angle-right"></i>
|
||||||
<% else %>
|
<% else %>
|
||||||
<%= dir %>
|
<%= dir %>
|
||||||
<% end %>
|
<% end %>
|
||||||
|
@ -58,7 +60,7 @@
|
||||||
<div class="overlay"></div>
|
<div class="overlay"></div>
|
||||||
</div>
|
</div>
|
||||||
<% elsif file[:is_directory] %>
|
<% elsif file[:is_directory] %>
|
||||||
<div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event)">
|
<div class="html-thumbnail folder fileimagehover" ondrop="moveFileToFolder(event, '<%= file[:path] %>')" ondragover="event.preventDefault()">
|
||||||
<div class="folder-icon"></div>
|
<div class="folder-icon"></div>
|
||||||
<div class="overlay"></div>
|
<div class="overlay"></div>
|
||||||
</div>
|
</div>
|
||||||
|
@ -105,4 +107,4 @@
|
||||||
<% end %>
|
<% end %>
|
||||||
</div>
|
</div>
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
|
@ -115,6 +115,13 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
|
<form id="moveFileForm" method="post" action="/site_files/rename">
|
||||||
|
<input type="hidden" value="<%= csrf_token %>" name="csrf_token">
|
||||||
|
<input type="hidden" value="<%= @dir %>" name="dir">
|
||||||
|
<input type="hidden" id="moveCurrentPath" name="path">
|
||||||
|
<input type="hidden" id="moveNewPath" name="new_path">
|
||||||
|
</form>
|
||||||
|
|
||||||
|
|
||||||
<div class="site-actions" style="margin-bottom:25px">
|
<div class="site-actions" style="margin-bottom:25px">
|
||||||
<% if !current_site.plan_feature(:no_file_restrictions) %>
|
<% if !current_site.plan_feature(:no_file_restrictions) %>
|
||||||
|
@ -173,4 +180,4 @@
|
||||||
</form>
|
</form>
|
||||||
</div>
|
</div>
|
||||||
|
|
||||||
<script src="/js/dashboard.js"><script>
|
<script src="/js/dashboard.js"><script>
|
||||||
|
|
Loading…
Add table
Reference in a new issue