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

Bug Fix: Org Logo config minor UI tweak

Browse Source 
The update dialog height was hard-coded and partially obstructed the
input element.
This commit is contained in:
Gary Sharp
2014-06-11 21:29:12 +10:00
parent 815216fd73
commit 513397779d
2 changed files with 26 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Disco.Web/Areas/Config/Views/Organisation/Index.cshtml
+2 -3
View File
@@ -138,7 +138,7 @@
<div id="dialogUpdateOrganisationLogo" title="Update Organisation Logo"> <div id="dialogUpdateOrganisationLogo" title="Update Organisation Logo">
@using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" })) @using (Html.BeginForm(MVC.API.System.OrganisationLogo(true, null, null), FormMethod.Post, new { enctype = "multipart/form-data" }))
{ {
<h3>Update Action</h3> <h3>Update Organisation Logo</h3>
<div style="margin-top: 10px; padding-bottom: 5px;"> <div style="margin-top: 10px; padding-bottom: 5px;">
<input id="updateOrganisationLogoResetLogo" type="radio" name="ResetLogo" value="true" <input id="updateOrganisationLogoResetLogo" type="radio" name="ResetLogo" value="true"
checked="checked" /><label for="updateOrganisationLogoResetLogo">Remove Logo</label> checked="checked" /><label for="updateOrganisationLogoResetLogo">Remove Logo</label>
@@ -146,7 +146,7 @@
<div style="margin-top: 5px; border-top: 1px dashed #aaa; padding-top: 5px;"> <div style="margin-top: 5px; border-top: 1px dashed #aaa; padding-top: 5px;">
<input id="updateOrganisationLogoUploadLogo" type="radio" name="ResetLogo" value="false" /><label <input id="updateOrganisationLogoUploadLogo" type="radio" name="ResetLogo" value="false" /><label
for="updateOrganisationLogoUploadLogo">Upload Logo</label> for="updateOrganisationLogoUploadLogo">Upload Logo</label>
<div id="updateOrganisationLogoUploadLogoContainer" style="display: none; padding-left: 10px;"> <div id="updateOrganisationLogoUploadLogoContainer" style="display: none; padding: 4px 0 0 14px;">
<input id="updateOrganisationLogoUploadLogoImage" type="file" name="Image" /> <input id="updateOrganisationLogoUploadLogoImage" type="file" name="Image" />
<span id="updateOrganisationLogoUploadLogoImageRequired" class="field-validation-valid field-validation-error">* Required</span> <span id="updateOrganisationLogoUploadLogoImageRequired" class="field-validation-valid field-validation-error">* Required</span>
</div> </div>
@@ -173,7 +173,6 @@
}); });
buttonDialog.dialog({ buttonDialog.dialog({
resizable: false, resizable: false,
height: 200,
modal: true, modal: true,
autoOpen: false, autoOpen: false,
buttons: { buttons: {
Disco.Web/Areas/Config/Views/Organisation/Index.generated.cs
+24 -25
View File
@@ -702,7 +702,7 @@ WriteLiteral(">\r\n");
#line default #line default
#line hidden #line hidden
WriteLiteral(" <h3>Update Action</h3>\r\n"); WriteLiteral(" <h3>Update Organisation Logo</h3>\r\n");
WriteLiteral(" <div"); WriteLiteral(" <div");
@@ -745,7 +745,7 @@ WriteLiteral(" /><label\r\n for=\"updateOrganisationLogoUploa
WriteLiteral(" id=\"updateOrganisationLogoUploadLogoContainer\""); WriteLiteral(" id=\"updateOrganisationLogoUploadLogoContainer\"");
WriteLiteral(" style=\"display: none; padding-left: 10px;\""); WriteLiteral(" style=\"display: none; padding: 4px 0 0 14px;\"");
WriteLiteral(">\r\n <input"); WriteLiteral(">\r\n <input");
@@ -787,33 +787,32 @@ WriteLiteral(">\r\n $(function () {\r\n var button = $(\'#butt
" else {\r\n $(\'#updateOrganisationLogoUploadLogoContain" + " else {\r\n $(\'#updateOrganisationLogoUploadLogoContain" +
"er\').slideUp();\r\n $(\'#updateOrganisationLogoUploadLogoImage\')" + "er\').slideUp();\r\n $(\'#updateOrganisationLogoUploadLogoImage\')" +
".attr(\'disabled\', \'disabled\');\r\n }\r\n });\r\n " + ".attr(\'disabled\', \'disabled\');\r\n }\r\n });\r\n " +
"buttonDialog.dialog({\r\n resizable: false,\r\n height" + "buttonDialog.dialog({\r\n resizable: false,\r\n modal:" +
": 200,\r\n modal: true,\r\n autoOpen: false,\r\n " + " true,\r\n autoOpen: false,\r\n buttons: {\r\n " +
" buttons: {\r\n \"Save\": function () {\r\n " + " \"Save\": function () {\r\n var $this = $(this);\r\n\r" +
" var $this = $(this);\r\n\r\n var $image = $(\'#updateOr" + "\n var $image = $(\'#updateOrganisationLogoUploadLogoImage\'" +
"ganisationLogoUploadLogoImage\');\r\n if ($(\'#updateOrganisa" + ");\r\n if ($(\'#updateOrganisationLogoUploadLogo\').is(\':chec" +
"tionLogoUploadLogo\').is(\':checked\') && $image.val() == \'\') {\r\n " + "ked\') && $image.val() == \'\') {\r\n $image.addClass(\'inp" +
" $image.addClass(\'input-validation-error\');\r\n " + "ut-validation-error\');\r\n $(\'#updateOrganisationLogoUp" +
" $(\'#updateOrganisationLogoUploadLogoImageRequired\').removeClass(\'field-validat" + "loadLogoImageRequired\').removeClass(\'field-validation-valid\');\r\n " +
"ion-valid\');\r\n } else {\r\n $ima" + " } else {\r\n $image.removeClass(\'input-validati" +
"ge.removeClass(\'input-validation-error\');\r\n $(\'#updat" + "on-error\');\r\n $(\'#updateOrganisationLogoUploadLogoIma" +
"eOrganisationLogoUploadLogoImageRequired\').addClass(\'field-validation-valid\');\r\n" + "geRequired\').addClass(\'field-validation-valid\');\r\n $t" +
" $this.dialog(\"disable\");\r\n " + "his.dialog(\"disable\");\r\n $this.dialog(\"option\", \"butt" +
" $this.dialog(\"option\", \"buttons\", null);\r\n $this.fi" + "ons\", null);\r\n $this.find(\'form\').submit();\r\n " +
"nd(\'form\').submit();\r\n }\r\n },\r\n " + " }\r\n },\r\n Cancel: function " +
" Cancel: function () {\r\n $(this).dialog(\"clos" + "() {\r\n $(this).dialog(\"close\");\r\n }\r\n " +
"e\");\r\n }\r\n }\r\n });\r\n });\r\n " + " }\r\n });\r\n });\r\n </script>\r\n");
" </script>\r\n");
#line 202 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 201 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
#line default #line default
#line hidden #line hidden
#line 203 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 202 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
if (canConfigAddresses) if (canConfigAddresses)
{ {
@@ -941,7 +940,7 @@ WriteLiteral(@">
buttons['Delete'] = function () { $(this).dialog(""disable""); window.location.href = '"); buttons['Delete'] = function () { $(this).dialog(""disable""); window.location.href = '");
#line 302 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 301 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Url.Action(MVC.API.System.DeleteOrganisationAddress())); Write(Url.Action(MVC.API.System.DeleteOrganisationAddress()));
@@ -984,7 +983,7 @@ WriteLiteral("\' + \'?redirect=true&id=\' + id; };\r\n var button
"umber\').val()\r\n };\r\n\r\n $.ajax({\r\n url: \'"); "umber\').val()\r\n };\r\n\r\n $.ajax({\r\n url: \'");
#line 367 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 366 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Url.Action(MVC.API.System.UpdateOrganisationAddress())); Write(Url.Action(MVC.API.System.UpdateOrganisationAddress()));
@@ -995,7 +994,7 @@ WriteLiteral("\',\r\n dataType: \'json\',\r\n data
"f (d == \'OK\') {\r\n window.location.href = \'"); "f (d == \'OK\') {\r\n window.location.href = \'");
#line 373 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 372 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
Write(Url.Action(MVC.Config.Organisation.Index())); Write(Url.Action(MVC.Config.Organisation.Index()));
@@ -1034,7 +1033,7 @@ WriteLiteral(@"';
"); ");
#line 403 "..\..\Areas\Config\Views\Organisation\Index.cshtml" #line 402 "..\..\Areas\Config\Views\Organisation\Index.cshtml"
} }
#line default #line default