![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 55fa1a6)
raw | patch | inline | side by side (parent: 55fa1a6)
| author | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 18 Mar 2010 18:34:22 +0000 (18:34 +0000) | ||
| committer | cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8> | |
| Thu, 18 Mar 2010 18:34:22 +0000 (18:34 +0000) |
git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@16944 594d385d-05f5-0310-b6e9-bd551577e9d8
index d48712db64370de07fb8a5846eaf0fb4c91d8faf..96f29ae922a3d60733d1a3a5b62d83e0770b7825 100644 (file)
--- a/gosa-core/html/index.php
+++ b/gosa-core/html/index.php
if(isset($_POST["username"])){
$username= $_POST["username"];
}
+ $smarty->assign ("logo", image(get_template_path("images/logo.png")));
$smarty->assign ('date', gmdate("D, d M Y H:i:s"));
$smarty->assign ('username', $username);
$smarty->assign ('personal_img', get_template_path('images/login-head.png'));
/* Displasy SSL mode warning? */
if ($ssl != "" && $config->get_cfg_value('warnssl') == 'true'){
- $smarty->assign ("ssl", _("Warning").": <a style=\"color:red;\" href=\"$ssl\">"._("Session is not encrypted!")."</a>");
+ $smarty->assign ("ssl", sprintf(_("This session is not ecrypted. Click %s to enter an encrypted session."), "<a href=\"$ssl\">"._("here")."</a>"));
} else {
$smarty->assign ("ssl", "");
- }
+ }
if(!$config->check_session_lifetime()){
- $smarty->assign ("lifetime", _("Warning").": ".
- _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
+ $smarty->assign ("lifetime", _("The session lifetime configured in your gosa.conf will be overridden by php.ini settings."));
}else{
$smarty->assign ("lifetime", "");
}
$smarty->assign ("message", $message);
-/* Displasy SSL mode warning? */
-if ($ssl != "" && $config->get_cfg_value('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>!");
-} else {
- $smarty->assign ("ssl", "");
-}
-
/* Translation of cookie-warning. Whether to display it, is determined by JavaScript */
-$smarty->assign ("cookies", "<b>"._("Warning").":<\/b> "._("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
+$smarty->assign ("cookies", _("Your browser has cookies disabled. Please enable cookies and reload this page before logging in!"));
/* Generate server list */
$servers= array();
index 7bef85983b75d09ebd03b3469516f5aea8bdee73..a00d2b924c9700805ec72598fa673f20060bc8c5 100644 (file)
--- a/gosa-core/html/main.php
+++ b/gosa-core/html/main.php
}
/* show web frontend */
-$smarty->assign ("logo", "<div style='float:left'>".image("themes/modern/images/logo.png")."</div>");
+$smarty->assign ("logo", image("themes/modern/images/logo.png"));
$smarty->assign ("date", date("l, dS F Y H:i:s O"));
$smarty->assign ("lang", preg_replace('/_.*$/', '', $lang));
$smarty->assign ("must", "<span class='required'>*</span>");
index 5512ce4bde5237e88d86895d41b4c08f10e33ac9..06b1ba101e12b63eee7b0cb0e9a69636c072f303 100644 (file)
text-align:right;
}
+.object-list li span {
+ color:#666;
+ font-style:italic;
+}
+
+.inline-warning {
+ font-size:18px;
+ text-align:bottom;
+}
+
+
/* Progress */
div.progress {
background-color:#FF0000;
}
+
+/* Login */
+
+.login-box-header {
+ padding:8px 13px;
+ font-size:20px;
+ background-color:#EEE;
+ background: -webkit-gradient(linear, 0 0, 0 100%, from(#F8F8F8), to(#EEE));
+ background: -moz-linear-gradient(top, #F8F8F8, #EEE);
+ border-top-left-radius:5px;
+ border-top-right-radius:5px;
+ -moz-border-radius-topleft:5px;
+ -moz-border-radius-topright:5px;
+ -webkit-border-top-left-radius:5px;
+ -webkit-border-top-right-radius:5px;
+ border-bottom:1px solid #CCC;
+}
+
+.login-box-container {
+ padding:5% 10% 3% 10%;
+}
+
+.login-box {
+ position:absolute;
+ top:25%;
+ left:30%;
+ right:30%;
+ background-color:#FFF;
+ border:1px solid #CCC;
+ border-radius:5px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ background: -webkit-gradient(linear, 0 0, 0 100%, from(#FFF), to(#F8F8F8));
+ background: -moz-linear-gradient(top, #FFF, #F8F8F8);
+}
+
+.login-element-container {
+ padding:5px 8px;
+ position:relative;
+ height:30px;
+}
+
+.login-warning {
+}
+
+.login-warning a{
+ font-weight: bold;
+}
+
+.login-label {
+ position:absolute;
+ left:8px;
+ width:10em;
+}
+
+.login-input {
+ position:absolute;
+ left:10em;
+ right:5px;
+}
+
+.login-input input{
+ width:92%;
+}
+
+.login-inline-message {
+ padding:0 5px;
+ color:red;
+ text-align:center;
+}
+
+.login-warning {
+ border:2px solid #F00;
+ background-color:#FCC;
+ padding:10px;
+ margin:0 10px 10px 10px;
+ text-align:center;
+}
+
+
+/* Logout */
+
+.logout-box {
+ position:absolute;
+ top:25%;
+ left:20%;
+ right:20%;
+ padding:10px;
+ background-color:#F8F8F8;
+ border:1px solid #CCC;
+ border-radius:5px;
+ -moz-border-radius:5px;
+ -webkit-border-radius:5px;
+ background: -webkit-gradient(linear, 0 0, 0 100%, from(#FFF), to(#F0F0F0));
+ background: -moz-linear-gradient(top, #FFF, #F0F0F0);
+}
diff --git a/gosa-core/ihtml/themes/modern/islocked.tpl b/gosa-core/ihtml/themes/modern/islocked.tpl
index b791e5b7c51179b446db69c506e0a2404d5584dc..27cf883f0a8afaeee18ba6e88ff30cd170601eca 100644 (file)
-<div style="font-size:20px;">
- {image path="images/encrypted.png"} {t}Locking conflict detected{/t}
+<div class='plugin'>
+ <div class='inline-warning'>
+ {image path="images/encrypted.png" align="top"} {t}Locking conflict detected{/t}
+ </div>
-</div>
-
-<p>
- <b>{t}Warning{/t}:</b> {$message}
-</p>
-<p>
- {t}If this lock detection is false, the other person has obviously closed the webbrowser during the edit operation. You may want to take over the lock by pressing the 'Edit anyway' button.{/t}
-</p>
+ <hr>
+
+ <p>
+ {$message}
+ </p>
-<p class="plugbottom">
- <button type="submit" name="delete_lock">{$action}</button>
- {if $allow_readonly}
-
- <button type="submit" name="open_readonly">{t}Read only{/t}</button>
- {/if}
-
- <button type="submit" name="cancel_lock">{t}Cancel{/t}</button>
-</p>
-
-<input type="hidden" name="dn" value="{$dn}">
+ <p>
+ {t}If this lock detection is false, the other person has obviously closed the webbrowser during the edit operation. You may want to take over the lock by pressing the 'Edit anyway' button.{/t}
+ </p>
+ <hr>
+
+ <div class='plugin-actions'>
+ <button type="submit" name="delete_lock">{$action}</button>
+ {if $allow_readonly}
+
+ <button type="submit" name="open_readonly">{t}Read only{/t}</button>
+ {/if}
+
+ <button type="submit" name="cancel_lock">{t}Cancel{/t}</button>
+ </div>
+
+ <input type="hidden" name="dn" value="{$dn}">
+</div>
diff --git a/gosa-core/ihtml/themes/modern/removeEntries.tpl b/gosa-core/ihtml/themes/modern/removeEntries.tpl
index 95e81f6a0faf26842be8ac80a699d286f8daa25b..30a39ac73de72740b7a638ac172cdcf7fe7e7c5a 100644 (file)
-<div style="font-size:18px;">
- {image path="images/warning.png" align="top"} {t}Warning{/t}
-</div>
+<div class=plugin>
+ <div class='inline-warning'>
+ {image path="images/warning.png" align="top"} {t}Attention{/t}
+ </div>
+
+ <hr>
-<hr>
-{$info}
+ <div class='object-list-container'>
+ {$info}
+ </div>
-<p>
- {t}Please double check if you really want to do this since there is no way for GOsa to get your data back.{/t}
-</p>
+ <p>
+ {t}If you're sure you want to do this press 'Delete' to continue or 'Cancel' to abort.{/t}
+ </p>
-<p>
- {t}So - if you're sure - press 'Delete' to continue or 'Cancel' to abort.{/t}
-</p>
+ <hr>
-<hr>
-<div class="plugin-actions">
+ <div class="plugin-actions">
<button type='submit' name='delete_confirmed'>{msgPool type=delButton}</button>
<button type='submit' name='delete_cancel'>{msgPool type=cancelButton}</button>
+ </div>
</div>
index e2fce7894a4d8c07f0fe6f06880826e78db76f43..7b0bdc988c09673ff53942270e0ab4d6620c4d44 100644 (file)
foreach($this->dns as $dn){
$tmp = $h->getType($dn);
if(isset($map[$tmp])){
- $dns_names[] = '('._($map[$tmp]).') - '.LDAP::fix($dn);
+ $dns_names[LDAP::fix($dn)] = _($map[$tmp]);
}else{
$dns_names[] =LDAP::fix($dn);
}
index 48cb40e9289dac6a85d39f773678cac81834e353..53558553fae044c84ed4116e201c9be8460eda0b 100644 (file)
/* Prepare and show template */
$smarty= get_smarty();
$smarty->assign("allow_readonly",$allow_readonly);
- if(is_array($dn)){
- $msg = "<pre>";
- foreach($dn as $sub_dn){
- $msg .= "\n".$sub_dn.", ";
- }
- $msg = preg_replace("/, $/","</pre>",$msg);
- }else{
- $msg = $dn;
- }
+ $msg= msgPool::buildList($dn);
$smarty->assign ("dn", $msg);
if ($remove){
} else {
$smarty->assign ("action", _("Edit anyway"));
}
- $smarty->assign ("message", sprintf(_("You're going to edit the LDAP entry/entries %s"), "<b>".$msg."</b>", ""));
+
+ $smarty->assign ("message", _("These entries are currently locked:"). $msg);
return ($smarty->fetch (get_template_path('islocked.tpl')));
}
index d58debb985a72f289e719db93d7c86aaf1e4f1cb..38fea968f16de4cf560c5f7644522a55d1b46fbc 100644 (file)
public static function buildList($data)
{
- $objects= "<ul>";
+ $objects= "<ul class='object-list'>";
foreach ($data as $key => $value){
if (is_numeric($key)){
- $objects.= "<li>\n<i>$value</i></li>";
+ $objects.= "<li>\n$value</li>";
} else {
- $objects.= "<li>\n$value (<i>$key</i>)</li>";
+ $objects.= "<li>\n$value <span>$key</span></li>";
}
}
$objects.= "</ul>";