Skip to content

Commit

Permalink
changed some hints for 0.2.6
Browse files Browse the repository at this point in the history
  • Loading branch information
Leiren committed Mar 5, 2023
1 parent de9cc72 commit 74db804
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 10 deletions.
2 changes: 1 addition & 1 deletion scripts/install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ cd /opt
# rm -rf Npanel
mkdir -p Npanel
cd Npanel
wget "https://github.com/Leiren/Npanel/releases/download/v0.2.5alpha/linux-amd64.zip" -O npanel_linux_amd64.zip
wget "https://github.com/Leiren/Npanel/releases/download/v0.2.6alpha/linux-amd64.zip" -O npanel_linux_amd64.zip
unzip -o npanel_linux_amd64.zip
mv -f npanel.service /etc/systemd/system
sudo systemctl daemon-reload
Expand Down
21 changes: 13 additions & 8 deletions src/web/windows/views/panel_settings.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ void panel_settings_frame(bool tab_changed)

if (ImGui::BeginPopupModal("Confirm##apply_and_restart", NULL, ImGuiWindowFlags_AlwaysAutoResize | ImGuiWindowFlags_NoSavedSettings))
{
ImGui::Text("Panel will restart, and comes up with new settings.\nin-case panel did not start\n"
ImGui::Text("Panel will restart, and comes up with new settings; in-case panel did not start\n"
#ifndef win_build

"1- check panel logs \"service npanel status\"\n"
Expand All @@ -264,7 +264,7 @@ void panel_settings_frame(bool tab_changed)
"2- correct your mistakes in Npanel/panel.json\n"
"3- restart the program"
#endif
"\n You should backup before changing settings.\n\n"

"\n\n");
ImGui::Separator();

Expand Down Expand Up @@ -299,17 +299,22 @@ void panel_settings_frame(bool tab_changed)
ImGui::Text(
#ifndef win_build

"In order to backup your users: /opt/Npanel/users.db\n"
"In order to backup your settings: /opt/Npanel/panel.json\n"
"But it is suggested to Backup the folder /opt/Npanel entirely.\n\n"
"In order to backup, take a copy of: /opt/Npanel/AutoBackup/*\n\n"
"In order to resotre, first stop the panel : service npanel stop\n"
"Then, place your backup files into : /opt/Npanel/*\n"

"Npanel has auto backup and restore, it is safe to backup but not required.\n"
"If you want to transfer to a new server, read Transfer section in github page.\n\n"
// "You can transfer that folder to your new server without any problem, but \n"
// "before that install npanel from github script, then move users.db and panel.jso from your backup\n to destination server.\n"
// "then service npanel start.\n\n"
"For security reasons, you should download those files yourself, we don't provide you any links."
#else
"In order to backup your users: Npanel/users.db\n"
"In order to backup your settings: Npanel/panel.json\n"
"But I suggest you to Backup the folder Npanel/ entirely.\n\n"
"In order to backup, take a copy of: Npanel/AutoBackup/*\n\n"
"In order to resotre, place your backup files into : Npanel/*\n"

"Npanel has auto backup and restore, it is safe to backup but not required.\n\n"

"For security reasons, you should download those files yourself, we don't provide you any links."
#endif

Expand Down
2 changes: 1 addition & 1 deletion src/web/windows/views/server_status_view.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@ void server_status_frame()
ImGui::Button("Software Version", ImVec2(-FLT_MIN, 0.0f));
ImGui::TableNextColumn();
// ImGui::PushStyleColor(ImGuiCol_Button, ImVec4(0.246f, 0.836f, 0.051f, 0.65f));
ImGui::Button("0.2.5 Alpha", ImVec2(-FLT_MIN, 0.0f));
ImGui::Button("0.2.6 Alpha", ImVec2(-FLT_MIN, 0.0f));
// ImGui::PopStyleColor();

// ImGui::TableNextColumn();.
Expand Down

0 comments on commit 74db804

Please sign in to comment.