Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

Use ModuleMessage everywhere

Browse Source
This commit is contained in:
hishamco
2020-09-20 15:43:01 +03:00
parent ad5f5fbc24
commit 913ad53302
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
Oqtane.Client/Modules/Controls/RichTextEditor.razor
View File

@ -8,7 +8,7 @@
@if (_filemanagervisible) @if (_filemanagervisible)
{ {
<FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" /> <FileManager @ref="_fileManager" Filter="@Constants.ImageFiles" />
@((MarkupString)_message) <ModuleMessage @ref=_message></ModuleMessage>
<br /> <br />
} }
<div class="row justify-content-center" style="margin-bottom: 20px;"> <div class="row justify-content-center" style="margin-bottom: 20px;">
@ -85,7 +85,7 @@
private FileManager _fileManager; private FileManager _fileManager;
private string _content = string.Empty; private string _content = string.Empty;
private string _original = string.Empty; private string _original = string.Empty;
private string _message = string.Empty; private ModuleMessage _message = new ModuleMessage();
[Parameter] [Parameter]
public string Content { get; set; } public string Content { get; set; }
@ -144,7 +144,6 @@
public void CloseFileManager() public void CloseFileManager()
{ {
_filemanagervisible = false; _filemanagervisible = false;
_message = string.Empty;
StateHasChanged(); StateHasChanged();
} }
@ -189,17 +188,15 @@
var interop = new RichTextEditorInterop(JSRuntime); var interop = new RichTextEditorInterop(JSRuntime);
await interop.InsertImage(_editorElement, ContentUrl(fileid)); await interop.InsertImage(_editorElement, ContentUrl(fileid));
_filemanagervisible = false; _filemanagervisible = false;
_message = string.Empty;
} }
else else
{ {
_message = "<br /><div class=\"alert alert-warning\" role=\"alert\">You Must Select An Image To Insert</div>"; _message.SetModuleMessage("You Must Select An Image To Insert", MessageType.Warning);
} }
} }
else else
{ {
_filemanagervisible = true; _filemanagervisible = true;
_message = string.Empty;
} }
StateHasChanged(); StateHasChanged();
} }

8
Oqtane.Client/UI/Installer.razor
View File

@ -119,7 +119,7 @@
<div class="row"> <div class="row">
<div class="mx-auto text-center"> <div class="mx-auto text-center">
<button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br /> <button type="button" class="btn btn-success" @onclick="Install">Install Now</button><br /><br />
@((MarkupString) _message) <ModuleMessage @ref=_message></ModuleMessage>
</div> </div>
<div class="app-progress-indicator" style="@_loadingDisplay"></div> <div class="app-progress-indicator" style="@_loadingDisplay"></div>
</div> </div>
@ -135,7 +135,7 @@
private string _hostPassword = ""; private string _hostPassword = "";
private string _confirmPassword = ""; private string _confirmPassword = "";
private string _hostEmail = ""; private string _hostEmail = "";
private string _message = ""; private ModuleMessage _message = new ModuleMessage();
private string _integratedSecurityDisplay = "display: none;"; private string _integratedSecurityDisplay = "display: none;";
private string _loadingDisplay = "display: none;"; private string _loadingDisplay = "display: none;";
@ -201,13 +201,13 @@
} }
else else
{ {
_message = "<div class=\"alert alert-danger\" role=\"alert\">" + installation.Message + "</div>"; _message.SetModuleMessage(installation.Message, MessageType.Error);
_loadingDisplay = "display: none;"; _loadingDisplay = "display: none;";
} }
} }
else else
{ {
_message = "<div class=\"alert alert-danger\" role=\"alert\">Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length</div>"; _message.SetModuleMessage("Please Enter All Fields And Ensure Passwords Match And Are Greater Than 5 Characters In Length", MessageType.Error);
} }
} }