diff --git a/helpers.lua b/helpers.lua index 98b5d0e..a232a9a 100644 --- a/helpers.lua +++ b/helpers.lua @@ -443,7 +443,7 @@ function serve(uri, cache) -- Load login.html as index if rel_path == "/" then if is_logged_in() then - rel_path = "/info.html" + rel_path = "/portal.html" else rel_path = "/login.html" end @@ -535,7 +535,7 @@ function get_data_for(view) } -- For those views, we may need user information - elseif view == "info.html" + elseif view == "portal.html" or view == "edit.html" or view == "password.html" or view == "ynhpanel.json" then @@ -701,7 +701,7 @@ function edit_user() -- Reset the password cache cache:set(user.."-password", args.newpassword, conf["session_timeout"]) - return redirect(conf.portal_url.."info.html") + return redirect(conf.portal_url.."portal.html") else flash("fail", t("password_changed_error")) end @@ -884,7 +884,7 @@ function edit_user() -- Ugly trick to force cache reloading set_headers(user) flash("win", t("information_updated")) - return redirect(conf.portal_url.."info.html") + return redirect(conf.portal_url.."portal.html") else flash("fail", t("user_saving_fail")) diff --git a/portal/assets/js/ynh_portal.js b/portal/assets/js/ynh_portal.js index 648f377..ae6322f 100644 --- a/portal/assets/js/ynh_portal.js +++ b/portal/assets/js/ynh_portal.js @@ -260,7 +260,7 @@ function init_portal_button_and_overlay() // Prepare and inject the portal overlay (what is activated when clicking on the portal button) var portalOverlay = document.createElement('iframe'); - portalOverlay.src = "/yunohost/sso/info.html"; + portalOverlay.src = "/yunohost/sso/portal.html"; portalOverlay.setAttribute("id","ynh-overlay"); portalOverlay.setAttribute("style","visibility: hidden;"); // make sure the overlay is invisible already when loading it document.body.insertBefore(portalOverlay, null); diff --git a/portal/edit.html b/portal/edit.html index 5591711..d73a52a 100644 --- a/portal/edit.html +++ b/portal/edit.html @@ -3,7 +3,7 @@
  • {{t_logout}}
  • - +

    {{{uid}}}

    {{givenName}} {{sn}} {{mail}} @@ -11,7 +11,7 @@
    -
    +
    @@ -47,7 +47,7 @@
    diff --git a/portal/password.html b/portal/password.html index 5c76702..4d20418 100644 --- a/portal/password.html +++ b/portal/password.html @@ -2,7 +2,7 @@ - +

    {{{uid}}}

    {{givenName}} {{sn}} {{mail}} @@ -30,7 +30,7 @@
    diff --git a/portal/info.html b/portal/portal.html similarity index 100% rename from portal/info.html rename to portal/portal.html