X-Git-Url: https://dev.renevier.net/gitweb.cgi?p=syp.git;a=blobdiff_plain;f=inc%2Fhtml%2Fadmin.php;h=63b6c4078f1da8c523a91e5e3ca705a7d69fa388;hp=7702b949b7408fd720eaf0f140b042af2e7e3fb1;hb=633d9d4e7f1055190aed797aa1ee28b8e3c79c0f;hpb=b8be7edca1802692be4d330c7065e5260fb348f6

diff --git a/inc/html/admin.php b/inc/html/admin.php
index 7702b94..63b6c40 100644
--- a/inc/html/admin.php
+++ b/inc/html/admin.php
@@ -7,7 +7,7 @@ $error = false;
 if (!@include_once ("./inc/settings.php")) {
     $error = true;
 }
-require_once ("./inc/db/mysql.php");
+require_once ("./inc/db/" . (defined ("DBTYPE")? DBTYPE: "mysql") . ".php");
 require_once ("./inc/utils.php");
 
 try {
@@ -53,9 +53,16 @@ if (!$usrtblexists || !$itemstblexists) {
       <link rel="stylesheet" href="./media/admin.css" type="text/css">
       <link rel="stylesheet" href="./openlayers/theme/default/style.css" type="text/css">
 
+<?php
+    if (file_exists ("./media/admin_custom.css")) {
+        printf("    <link rel=\"stylesheet\" href=\"./media/admin_custom.css\" type=\"text/css\">\n");
+    }
+?>
+
       <script type="text/javascript">
         var SypStrings = {
             AddItem: "<?php ptrans('add a place')?>",
+            Cancel: "<?php ptrans('cancel')?>",
             DragDropHowto: "<?php ptrans('You can move an item by drag & droping it.')?>",
             SelectHowto: "<?php ptrans('To modify an item data, select matching marker.')?>",
             AddHowto: "<?php ptrans('Click on the map to add a marker.')?>",
@@ -67,15 +74,17 @@ if (!$usrtblexists || !$itemstblexists) {
             UnauthorizedError: "<?php ptrans('Password is not correct.')?>",
             NotimageError: "<?php ptrans('File does not look like an image.')?>",
             UnconsistentError: "<?php ptrans('Server reply was inconsistent.')?>",
-            DelSucces: "<?php ptrans('Removal took place correctly.')?>",
+            DelSucces: "<?php ptrans('Successfully removed.')?>",
             UpdateSucces: "<?php ptrans('Save took place correctly.')?>",
+            emptyPasswordError: "<?php ptrans('Password cannot be empty')?>",
             userPasswordmatchError: "<?php ptrans('Passwords do not match.')?>",
             changeSamePass: "<?php ptrans('New password is the same as old password.')?>",
             changePassBadPass: "<?php ptrans('Bad password.')?>",
-            changePassSuccess: "<?php ptrans('Password changed correctly.')?>",
+            changePassSuccess: "<?php ptrans('Password successfully changed.')?>",
             newUserNonameError: "<?php ptrans('User name has not been set.')?>",
             newUserExistsError: "<?php ptrans('User already exists in database.')?>",
-            newUserSuccess: "<?php ptrans('User added correctly.')?>"
+            newUserSuccess: "<?php ptrans('User successfully added.')?>",
+            DisabledForDemo: "<?php ptrans('This feature is not enabled on demo site')?>"
         };
 
         var sypSettings =  {
@@ -211,7 +220,7 @@ if (!$usrtblexists || !$itemstblexists) {
             <table>
                 <tr>
                     <td><label for="user"><?php ptrans('user')?></label></td>
-                    <td style="width: 100%"><input id="user" name="user"></td>
+                    <td style="width: 100%"><input id="user" name="user" value="admin"></td>
                 </tr>
                 <tr>
                     <td><label for="password"><?php ptrans('password')?></label></td>
@@ -219,7 +228,7 @@ if (!$usrtblexists || !$itemstblexists) {
                 </tr>
             </table>
             <p class="center">
-                <input id="login_submit" type="submit" value="<?php ptrans('Connection')?>">
+                <input id="login_submit" type="submit" value="<?php ptrans('Login')?>">
                 <input type="hidden" name="request" value="auth">
             </p>
             <p id="pwd_throbber" class="throbber center">