jessikitty/Disco
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug Fix #68: Undetected Pages dialog scale

Browse Source 
Automatically scales the undetected page preview based on the browser
size.
This commit is contained in:
Gary Sharp
2014-07-28 17:33:49 +10:00
parent 2d8dcb6900
commit 7062a40dfb
5 changed files with 90 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.cshtml
+9 -1
View File
@@ -70,12 +70,20 @@
var urlImporterUndetectedDelete = '@(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedDelete()))/'; var urlImporterUndetectedDelete = '@(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedDelete()))/';
var $undetectedPageDialog = $('#undetectedPageDialog').dialog({ var $undetectedPageDialog = $('#undetectedPageDialog').dialog({
modal: true, modal: true,
height: 850,
width: 800, width: 800,
resizable: false, resizable: false,
autoOpen: false autoOpen: false
}); });
function resizeUndetectedPageDialog() {
var dialogHeight = Math.min($(window).height() - 120, 805);
$undetectedPageDialog.height(dialogHeight);
$undetectedPageDialog.find('.pagePreview').height(dialogHeight - 105);
}
resizeUndetectedPageDialog();
$(window).resize(resizeUndetectedPageDialog);
$dialogRemove = $('#dialogRemove').dialog({ $dialogRemove = $('#dialogRemove').dialog({
resizable: false, resizable: false,
height: 140, height: 140,
Disco.Web/Areas/Config/Views/DocumentTemplate/UndetectedPages.generated.cs
+76 -71
View File
@@ -249,80 +249,85 @@ WriteLiteral("/\';\r\n var urlImporterUndetectedDelete = \'");
#line default #line default
#line hidden #line hidden
WriteLiteral("/\';\r\n var $undetectedPageDialog = $(\'#undetectedPageDialog\').dialog({\r\n " + WriteLiteral("/\';\r\n var $undetectedPageDialog = $(\'#undetectedPageDialog\').dialog({\r\n " +
" modal: true,\r\n height: 850,\r\n width: 800,\r\n " + " modal: true,\r\n width: 800,\r\n resizable: false,\r\n " +
" resizable: false,\r\n autoOpen: false\r\n });\r\n\r\n $di" + " autoOpen: false\r\n });\r\n\r\n function resizeUndetectedPage" +
"alogRemove = $(\'#dialogRemove\').dialog({\r\n resizable: false,\r\n " + "Dialog() {\r\n var dialogHeight = Math.min($(window).height() - 120, 80" +
" height: 140,\r\n modal: true,\r\n autoOpen: false\r\n " + "5);\r\n $undetectedPageDialog.height(dialogHeight);\r\n $undet" +
" });\r\n\r\n function pageViewModel() {\r\n var self = this;\r\n\r\n " + "ectedPageDialog.find(\'.pagePreview\').height(dialogHeight - 105);\r\n }\r\n " +
" self.selectedUndetectedPage = ko.observable(null);\r\n self.un" + " resizeUndetectedPageDialog();\r\n\r\n $(window).resize(resizeUndetectedP" +
"detectedPages = ko.observableArray();\r\n self.noUndetectedPages = ko.c" + "ageDialog);\r\n\r\n $dialogRemove = $(\'#dialogRemove\').dialog({\r\n " +
"omputed(function () { return self.undetectedPages().length == 0 });\r\n " + "resizable: false,\r\n height: 140,\r\n modal: true,\r\n " +
" self.selectNextPage = function () {\r\n var oldSelected = self.sel" + " autoOpen: false\r\n });\r\n\r\n function pageViewModel() {\r\n " +
"ectedUndetectedPage();\r\n var oldSelectedIndex = vm.undetectedPage" + " var self = this;\r\n\r\n self.selectedUndetectedPage = ko.observable(n" +
"s.indexOf(oldSelected);\r\n\r\n if (vm.undetectedPages().length > 1) " + "ull);\r\n self.undetectedPages = ko.observableArray();\r\n sel" +
"{\r\n if (oldSelectedIndex + 1 <= vm.undetectedPages().length -" + "f.noUndetectedPages = ko.computed(function () { return self.undetectedPages().le" +
" 1)\r\n vm.selectedUndetectedPage(vm.undetectedPages()[oldS" + "ngth == 0 });\r\n self.selectNextPage = function () {\r\n " +
"electedIndex + 1]);\r\n else\r\n vm.select" + "var oldSelected = self.selectedUndetectedPage();\r\n var oldSelecte" +
"edUndetectedPage(vm.undetectedPages()[oldSelectedIndex - 1]);\r\n }" + "dIndex = vm.undetectedPages.indexOf(oldSelected);\r\n\r\n if (vm.unde" +
" else {\r\n $undetectedPageDialog.dialog(\'close\');\r\n " + "tectedPages().length > 1) {\r\n if (oldSelectedIndex + 1 <= vm." +
" vm.selectedUndetectedPage(null);\r\n }\r\n }\r\n " + "undetectedPages().length - 1)\r\n vm.selectedUndetectedPage" +
" }\r\n\r\n function undetectedPageViewModel(id, timestamp, timestampFuzzy" + "(vm.undetectedPages()[oldSelectedIndex + 1]);\r\n else\r\n " +
") {\r\n var self = this;\r\n\r\n self.id = id;\r\n self" + " vm.selectedUndetectedPage(vm.undetectedPages()[oldSelectedIndex" +
".timestamp = timestamp;\r\n self.timestampFuzzy = timestampFuzzy;\r\n " + " - 1]);\r\n } else {\r\n $undetectedPageDialog.dia" +
" self.thumbnailUrl = \"url(\" + urlUndetectedPageThumbnail + \"&id=\" + id + " + "log(\'close\');\r\n vm.selectedUndetectedPage(null);\r\n " +
"\")\";\r\n self.previewUrl = \"url(\" + urlUndetectedPagePreview + \"&id=\" +" + " }\r\n }\r\n }\r\n\r\n function undetectedPageViewModel(id," +
" id + \")\";\r\n self.sourceUrl = urlUndetectedPageSource + \"&id=\" + id;\r" + " timestamp, timestampFuzzy) {\r\n var self = this;\r\n\r\n self." +
"\n self.select = function (e, d) {\r\n vm.selectedUndetec" + "id = id;\r\n self.timestamp = timestamp;\r\n self.timestampFuz" +
"tedPage(self);\r\n $undetectedPageDialog.dialog(\'open\');\r\n " + "zy = timestampFuzzy;\r\n self.thumbnailUrl = \"url(\" + urlUndetectedPage" +
" }\r\n\r\n // Dialog Properties\r\n self.dialogTemplateId = ko" + "Thumbnail + \"&id=\" + id + \")\";\r\n self.previewUrl = \"url(\" + urlUndete" +
".observable(null);\r\n self.dialogDataId = ko.observable(null);\r\n " + "ctedPagePreview + \"&id=\" + id + \")\";\r\n self.sourceUrl = urlUndetected" +
" self.dialogDataIdService = ko.computed(function () {\r\n retu" + "PageSource + \"&id=\" + id;\r\n self.select = function (e, d) {\r\n " +
"rn urlDataIdLookupService + self.dialogTemplateId();\r\n });\r\n " + " vm.selectedUndetectedPage(self);\r\n $undetectedPageDialog." +
" self.deletePage = function () {\r\n $undetectedPageDialog.dialog" + "dialog(\'open\');\r\n }\r\n\r\n // Dialog Properties\r\n " +
"(\'option\', \'disabled\', true);\r\n\r\n $dialogRemove.dialog(\'option\', " + "self.dialogTemplateId = ko.observable(null);\r\n self.dialogDataId = ko" +
"\'buttons\', {\r\n \"Remove\": function () {\r\n " + ".observable(null);\r\n self.dialogDataIdService = ko.computed(function " +
" $dialogRemove.dialog(\"close\");\r\n var data = { id: self" + "() {\r\n return urlDataIdLookupService + self.dialogTemplateId();\r\n" +
".id };\r\n $.ajax({\r\n url: urlIm" + " });\r\n self.deletePage = function () {\r\n $u" +
"porterUndetectedDelete,\r\n dataType: \'json\',\r\n " + "ndetectedPageDialog.dialog(\'option\', \'disabled\', true);\r\n\r\n $dial" +
" data: data,\r\n type: \'POST\',\r\n " + "ogRemove.dialog(\'option\', \'buttons\', {\r\n \"Remove\": function (" +
" success: function (d) {\r\n " +
" if (d == \'OK\') {\r\n vm.selectNextPage();\r\n " +
" vm.undetectedPages.remove(self);\r\n " +
" } else {\r\n alert(\'Unable t" +
"o delete page: \' + d);\r\n }\r\n " +
" $undetectedPageDialog.dialog(\'option\', \'disabled\', false);\r\n " +
" },\r\n error: function (jqXHR, textS" +
"tatus, errorThrown) {\r\n alert(\'Unable to delete p" +
"age: \' + errorThrown);\r\n $undetectedPageDialog.di" +
"alog(\'option\', \'disabled\', false);\r\n }\r\n " +
" });\r\n },\r\n \"Cancel\": function (" +
") {\r\n $dialogRemove.dialog(\"close\");\r\n " + ") {\r\n $dialogRemove.dialog(\"close\");\r\n " +
" $undetectedPageDialog.dialog(\'option\', \'disabled\', false);\r\n " + " var data = { id: self.id };\r\n $.ajax({\r\n " +
" }\r\n });\r\n\r\n $dialogRemove.dialog(\'open\');\r\n\r\n" + " url: urlImporterUndetectedDelete,\r\n d" +
" return false;\r\n }\r\n self.assignPage = func" + "ataType: \'json\',\r\n data: data,\r\n " +
"tion () {\r\n var dtId = self.dialogTemplateId();\r\n " + " type: \'POST\',\r\n success: function (d) {\r\n " +
"var dId = self.dialogDataId();\r\n if (!dtId || !dId) {\r\n " + " if (d == \'OK\') {\r\n " +
" alert(\'Please specify a valid Document Type and Data Id\');\r\n " + " vm.selectNextPage();\r\n vm.undetectedPages.re" +
" } else {\r\n $undetectedPageDialog.dialog(\'option\', \'disa" + "move(self);\r\n } else {\r\n " +
"bled\', true);\r\n\r\n var data = { id: self.id, DocumentTemplateI" + " alert(\'Unable to delete page: \' + d);\r\n " +
"d: dtId, DataId: dId };\r\n\r\n $.ajax({\r\n " + " }\r\n $undetectedPageDialog.dialog(\'option\', \'dis" +
" url: urlImporterUndetectedAssign,\r\n dataType: \'json\',\r\n " + "abled\', false);\r\n },\r\n err" +
" data: data,\r\n type: \'POST\',\r\n " + "or: function (jqXHR, textStatus, errorThrown) {\r\n " +
" success: function (d) {\r\n if (d ==" + " alert(\'Unable to delete page: \' + errorThrown);\r\n " +
" \'OK\') {\r\n vm.selectNextPage();\r\n " + " $undetectedPageDialog.dialog(\'option\', \'disabled\', false);\r\n " +
" vm.undetectedPages.remove(self);\r\n } " + " }\r\n });\r\n },\r\n " +
"else {\r\n alert(\'Unable to assign page: \' + d);\r\n " + " \"Cancel\": function () {\r\n $dialogRemove.dialog(\"clo" +
" }\r\n $undetectedPageDialog." + "se\");\r\n $undetectedPageDialog.dialog(\'option\', \'disabled\'" +
"dialog(\'option\', \'disabled\', false);\r\n },\r\n " + ", false);\r\n }\r\n });\r\n\r\n $dialog" +
" error: function (jqXHR, textStatus, errorThrown) {\r\n " + "Remove.dialog(\'open\');\r\n\r\n return false;\r\n }\r\n " +
" alert(\'Unable to assign page: \' + errorThrown);\r\n " + " self.assignPage = function () {\r\n var dtId = self.dialogTempl" +
" $undetectedPageDialog.dialog(\'option\', \'disabled\', false);\r\n " + "ateId();\r\n var dId = self.dialogDataId();\r\n if (!d" +
" }\r\n });\r\n\r\n }\r\n retu" + "tId || !dId) {\r\n alert(\'Please specify a valid Document Type " +
"rn false;\r\n };\r\n }\r\n\r\n function init() {\r\n v" + "and Data Id\');\r\n } else {\r\n $undetectedPageDia" +
"m = new pageViewModel();\r\n\r\n $.ajax({\r\n url: \'"); "log.dialog(\'option\', \'disabled\', true);\r\n\r\n var data = { id: " +
"self.id, DocumentTemplateId: dtId, DataId: dId };\r\n\r\n $.ajax(" +
"{\r\n url: urlImporterUndetectedAssign,\r\n " +
" dataType: \'json\',\r\n data: data,\r\n " +
" type: \'POST\',\r\n success: function (d) {\r\n " +
" if (d == \'OK\') {\r\n vm.selectNex" +
"tPage();\r\n vm.undetectedPages.remove(self);\r\n " +
" } else {\r\n alert(\'Unable " +
"to assign page: \' + d);\r\n }\r\n " +
" $undetectedPageDialog.dialog(\'option\', \'disabled\', false);\r\n " +
" },\r\n error: function (jqXHR, textStatus, errorThr" +
"own) {\r\n alert(\'Unable to assign page: \' + errorThrow" +
"n);\r\n $undetectedPageDialog.dialog(\'option\', \'disable" +
"d\', false);\r\n }\r\n });\r\n\r\n " +
" }\r\n return false;\r\n };\r\n }\r\n\r\n functi" +
"on init() {\r\n vm = new pageViewModel();\r\n\r\n $.ajax({\r\n " +
" url: \'");
#line 204 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml" #line 212 "..\..\Areas\Config\Views\DocumentTemplate\UndetectedPages.cshtml"
Write(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedFiles())); Write(Url.Action(MVC.API.DocumentTemplate.ImporterUndetectedFiles()));
Disco.Web/ClientSource/Style/Config.css
+2
View File
@@ -856,8 +856,10 @@ div.logEventsViewport table.logEventsViewport > tbody > tr > td.eventType {
} }
#undetectedPageDialog > .pagePreview { #undetectedPageDialog > .pagePreview {
height: 700px; height: 700px;
max-height: 700px;
background-position: top center; background-position: top center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain;
} }
#undetectedPageDialog .actions { #undetectedPageDialog .actions {
border-top: 1px solid #d1d1d1; border-top: 1px solid #d1d1d1;
Disco.Web/ClientSource/Style/Config.less
+2
View File
@@ -963,8 +963,10 @@ div.logEventsViewport {
#undetectedPageDialog { #undetectedPageDialog {
& > .pagePreview { & > .pagePreview {
height: 700px; height: 700px;
max-height: 700px;
background-position: top center; background-position: top center;
background-repeat: no-repeat; background-repeat: no-repeat;
background-size: contain;
} }
.actions { .actions {
Disco.Web/ClientSource/Style/Config.min.css
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long