Update index.html.erb
This commit is contained in:
parent
550547448e
commit
5fa9a5eb93
|
@ -1,4 +1,19 @@
|
|||
<script src="https://kit.fontawesome.com/1fa49cfdc9.js" crossorigin="anonymous"></script>
|
||||
<script>
|
||||
function MergeUrl(){
|
||||
var tem_url = location.href
|
||||
if (temp_url.search("locale=")!=-1){
|
||||
var tp=temp_url.lastIndexOf('/')
|
||||
location.href = temp_url.substring(0,tp+1)+"merge/"+temp_url.substring(tp+1)
|
||||
}
|
||||
else if (tem_url.slice(-1)!='/'){
|
||||
location.href = location.href + "merge"
|
||||
}
|
||||
else{
|
||||
location.href = location.href + "/merge"
|
||||
}
|
||||
}
|
||||
</script>
|
||||
<table class="table main-list">
|
||||
<thead>
|
||||
<tr>
|
||||
|
@ -15,12 +30,12 @@
|
|||
<div class="bottomnav clearfix">
|
||||
<div class="action pull-right">
|
||||
<div class="dropup upload-button">
|
||||
<button class="btn btn-primary" type="button" onclick="location.href=location.href+'merge'">
|
||||
<button class="btn btn-primary" type="button" onclick="MergeUrl()">
|
||||
<i class="far fa-object-group"></i>
|
||||
<span class="group"></span>合併
|
||||
<span class="group"></span><%= t('personal_journal.merge') %>
|
||||
</button>
|
||||
<button class="btn btn-primary dropdown-toggle" type="button" data-toggle="dropdown">
|
||||
<i class="icon-upload-alt icon-white"></i>上傳
|
||||
<i class="icon-upload-alt icon-white"></i><%= t('personal_journal.upload') %>
|
||||
<span class="caret"></span>
|
||||
</button>
|
||||
<div class="dropdown-menu upload-box">
|
||||
|
|
Loading…
Reference in New Issue