devshort

Unnamed repository; edit this file 'description' to name the repository.
git clone git://code.clttr.info/devshort.git
Log | Files | Refs | README | LICENSE

commit 38b32dc2e4175dfc72ba16ee5bf02f5d2b64bc1a
parent 3c49e51a7c6a32968df7ce40ea3eb65255a1d256
Author: Florian <flokX@users.noreply.github.com>
Date:   Sat, 26 Jan 2019 11:37:29 +0100

Resolve conflicts
Diffstat:
Minstaller.php | 17++++++++++++-----
1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/installer.php b/installer.php @@ -67,18 +67,25 @@ require valid-user"; <main role="main" class="flex-shrink-0"> <div class="container"> - <h1 class="mt-5">Installer</h1> - <p class="lead"><?php + <nav class="mt-3" aria-label="breadcrumb"> + <ol class="breadcrumb"> + <li class="breadcrumb-item">devShort</li> + <li class="breadcrumb-item active" aria-current="page">Installer</li> + </ol> + </nav> + <?php if ($success) { echo "<h1 class=\"mt-5\">Successful installed!</h1> -<p class=\"lead\">Now you can start link shortening. For more information visit the <a href=\"https://github.com/flokX/devShort/wiki\">devShort wiki</a>. The statistic page is quickly accessible under <a href=\"secure\">secure/</a></p>"; +<p class=\"lead\">Now you can start to shorten links. For more information visit the <a href=\"https://github.com/flokX/devShort/wiki\">devShort wiki</a>.</p> +<a href=\"admin\" class=\"btn btn-primary btn-lg \" role=\"button\">Go to the admin panel</a>"; } else { echo "<h1 class=\"mt-5\">Error while installing.</h1> -<p class=\"lead\">Please configure the <i>config.json</i> as shown in the <a href=\"https://github.com/flokX/devShort/wiki/Installation,-Update,-Reinstallation#installation\">devShort wiki</a> and try again.</p>"; +<p class=\"lead\">Please configure the <i>config.json</i> as shown in the <a href=\"https://github.com/flokX/devShort/wiki/Installation,-Update,-Reinstallation#installation\">devShort wiki</a> and try again.</p> +<p>We assume that you have not yet set an admin password.</p>"; } - ?></p> + ?> </div> </main>