Added saved image preview to save image dialog.

This commit is contained in:
Unick Soft 2017-07-07 22:18:46 +03:00
parent 6f58737160
commit 1236fc4c1a
6 changed files with 49 additions and 29 deletions

View File

@ -256,6 +256,13 @@
color: #0649a6!important; color: #0649a6!important;
} }
.showShareImage
{
max-width:100%;
max-height:200px;
max-width:350px;
}
@media only screen and (max-width: 650px) { @media only screen and (max-width: 650px) {
#canvasSection #canvasSection

View File

@ -98,4 +98,5 @@
$g_lang["group_rename"] = "Group rename"; $g_lang["group_rename"] = "Group rename";
$g_lang["enter_vertices_text_in_each_line"] = "Enter text for each vertex in separate line"; $g_lang["enter_vertices_text_in_each_line"] = "Enter text for each vertex in separate line";
$g_lang["or"] = "or";
?> ?>

View File

@ -102,6 +102,6 @@
$g_lang["group_rename"] = "Групповое переименование"; $g_lang["group_rename"] = "Групповое переименование";
$g_lang["enter_vertices_text_in_each_line"] = "Введите текст для каждой вершины в отдельную строку"; $g_lang["enter_vertices_text_in_each_line"] = "Введите текст для каждой вершины в отдельную строку";
$g_lang["or"] = "или";
?> ?>

View File

@ -765,7 +765,7 @@ Application.prototype.SaveGraphOnDisk = function ()
}); });
} }
Application.prototype.SaveGraphImageOnDisk = function () Application.prototype.SaveGraphImageOnDisk = function (showDialogCallback)
{ {
var imageName = this.GetNewGraphName(); var imageName = this.GetNewGraphName();
@ -797,7 +797,10 @@ Application.prototype.SaveGraphImageOnDisk = function ()
data: { data: {
base64data : imageBase64Data base64data : imageBase64Data
}, },
dataType: "text" dataType: "text",
success: function(data){
showDialogCallback();
}
}); });
return imageName; return imageName;

View File

@ -642,33 +642,38 @@ SavedDialogGraphImageHandler.prototype.objects = null;
SavedDialogGraphImageHandler.prototype.show = function(object) SavedDialogGraphImageHandler.prototype.show = function(object)
{ {
var imageName = this.app.SaveGraphImageOnDisk(); var showDialogCallback = function ()
{
var dialogButtons = {};
var dialogButtons = {}; dialogButtons[g_close] = function() {
$( this ).dialog( "close" );
};
dialogButtons[g_close] = function() { var fileLocation = "tmp/saved/" + imageName.substr(0, 2) + "/"+ imageName + ".png"
$( this ).dialog( "close" );
};
var fileLocation = "tmp/saved/" + imageName.substr(0, 2) + "/"+ imageName + ".png" document.getElementById("showSavedImageGraph").src = "/" + fileLocation;
document.getElementById("showSavedImageGraphRef").href = "/" + fileLocation;
//document.getElementById("showSavedImageGraph").src = document.getElementById("showSavedImageGraph").src.replace(/tmp\/saved\/([A-Za-z]*)\/([A-Za-z]*).png/g, fileLocation);
document.getElementById("ShareSavedImageGraph").innerHTML =
document.getElementById("ShareSavedImageGraph").innerHTML.replace(/tmp\/saved\/([A-Za-z]*)\/([A-Za-z]*).png/g, fileLocation);
document.getElementById("SaveImageLinks").innerHTML =
document.getElementById("SaveImageLinks").innerHTML.replace(/tmp\/saved\/([A-Za-z]*)\/([A-Za-z]*).png/g, fileLocation);
document.getElementById("ShareSavedImageGraph").innerHTML = $( "#saveImageDialog" ).dialog({
document.getElementById("ShareSavedImageGraph").innerHTML.replace(/tmp\/saved\/([A-Za-z]*)\/([A-Za-z]*).png/g, fileLocation); resizable: false,
height: "auto",
width: "auto",
modal: true,
title: g_save_image_dialog,
buttons: dialogButtons,
dialogClass: 'EdgeDialog'
});
document.getElementById("SaveImageLinks").innerHTML = }
document.getElementById("SaveImageLinks").innerHTML.replace(/tmp\/saved\/([A-Za-z]*)\/([A-Za-z]*).png/g, fileLocation);
$( "#saveImageDialog" ).dialog({
resizable: false,
height: "auto",
width: "auto",
modal: true,
title: g_save_image_dialog,
buttons: dialogButtons,
dialogClass: 'EdgeDialog'
});
var imageName = this.app.SaveGraphImageOnDisk(showDialogCallback);
} }

View File

@ -239,7 +239,11 @@
<form> <form>
<fieldset> <fieldset>
<? $shareImagePageURL = $_SERVER['SERVER_NAME'] . "/";?> <? $shareImagePageURL = $_SERVER['SERVER_NAME'] . "/";?>
<p id="SaveImageLinks"><a href="http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png" target="_blank"><?= L('open_saved_image_browser')?></a> or <a href="http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png" download><?= L('download_saved_image')?></a></p> <p id="SaveImageLinks"><a href="http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png" target="_blank"><?= L('open_saved_image_browser')?></a> <?= L('or')?> <a href="http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png" download><?= L('download_saved_image')?></a>
</p>
<p class="hidden-phone">
<a href="http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png" target="_blank" class="hidden-phone showShareImage" id="showSavedImageGraphRef"><img src="http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png" id="showSavedImageGraph" class="showShareImage"></a>
</p>
<p><?= L('share_graph_description') ?></p> <p><?= L('share_graph_description') ?></p>
<ul class="share-buttons" id="ShareSavedImageGraph"> <ul class="share-buttons" id="ShareSavedImageGraph">
<li><a href="http://vkontakte.ru/share.php?url=http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png&text=<?= L('share_graph_text') ?>" target="_blank" title="Share on Vkontate"><i class="fa fa-vk fa-2x"></i></a></li> <li><a href="http://vkontakte.ru/share.php?url=http://<?= $shareImagePageURL ?>tmp/saved/XX/XXXXX.png&text=<?= L('share_graph_text') ?>" target="_blank" title="Share on Vkontate"><i class="fa fa-vk fa-2x"></i></a></li>