Skip to content

Commit b2cb546

Browse files
committed
updated text for move-file-exist dialog
1 parent 89d2104 commit b2cb546

2 files changed

Lines changed: 12 additions & 1 deletion

File tree

src/main/webapp/WEB-INF/Index.jsp

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -533,6 +533,17 @@
533533
</ul>
534534
</div>
535535
<!-- **** -->
536+
<div id="template-dialog-move">
537+
<p>
538+
<strong>{{# print(escape(fileName)); }}</strong> already exists in the target folder.
539+
</p>
540+
<ul>
541+
<li><strong>Rename</strong> the file you tried to move</li>
542+
<li><strong>Replace</strong> the old file, meta data of the <i>target</i> file will be perserved</li>
543+
<li><strong>Override</strong> the old file, meta data of the <i>source</i> file will be perserved</li>
544+
</ul>
545+
</div>
546+
<!-- **** -->
536547
<div id="template-xml-meta-entry">
537548
<h4>RDF/XML entry</h4>
538549
<div class="archive-meta-xml-code">

src/main/webapp/res/js/models.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1400,7 +1400,7 @@ var ArchiveView = Backbone.View.extend({
14001400
// is duplicated?
14011401
if( isDuplicated ) {
14021402
console.log("duplicate!");
1403-
var popupHtml = templateCache["template-dialog-exists"]({"fileName": data.node.text});
1403+
var popupHtml = templateCache["template-dialog-move"]({"fileName": data.node.text});
14041404
$.prompt( popupHtml, {
14051405
buttons: { "Rename": "rename", "Replace": "replace", "Override": "override", "Cancel": "cancel" },
14061406
submit: function(event, value, message, fromVal) {

0 commit comments

Comments
 (0)