Re-added encryption warning

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@6163 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/html/index.php b/html/index.php
index 927fadfa4f4af7e3c9ae57ffb0b33c084bd5a289..6d6c48d816331e7e1d182ceda941faabf092b043 100644 (file)
--- a/html/index.php
+++ b/html/index.php
@@ -46,7 +46,7 @@ function displayLogin()
 
     /* Displasy SSL mode warning? */
     if ($ssl != "" && $config->data['MAIN']['WARNSSL'] == 'true'){
-      $smarty->assign ("ssl", "<b>"._("Warning").":</b> "._("Session will not be encrypted.")." <a style=\"color:red;\" href=\"$ssl\"><b>"._("Enter SSL session")."</b></a>!");
+      $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
     } else {
       $smarty->assign ("ssl", "");
     }

diff --git a/ihtml/themes/default/login.tpl b/ihtml/themes/default/login.tpl
index adc9592863cd6fb05c6313363b07247b88f56c62..7c9151d08e7de528b1a979c6af75e9c6a37f212e 100644 (file)
--- a/ihtml/themes/default/login.tpl
+++ b/ihtml/themes/default/login.tpl
@@ -29,7 +29,8 @@
        <div style='border-bottom:1px dashed #AAAAAA'>
 
            <div style='padding:12px;text-align:center;'>
-               {t}Please use your username and your password to log into the site administration system.{/t}
+               {t}Please use your username and your password to log into the site administration system.{/t}<br>
+               <b>{$ssl}</b>
            </div>
   
 
@@ -44,7 +45,6 @@
                <input type='password' name='password' maxlength='25' value=''
                         title='{t}Password{/t}' onFocus="nextfield= 'login';">
                </div>  
-
                <div style='text-align:center; padding:15px;'>
                        <img class='center' align='middle' src='{$directory_img}' alt='{t}Directory{/t}' title='{t}Directory{/t}'>&nbsp;
                        <select name='server'  title='{t}Directory{/t}'>